This is an automated email from the git hooks/post-receive script. rfehren-guest pushed a commit to branch master in repository relion.
commit 75bd2c51d475da0021d83fe00c16229e7cc7f700 Author: Roland Fehrenbacher <[email protected]> Date: Mon Oct 26 18:04:42 2015 +0000 d/control: Rename lib packages + fix conflicts (close: #797825) --- debian/control | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index ae3e5b0..c7c7c8e 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-1v5 (= ${binary:Version}), +Depends: librelion-1.4-1 (= ${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-1v5 (= ${binary:Version}), +Depends: librelion+mpi-1.4-1 (= ${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-1v5 (= ${binary:Version}), +Depends: librelion+gui-1.4-1 (= ${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-1v5 (= ${binary:Version}), +Depends: librelion+mpi+gui-1.4-1 (= ${binary:Version}), librelion-dev-common, ${misc:Depends} Conflicts: librelion-dev, librelion+mpi-dev, librelion+gui-dev @@ -164,15 +164,18 @@ 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-1v5 +Package: librelion-1.4-1 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-1v5, librelion+gui-1.3-1v5, librelion+mpi+gui-1.3-1v5 -Replaces: librelion-1.3-1 +Conflicts: librelion+mpi-1.4-1, librelion+gui-1.4-1, librelion+mpi+gui-1.4-1, + librelion-1.3-1v5, librelion+mpi-1.3-1v5, librelion+gui-1.3-1v5, + librelion+mpi+gui-1.3-1v5, + librelion-1.3-1, librelion+mpi-1.3-1, librelion+gui-1.3-1, librelion+mpi+gui-1.3-1 +Replaces: librelion-1.3-1v5, 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 @@ -183,15 +186,18 @@ Description: RELION dynnamic library (3D reconstructions in cryo-electron micros . This is the runtime library. -Package: librelion+mpi-1.3-1v5 +Package: librelion+mpi-1.4-1 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-1.3-1v5, librelion+gui-1.3-1v5, librelion+mpi+gui-1.3-1v5 -Replaces: librelion+mpi-1.3-1 +Conflicts: librelion-1.4-1, librelion+gui-1.4-1, librelion+mpi+gui-1.4-1, + librelion-1.3-1v5, librelion+mpi-1.3-1v5, librelion+gui-1.3-1v5, + librelion+mpi+gui-1.3-1v5, + librelion-1.3-1, librelion+mpi-1.3-1, librelion+gui-1.3-1, librelion+mpi+gui-1.3-1 +Replaces: librelion+mpi-1.3-1v5, 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 @@ -202,15 +208,18 @@ 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-1v5 +Package: librelion+gui-1.4-1 Architecture: i386 amd64 Section: libs Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -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 +Conflicts: librelion-1.4-1, librelion+mpi-1.4-1, librelion+mpi+gui-1.4-1, + librelion-1.3-1v5, librelion+mpi-1.3-1v5, librelion+gui-1.3-1v5, + librelion+mpi+gui-1.3-1v5, + librelion-1.3-1, librelion+mpi-1.3-1, librelion+gui-1.3-1, librelion+mpi+gui-1.3-1 +Replaces: librelion+gui-1.3-1v5, 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 @@ -221,15 +230,18 @@ 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-1v5 +Package: librelion+mpi+gui-1.4-1 Architecture: i386 amd64 Section: libs Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -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 +Conflicts: librelion-1.4-1, librelion+mpi-1.4-1, librelion+gui-1.4-1, + librelion-1.3-1v5, librelion+mpi-1.3-1v5, librelion+gui-1.3-1v5, + librelion+mpi+gui-1.3-1v5, + librelion-1.3-1, librelion+mpi-1.3-1, librelion+gui-1.3-1, librelion+mpi+gui-1.3-1 +Replaces: librelion+mpi+gui-1.3-1v5, 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
