[med-svn] [dcmtkpp] 01/01: Use d-shlibs instead of install files

[Julien Lamy]

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

lamy-guest pushed a commit to branch master
in repository dcmtkpp.

commit 875c005a57a3ab970af544031321952c1eea1733
Author: Julien Lamy <lamy at unistra.fr>
Date:   Wed Jul 22 18:28:28 2015 +0200

    Use d-shlibs instead of install files
---
 debian/control                 |  4 +++-
 debian/libdcmtkpp0-dev.install |  2 --
 debian/libdcmtkpp0.install     |  1 -
 debian/rules                   | 10 ++++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 3f36cd7..aaa7533 100644
--- a/debian/control
+++ b/debian/control
@@ -29,9 +29,11 @@ Description: Wrappers around DCMTK to have an easier API
 Package: libdcmtkpp0-dev
 Architecture: any
 Section: libdevel
-Depends: libdcmtkpp (= ${binary:Version}),
+Depends: libdcmtkpp0,
+         ${devlibs:Depends},
          ${misc:Depends}
 Provides: libdcmtkpp-dev
+Conflicts: libdcmtkpp-dev
 Description: Wrappers around DCMTK to have an easier API (development files)
  DCMTK++ is a set of wrappers around DCMTK to have an easier API, notably for
  the networking part.
diff --git a/debian/libdcmtkpp0-dev.install b/debian/libdcmtkpp0-dev.install
deleted file mode 100644
index 1537de1..0000000
--- a/debian/libdcmtkpp0-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/*
-usr/lib/*.so
diff --git a/debian/libdcmtkpp0.install b/debian/libdcmtkpp0.install
deleted file mode 100644
index 093956b..0000000
--- a/debian/libdcmtkpp0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*
diff --git a/debian/rules b/debian/rules
index 1c83695..04c0764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,13 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 override_dh_auto_test:
 	cd build && ../tests/run.sh
 
+override_dh_install:
+	dh_install
+	d-shlibmove \
+		--commit --multiarch --exclude-a --exclude-la \
+		--movedev debian/tmp/usr/include/* usr/include \
+		--override s/libjsoncpp.-dev/libjsoncpp-dev/ \
+		--override s/libdcm.*-dev/libdcmtk-dev/ \
+		--override s/libof.*-dev/libdcmtk-dev/ \
+		--override s/libicuuc.*-dev/libicu-dev/ \
+		debian/tmp/usr/lib/*.so

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