[med-svn] [relion] 01/01: Readd librelion-dev-common

[Roland Fehrenbacher]

This is an automated email from the git hooks/post-receive script.

rfehren-guest pushed a commit to branch master
in repository relion.

commit be64729759338b90dfb83c7cc65fe2343ad3a0ac
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Thu Oct 23 10:01:18 2014 +0000

    Readd librelion-dev-common
    
    It now contains only headers common to all librelion*-dev variants. The other
    header files are explicitly moved to the librelion+*-dev variants where
    they are needed.
---
 debian/changelog                     |  4 ++--
 debian/control                       | 14 ++++++++++++++
 debian/librelion+gui-dev.install     |  2 +-
 debian/librelion+mpi+gui-dev.install |  9 ++++++++-
 debian/librelion+mpi-dev.install     |  8 +++++++-
 debian/librelion-dev-common.install  |  1 +
 debian/librelion-dev.install         |  1 -
 7 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f56158..f2e0d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-relion (1.3+dfsg-1) unstable; urgency=low
+relion (1.3+dfsg-2) unstable; urgency=low
 
   * Initial upload (Closes: #766324)
 
- -- Roland Fehrenbacher <rf at q-leap.de>  Wed, 22 Oct 2014 08:41:02 +0000
+ -- Roland Fehrenbacher <rf at q-leap.de>  Thu, 23 Oct 2014 11:52:48 +0000
 
 relion (0.0) stable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6d7ed35..6e999f3 100644
--- a/debian/control
+++ b/debian/control
@@ -82,6 +82,20 @@ Description: parallel toolkit for 3D reconstructions in cryo-electron microscopy
  relion-bin+mpi+gui provides the serial and parallel command-line tools as
  well as the graphical user interface.
 
+Package: librelion-dev-common
+Architecture: all
+Section: libdevel
+Depends: ${misc:Depends}
+Description: C++ API for RELION (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
+ reconstructions or 2D class averages in cryo-electron microscopy.
+ .
+ RELION provides a GUI, several command-line tools in parallel (MPI) and serial
+ versions as well as a C++ API.
+ .
+ This is the developers API package including only the common header files.
+
 Package: librelion-dev
 Architecture: i386 amd64
 Section: libdevel
diff --git a/debian/librelion+gui-dev.install b/debian/librelion+gui-dev.install
index 8cdaecd..eac5e71 100755
--- a/debian/librelion+gui-dev.install
+++ b/debian/librelion+gui-dev.install
@@ -3,4 +3,4 @@ gui/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.a usr/lib/${DEB_HOST_MULTIARCH}/
 gui/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.la usr/lib/${DEB_HOST_MULTIARCH}/
 gui/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.so usr/lib/${DEB_HOST_MULTIARCH}/
 gui/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}/
-gui/usr/include usr
+gui/usr/include/relion-1.3/src/manualpicker.h usr/include/relion-1.3/src
diff --git a/debian/librelion+mpi+gui-dev.install b/debian/librelion+mpi+gui-dev.install
index 3dc392b..7208f95 100755
--- a/debian/librelion+mpi+gui-dev.install
+++ b/debian/librelion+mpi+gui-dev.install
@@ -3,4 +3,11 @@ mpi+gui/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.a usr/lib/${DEB_HOST_MULTIARCH}
 mpi+gui/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.la usr/lib/${DEB_HOST_MULTIARCH}/
 mpi+gui/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.so usr/lib/${DEB_HOST_MULTIARCH}/
 mpi+gui/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}/
-mpi+gui/usr/include usr
+mpi+gui/usr/include/relion-1.3/src/autopicker_mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/ctffind_runner_mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/ml_optimiser_mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/particle_polisher_mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/particle_sorter_mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/preprocessing_mpi.h usr/include/relion-1.3/src
+mpi+gui/usr/include/relion-1.3/src/manualpicker.h usr/include/relion-1.3/src
diff --git a/debian/librelion+mpi-dev.install b/debian/librelion+mpi-dev.install
index 5a14111..409de60 100755
--- a/debian/librelion+mpi-dev.install
+++ b/debian/librelion+mpi-dev.install
@@ -3,4 +3,10 @@ mpi/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.a usr/lib/${DEB_HOST_MULTIARCH}/
 mpi/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.la usr/lib/${DEB_HOST_MULTIARCH}/
 mpi/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.so usr/lib/${DEB_HOST_MULTIARCH}/
 mpi/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}/
-mpi/usr/include usr
+mpi/usr/include/relion-1.3/src/autopicker_mpi.h usr/include/relion-1.3/src
+mpi/usr/include/relion-1.3/src/ctffind_runner_mpi.h usr/include/relion-1.3/src
+mpi/usr/include/relion-1.3/src/ml_optimiser_mpi.h usr/include/relion-1.3/src
+mpi/usr/include/relion-1.3/src/mpi.h usr/include/relion-1.3/src
+mpi/usr/include/relion-1.3/src/particle_polisher_mpi.h usr/include/relion-1.3/src
+mpi/usr/include/relion-1.3/src/particle_sorter_mpi.h usr/include/relion-1.3/src
+mpi/usr/include/relion-1.3/src/preprocessing_mpi.h usr/include/relion-1.3/src
diff --git a/debian/librelion-dev-common.install b/debian/librelion-dev-common.install
new file mode 100644
index 0000000..5c359c5
--- /dev/null
+++ b/debian/librelion-dev-common.install
@@ -0,0 +1 @@
+simple/usr/include usr
diff --git a/debian/librelion-dev.install b/debian/librelion-dev.install
index 6e5fa96..333c35e 100755
--- a/debian/librelion-dev.install
+++ b/debian/librelion-dev.install
@@ -3,4 +3,3 @@ simple/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.a usr/lib/${DEB_HOST_MULTIARCH}/
 simple/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.la usr/lib/${DEB_HOST_MULTIARCH}/
 simple/usr/lib/${DEB_HOST_MULTIARCH}/librelion*.so usr/lib/${DEB_HOST_MULTIARCH}/
 simple/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}/
-simple/usr/include usr

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git