[med-svn] r14376 - trunk/packages/staden-io-lib/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-08-07 18:01:51 +0000 (Wed, 07 Aug 2013)
New Revision: 14376

Removed:
   trunk/packages/staden-io-lib/trunk/debian/libstaden-read-dev.install
   trunk/packages/staden-io-lib/trunk/debian/libstaden-read1.install
Modified:
   trunk/packages/staden-io-lib/trunk/debian/changelog
   trunk/packages/staden-io-lib/trunk/debian/control
   trunk/packages/staden-io-lib/trunk/debian/rules
Log:
Make use of d-shlibs which should help closing bug #710225 because it raises a flag if there is a new ABI


Modified: trunk/packages/staden-io-lib/trunk/debian/changelog
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/changelog	2013-08-07 13:58:47 UTC (rev 14375)
+++ trunk/packages/staden-io-lib/trunk/debian/changelog	2013-08-07 18:01:51 UTC (rev 14376)
@@ -16,6 +16,8 @@
   * debian/control: Build-Depends libcurl4-gnutls-dev
     Closes: #710243
   * debian/libstaden-read1.symbols: Deleted because it simply breaks build.
+  * debian/rules: Make use of d-shlibs which should help closing bug
+    #710225 because it raises a flag if there is a new ABI
 
  -- Andreas Tille <tille at debian.org>  Wed, 07 Aug 2013 14:31:36 +0200
 

Modified: trunk/packages/staden-io-lib/trunk/debian/control
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/control	2013-08-07 13:58:47 UTC (rev 14375)
+++ trunk/packages/staden-io-lib/trunk/debian/control	2013-08-07 18:01:51 UTC (rev 14376)
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 9),
                autotools-dev,
                zlib1g-dev,
-               libcurl4-gnutls-dev | libcurl4-nss-dev
+               libcurl4-gnutls-dev | libcurl4-nss-dev,
+               d-shlibs
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/staden-io-lib/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/staden-io-lib/trunk/

Deleted: trunk/packages/staden-io-lib/trunk/debian/libstaden-read-dev.install
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/libstaden-read-dev.install	2013-08-07 13:58:47 UTC (rev 14375)
+++ trunk/packages/staden-io-lib/trunk/debian/libstaden-read-dev.install	2013-08-07 18:01:51 UTC (rev 14376)
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/x86_64-linux-gnu/lib*.a
-usr/lib/x86_64-linux-gnu/lib*.so

Deleted: trunk/packages/staden-io-lib/trunk/debian/libstaden-read1.install
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/libstaden-read1.install	2013-08-07 13:58:47 UTC (rev 14375)
+++ trunk/packages/staden-io-lib/trunk/debian/libstaden-read1.install	2013-08-07 18:01:51 UTC (rev 14376)
@@ -1 +0,0 @@
-usr/lib/x86_64-linux-gnu/lib*.so.*

Modified: trunk/packages/staden-io-lib/trunk/debian/rules
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/rules	2013-08-07 13:58:47 UTC (rev 14375)
+++ trunk/packages/staden-io-lib/trunk/debian/rules	2013-08-07 18:01:51 UTC (rev 14376)
@@ -1,8 +1,26 @@
 #!/usr/bin/make -f
+
+libpkg=libstaden-read
+devpkg=$(libpkg)-dev
+
 %:
 	dh $@
 
 override_dh_install:
 	dh_install
-	mkdir -p $(CURDIR)/debian/libstaden-read-dev/usr/bin
-	mv $(CURDIR)/debian/staden-io-lib-utils/usr/bin/io_lib-config $(CURDIR)/debian/libstaden-read-dev/usr/bin
+	mkdir -p $(CURDIR)/debian/$(devpkg)/usr/bin
+	mv $(CURDIR)/debian/staden-io-lib-utils/usr/bin/io_lib-config $(CURDIR)/debian/$(devpkg)/usr/bin
+	find debian/tmp -name "*.la" -delete
+
+	# Call d-shlibmove to comply with library packaging guide
+	d-shlibmove --commit \
+		    --multiarch \
+		    --devunversioned \
+		    --override s/libbz2-1.0-dev/libbz2-dev/ \
+		    --override s/libcurl-gnutls4-dev/libcurl4-gnutls-dev/ \
+		    --movedev "debian/tmp/usr/include" usr \
+		    debian/tmp/usr/lib/*/$(libpkg).so
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f tests/.done tests/data/ce\#sorted.sam tests/data/ce\#unsorted.sam