[med-svn] [camitk] 02/04: Remove overshot Breaks+Replace and move program to specific package camitk-config

[Emmanuel Promayon]

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

promayon-guest pushed a commit to branch master
in repository camitk.

commit a3b3d01c1234f4eff6f89fec888ef403ee51ec78
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date:   Thu Oct 6 22:04:38 2016 +0200

    Remove overshot Breaks+Replace and move program to specific package camitk-config
    
    Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
---
 debian/control | 23 ++++++++++++++++-------
 debian/rules   | 17 +++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 997522a..9d13384 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Architecture: any
 Depends: libqtpropertybrowser4 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
-Breaks: libcamitk3
-Replaces: libcamitk3
 Description: Computer Assisted Medical Intervention Tool Kit - runtime
  Helps researchers and clinicians to easily and rapidly collaborate in
  order to prototype CAMI applications, that feature medical images,
@@ -42,13 +40,28 @@ Description: Computer Assisted Medical Intervention Tool Kit - runtime
  .
  This package contains the shared libraries needed to run CamiTK applications.
 
+Package: camitk-config
+Architecture: any
+Depends: libcamitk4 (= ${binary:Version}),
+         libqtpropertybrowser-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Computer Assisted Medical Intervention Tool Kit - config
+ Helps researchers and clinicians to easily and rapidly collaborate in
+ order to prototype CAMI applications, that feature medical images,
+ surgical navigation and biomechanical simulations.
+ .
+ This package contains a command-line application to diagnose and check
+ the CamiTK configuration and environment setup.
+
 Package: libcamitk-dev
 Architecture: any
 Section: libdevel
 Depends: libcamitk4 (= ${binary:Version}),
          libqtpropertybrowser-dev,
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         camitk-config
 Recommends: camitk-imp
 Suggests: camitk-actionstatemachine
 Breaks: libcamitk3-dev
@@ -66,8 +79,6 @@ Package: libcamitk4-data
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Breaks: libcamitk3-data
-Replaces: libcamitk3-data
 Description: Computer Assisted Medical Intervention Tool Kit - data
  Helps researchers and clinicians to easily and rapidly collaborate in
  order to prototype CAMI applications, that feature medical images,
@@ -79,8 +90,6 @@ Package: libcamitk4-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Breaks: libcamitk3-doc
-Replaces: libcamitk3-doc
 Description: Computer Assisted Medical Intervention Tool Kit - documentation
  Helps researchers and clinicians to easily and rapidly collaborate in
  order to prototype CAMI applications, that feature medical images,
diff --git a/debian/rules b/debian/rules
index a56ddc0..aac817e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,10 @@ VER_MAJOR := $(shell echo '$(FULL_VERSION)' | cut -f1 -d".")
 VER_MINOR := $(shell echo '$(FULL_VERSION)' | cut -f2 -d".")
 VER_SHORT=$(VER_MAJOR).$(VER_MINOR)
 
-# package aliases (see d/control)
+# package aliases (see d/control)
 pkg_lib = libcamitk$(VER_MAJOR)
 pkg_qpb = libqtpropertybrowser$(VER_MAJOR)
+pkg_cfg = camitk-config
 pkg_dev = libcamitk-dev
 pkg_qpb_dev = libqtpropertybrowser-dev
 pkg_data = libcamitk$(VER_MAJOR)-data
@@ -21,6 +22,9 @@ pkg_doc = libcamitk$(VER_MAJOR)-doc
 pkg_imp = camitk-imp
 pkg_asm = camitk-actionstatemachine
 
+# multi-arch support
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # dpkg-shlibdeps needs to know about camitk extension directories to manage inner-dependencies
 # between extensions (i.e., mml component extension depends on physicalmodel component extensions)
 PKG_LIB_DIR := $(CURDIR)/debian/${pkg_lib}/usr/lib/camitk-${VER_SHORT}
@@ -84,13 +88,14 @@ override_dh_install:
 	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/libmonitoring.so.*
 	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/actions/lib*.so.*
 	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/components/lib*.so.*
-	# camitk-config is part of libcamitk
-	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/bin/camitk-config
-	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/share/pixmaps/camitk-config.xpm
-	dh_installman -p$(pkg_lib) debian/tmp/usr/share/man/man1/camitk-config.1
+
+	# camitk-config package contains only the app, man page and icon
+	dh_install -p$(pkg_cfg) --autodest debian/tmp/usr/bin/camitk-config
+	dh_install -p$(pkg_cfg) --autodest debian/tmp/usr/share/pixmaps/camitk-config.xpm
+	dh_installman -p$(pkg_cfg) debian/tmp/usr/share/man/man1/camitk-config.1
 
 	# separate packaging for qtpropertybrowser (can be used independently from camitk)
-	dh_install -p$(pkg_qpb) debian/tmp/usr/lib/libqtpropertybrowser.so.* usr/lib
+	dh_install -p$(pkg_qpb) --autodest debian/tmp/usr/lib/libqtpropertybrowser.so.*
 
 	# camitk developer package
 	# camitk so and headers and static libs

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