[med-svn] [libbpp-core] 01/02: Fix installation via d-shlibs

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libbpp-core.

commit 660d9312fccc7bff4218fa2e38c778addaa15835
Author: Andreas Tille <tille at debian.org>
Date:   Sat Apr 9 07:58:44 2016 +0200

    Fix installation via d-shlibs
---
 debian/changelog               | 6 ++++++
 debian/libbpp-core-dev.install | 3 ---
 debian/libbpp-core2.install    | 1 -
 debian/rules                   | 5 +----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c9856d..061c21b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libbpp-core (2.2.0-2) UNRELEASED; urgency=medium
+
+  * Fix installation via d-shlibmove
+
+ -- Andreas Tille <tille at debian.org>  Sat, 09 Apr 2016 07:57:31 +0200
+
 libbpp-core (2.2.0-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/libbpp-core-dev.install b/debian/libbpp-core-dev.install
deleted file mode 100644
index 0f5727e..0000000
--- a/debian/libbpp-core-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.so
diff --git a/debian/libbpp-core2.install b/debian/libbpp-core2.install
deleted file mode 100644
index c45ebcf..0000000
--- a/debian/libbpp-core2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff --git a/debian/rules b/debian/rules
index a5904e6..c2faf18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,5 @@ override_dh_install:
 		    --v5 \
 		    --devunversioned \
 		    --exclude-la \
+                    --movedev debian/tmp/usr/include/* usr/include \
                     debian/tmp/usr/lib/*.so
-	# somehow the static lib is copied twice - hack to fix this
-	rm -f debian/$(DEBPKGNAME)-dev/usr/lib/*.a \
-	      debian/$(DEBPKGNAME)-dev/usr/lib/*.so
-##                    --movedev debian/tmp/usr/include/* usr/include \

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