[med-svn] [relion] 01/02: Rename library packages for g++5 ABI transition.
Andreas Tille
tille at debian.org
Wed Aug 12 20:31:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository relion.
commit c3dcdc66b8bf3077d883e73fb32470557147a38c
Author: Andreas Tille <tille at debian.org>
Date: Wed Aug 12 21:50:10 2015 +0200
Rename library packages for g++5 ABI transition.
---
debian/changelog | 8 +++++++
debian/control | 28 ++++++++++++----------
debian/librelion+gui-1.3-1.lintian-overrides | 6 -----
...1.3-1.install => librelion+gui-1.3-1v5.install} | 0
debian/librelion+gui-1.3-1v5.lintian-overrides | 8 +++++++
debian/librelion+mpi+gui-1.3-1.lintian-overrides | 6 -----
...1.install => librelion+mpi+gui-1.3-1v5.install} | 0
debian/librelion+mpi+gui-1.3-1v5.lintian-overrides | 8 +++++++
debian/librelion+mpi-1.3-1.lintian-overrides | 5 ----
...1.3-1.install => librelion+mpi-1.3-1v5.install} | 0
debian/librelion+mpi-1.3-1v5.lintian-overrides | 7 ++++++
...ion-1.3-1.install => librelion-1.3-1v5.install} | 0
debian/librelion-1.3-1v5.lintian-overrides | 2 ++
13 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fae6ecd..2f3133e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+relion (1.3+dfsg-3) UNRELEASED; urgency=medium
+
+ * Rename library packages for g++5 ABI transition.
+ (Thanks for the patch to Iain Lane <iain at orangesquash.org.uk>)
+ Closes: #791267
+
+ -- Andreas Tille <tille at debian.org> Wed, 12 Aug 2015 21:48:21 +0200
+
relion (1.3+dfsg-2) unstable; urgency=medium
* Drop build-dep on openmpi-gcc
diff --git a/debian/control b/debian/control
index 5648fc7..ae3e5b0 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Description: C++ API for RELION (3D reconstructions in cryo-electron microscopy)
Package: librelion-dev
Architecture: i386 amd64
Section: libdevel
-Depends: librelion-1.3-1 (= ${binary:Version}),
+Depends: librelion-1.3-1v5 (= ${binary:Version}),
librelion-dev-common,
${misc:Depends}
Conflicts: librelion+mpi-dev, librelion+gui-dev, librelion+mpi+gui-dev
@@ -116,7 +116,7 @@ Description: C++ API for RELION (3D reconstructions in cryo-electron microscopy)
Package: librelion+mpi-dev
Architecture: i386 amd64
Section: libdevel
-Depends: librelion+mpi-1.3-1 (= ${binary:Version}),
+Depends: librelion+mpi-1.3-1v5 (= ${binary:Version}),
librelion-dev-common,
${misc:Depends}
Conflicts: librelion-dev, librelion+gui-dev, librelion+mpi+gui-dev
@@ -133,7 +133,7 @@ Description: C++ API for RELION (3D reconstructions in cryo-electron microscopy)
Package: librelion+gui-dev
Architecture: i386 amd64
Section: libdevel
-Depends: librelion+gui-1.3-1 (= ${binary:Version}),
+Depends: librelion+gui-1.3-1v5 (= ${binary:Version}),
librelion-dev-common,
${misc:Depends}
Conflicts: librelion-dev, librelion+mpi-dev, librelion+mpi+gui-dev
@@ -150,7 +150,7 @@ Description: C++ API for RELION (3D reconstructions in cryo-electron microscopy)
Package: librelion+mpi+gui-dev
Architecture: i386 amd64
Section: libdevel
-Depends: librelion+mpi+gui-1.3-1 (= ${binary:Version}),
+Depends: librelion+mpi+gui-1.3-1v5 (= ${binary:Version}),
librelion-dev-common,
${misc:Depends}
Conflicts: librelion-dev, librelion+mpi-dev, librelion+gui-dev
@@ -164,14 +164,15 @@ Description: C++ API for RELION (3D reconstructions in cryo-electron microscopy)
.
This is the developers API package for use with MPI and GUI.
-Package: librelion-1.3-1
+Package: librelion-1.3-1v5
Architecture: i386 amd64
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: librelion+mpi-1.3-1, librelion+gui-1.3-1, librelion+mpi+gui-1.3-1
+Conflicts: librelion-1.3-1, librelion+mpi-1.3-1v5, librelion+gui-1.3-1v5, librelion+mpi+gui-1.3-1v5
+Replaces: librelion-1.3-1
Description: RELION dynnamic library (3D reconstructions in cryo-electron microscopy)
RELION (for REgularised LIkelihood OptimisatioN) is a stand-alone
computer program for Maximum A Posteriori refinement of (multiple) 3D
@@ -182,14 +183,15 @@ Description: RELION dynnamic library (3D reconstructions in cryo-electron micros
.
This is the runtime library.
-Package: librelion+mpi-1.3-1
+Package: librelion+mpi-1.3-1v5
Architecture: i386 amd64
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: librelion-1.3-1, librelion+gui-1.3-1, librelion+mpi+gui-1.3-1
+Conflicts: librelion+mpi-1.3-1, librelion-1.3-1v5, librelion+gui-1.3-1v5, librelion+mpi+gui-1.3-1v5
+Replaces: librelion+mpi-1.3-1
Description: RELION dynnamic library (3D reconstructions in cryo-electron microscopy)
RELION (for REgularised LIkelihood OptimisatioN) is a stand-alone
computer program for Maximum A Posteriori refinement of (multiple) 3D
@@ -200,14 +202,15 @@ Description: RELION dynnamic library (3D reconstructions in cryo-electron micros
.
This is the runtime library for use with MPI but without GUI.
-Package: librelion+gui-1.3-1
+Package: librelion+gui-1.3-1v5
Architecture: i386 amd64
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: librelion-1.3-1, librelion+mpi-1.3-1, librelion+mpi+gui-1.3-1
+Conflicts: librelion+gui-1.3-1, librelion-1.3-1v5, librelion+mpi-1.3-1v5, librelion+mpi+gui-1.3-1v5
+Replaces: librelion+gui-1.3-1
Description: RELION dynnamic library (3D reconstructions in cryo-electron microscopy)
RELION (for REgularised LIkelihood OptimisatioN) is a stand-alone
computer program for Maximum A Posteriori refinement of (multiple) 3D
@@ -218,14 +221,15 @@ Description: RELION dynnamic library (3D reconstructions in cryo-electron micros
.
This is the runtime library for use with GUI but without MPI.
-Package: librelion+mpi+gui-1.3-1
+Package: librelion+mpi+gui-1.3-1v5
Architecture: i386 amd64
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: librelion-1.3-1, librelion+mpi-1.3-1, librelion+gui-1.3-1
+Conflicts: librelion+mpi+gui-1.3-1, librelion-1.3-1v5, librelion+mpi-1.3-1v5, librelion+gui-1.3-1v5
+Replaces: librelion+mpi+gui-1.3-1
Description: RELION dynnamic library (3D reconstructions in cryo-electron microscopy)
RELION (for REgularised LIkelihood OptimisatioN) is a stand-alone
computer program for Maximum A Posteriori refinement of (multiple) 3D
diff --git a/debian/librelion+gui-1.3-1.lintian-overrides b/debian/librelion+gui-1.3-1.lintian-overrides
deleted file mode 100644
index 74d047b..0000000
--- a/debian/librelion+gui-1.3-1.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# librelion+gui-1.3-1 contains the same library names as librelion-1.3-1
-# just that they are built with GUI support. The build system doesn't set
-# a different name/soname for these libs. They are packaged as alternative
-# versions (with or without GUI support) and conflict.
-librelion+gui-1.3-1 binary: package-name-doesnt-match-sonames librelion-1.3-1
-librelion+gui-1.3-1: hardening-no-relro
diff --git a/debian/librelion+gui-1.3-1.install b/debian/librelion+gui-1.3-1v5.install
old mode 100755
new mode 100644
similarity index 100%
rename from debian/librelion+gui-1.3-1.install
rename to debian/librelion+gui-1.3-1v5.install
diff --git a/debian/librelion+gui-1.3-1v5.lintian-overrides b/debian/librelion+gui-1.3-1v5.lintian-overrides
new file mode 100644
index 0000000..feca7cf
--- /dev/null
+++ b/debian/librelion+gui-1.3-1v5.lintian-overrides
@@ -0,0 +1,8 @@
+# librelion+gui-1.3-1v5 contains the same library names as librelion-1.3-1
+# just that they are built with GUI support. The build system doesn't set
+# a different name/soname for these libs. They are packaged as alternative
+# versions (with or without GUI support) and conflict.
+librelion+gui-1.3-1v5 binary: package-name-doesnt-match-sonames librelion-1.3-1
+librelion+gui-1.3-1v5: hardening-no-relro
+# G++5 ABI transition
+librelion+gui-1.3-1v5: package-name-doesnt-match-sonames librelion+gui-1.3-1
diff --git a/debian/librelion+mpi+gui-1.3-1.lintian-overrides b/debian/librelion+mpi+gui-1.3-1.lintian-overrides
deleted file mode 100644
index ad53f2e..0000000
--- a/debian/librelion+mpi+gui-1.3-1.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# librelion+mpi+gui-1.3-1 contains the same library names as librelion-1.3-1
-# just that they are built with MPI and GUI support. The build system doesn't set
-# a different name/soname for these libs. They are packaged as alternative
-# versions (with or without mpi/GUI support) and conflict.
-librelion+mpi+gui-1.3-1 binary: package-name-doesnt-match-sonames librelion-1.3-1
-librelion+mpi+gui-1.3-1: hardening-no-relro
diff --git a/debian/librelion+mpi+gui-1.3-1.install b/debian/librelion+mpi+gui-1.3-1v5.install
old mode 100755
new mode 100644
similarity index 100%
rename from debian/librelion+mpi+gui-1.3-1.install
rename to debian/librelion+mpi+gui-1.3-1v5.install
diff --git a/debian/librelion+mpi+gui-1.3-1v5.lintian-overrides b/debian/librelion+mpi+gui-1.3-1v5.lintian-overrides
new file mode 100644
index 0000000..e333b53
--- /dev/null
+++ b/debian/librelion+mpi+gui-1.3-1v5.lintian-overrides
@@ -0,0 +1,8 @@
+# librelion+mpi+gui-1.3-1v5 contains the same library names as librelion-1.3-1
+# just that they are built with MPI and GUI support. The build system doesn't set
+# a different name/soname for these libs. They are packaged as alternative
+# versions (with or without mpi/GUI support) and conflict.
+librelion+mpi+gui-1.3-1v5 binary: package-name-doesnt-match-sonames librelion-1.3-1
+librelion+mpi+gui-1.3-1v5: hardening-no-relro
+# G++5 ABI transition
+librelion+mpi+gui-1.3-1v5: package-name-doesnt-match-sonames librelion+mpi+gui-1.3-1
diff --git a/debian/librelion+mpi-1.3-1.lintian-overrides b/debian/librelion+mpi-1.3-1.lintian-overrides
deleted file mode 100644
index cca7d05..0000000
--- a/debian/librelion+mpi-1.3-1.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# librelion+mpi-1.3-1 contains the same library names as librelion-1.3-1
-# just that they are built with MPI support. The build system doesn't set
-# a different name/soname for these libs. They are packaged as alternative
-# versions (with or without mpi support) and conflict.
-librelion+mpi-1.3-1 binary: package-name-doesnt-match-sonames librelion-1.3-1
diff --git a/debian/librelion+mpi-1.3-1.install b/debian/librelion+mpi-1.3-1v5.install
old mode 100755
new mode 100644
similarity index 100%
rename from debian/librelion+mpi-1.3-1.install
rename to debian/librelion+mpi-1.3-1v5.install
diff --git a/debian/librelion+mpi-1.3-1v5.lintian-overrides b/debian/librelion+mpi-1.3-1v5.lintian-overrides
new file mode 100644
index 0000000..6f3fa38
--- /dev/null
+++ b/debian/librelion+mpi-1.3-1v5.lintian-overrides
@@ -0,0 +1,7 @@
+# librelion+mpi-1.3-1v5 contains the same library names as librelion-1.3-1
+# just that they are built with MPI support. The build system doesn't set
+# a different name/soname for these libs. They are packaged as alternative
+# versions (with or without mpi support) and conflict.
+librelion+mpi-1.3-1v5 binary: package-name-doesnt-match-sonames librelion-1.3-1
+# G++5 ABI transition
+librelion+mpi-1.3-1v5: package-name-doesnt-match-sonames librelion+mpi-1.3-1
diff --git a/debian/librelion-1.3-1.install b/debian/librelion-1.3-1v5.install
old mode 100755
new mode 100644
similarity index 100%
rename from debian/librelion-1.3-1.install
rename to debian/librelion-1.3-1v5.install
diff --git a/debian/librelion-1.3-1v5.lintian-overrides b/debian/librelion-1.3-1v5.lintian-overrides
new file mode 100644
index 0000000..f3b556c
--- /dev/null
+++ b/debian/librelion-1.3-1v5.lintian-overrides
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+librelion-1.3-1v5: package-name-doesnt-match-sonames librelion-1.3-1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git
More information about the debian-med-commit
mailing list