[med-svn] [camp] 01/01: use d-shlibmove

[Flavien Bridault]

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

fbridault-guest pushed a commit to branch master
in repository camp.

commit afad1f95cb0f2028c5a2ace1f54765731ba36784
Author: Flavien Bridault <fbridault at ircad.fr>
Date:   Fri Nov 25 15:20:18 2016 +0100

    use d-shlibmove
---
 debian/control                | 10 ++++++----
 debian/libcamp0.7-dev.install |  2 --
 debian/libcamp0.7.install     |  2 --
 debian/rules                  | 10 ++++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index c2886c6..650a415 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Section: science
 Priority: optional
 Build-Depends: cmake,
                debhelper (>= 10),
+               d-shlibs,
                libboost-dev,
                libboost-test-dev,
                libqt4-dev
@@ -15,10 +16,10 @@ Homepage: https://github.com/tegesoft/camp
 
 Package: libcamp0.7
 Architecture: any
-Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
 Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: C++ multi-purpose reflection library
  CAMP is a multi-purpose reflection library developed by Technogerma Systems
  France (http://www.tegesoft.com).
@@ -44,11 +45,12 @@ Description: C++ multi-purpose reflection library
 
 Package: libcamp0.7-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libcamp0.7 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
-Multi-Arch: same
+Conflicts: libcamp-dev
 Provides: libcamp-dev
 Description: C++ multi-purpose reflection library (development files)
  CAMP is a multi-purpose reflection library developed by Technogerma Systems
diff --git a/debian/libcamp0.7-dev.install b/debian/libcamp0.7-dev.install
deleted file mode 100644
index b09fd81..0000000
--- a/debian/libcamp0.7-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/*/libcamp*.so
diff --git a/debian/libcamp0.7.install b/debian/libcamp0.7.install
deleted file mode 100644
index 7fc8527..0000000
--- a/debian/libcamp0.7.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/*/libcamp*.so.*
-debian/tmp/usr/share/*
diff --git a/debian/rules b/debian/rules
index 072abd6..295c575 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@
 
-override_dh_install-arch:
-	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-	cp -dR debian/tmp/usr/lib/lib* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+override_dh_install:
 	dh_install
+	d-shlibmove \
+		--commit --multiarch --exclude-a --exclude-la \
+		--movedev debian/tmp/usr/include/camp usr/include \
+		--movedev debian/tmp/usr/include/camp-xml usr/include \
+		debian/tmp/usr/lib/*.so
 

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