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

[Andreas Tille]

Author: tille
Date: 2015-11-24 19:30:12 +0000 (Tue, 24 Nov 2015)
New Revision: 20535

Modified:
   trunk/packages/staden-io-lib/trunk/debian/changelog
   trunk/packages/staden-io-lib/trunk/debian/copyright
   trunk/packages/staden-io-lib/trunk/debian/rules
Log:
Enable separate building of arch independet packages,  adapt to latest d-shlibs


Modified: trunk/packages/staden-io-lib/trunk/debian/changelog
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/changelog	2015-11-24 18:56:58 UTC (rev 20534)
+++ trunk/packages/staden-io-lib/trunk/debian/changelog	2015-11-24 19:30:12 UTC (rev 20535)
@@ -1,3 +1,11 @@
+staden-io-lib (1.14.6-2) unstable; urgency=medium
+
+  * Enable separate building of arch independet packages
+    Closes: #806112
+  * Adapt to latest d-shlibs
+
+ -- Andreas Tille <tille at debian.org>  Tue, 24 Nov 2015 20:15:14 +0100
+
 staden-io-lib (1.14.6-1) unstable; urgency=medium
 
   * New upstream version
@@ -5,12 +13,6 @@
 
  -- Andreas Tille <tille at debian.org>  Sun, 08 Nov 2015 18:50:19 +0100
 
-staden-io-lib (1.14.3-1) unstable; urgency=medium
-
-  * New upstream release. 
-
--- Charles Plessy <plessy at debian.org>  Thu, 01 Oct 2015 22:13:09 +0900
-
 staden-io-lib (1.14.2-1) unstable; urgency=medium
 
   [ Charles Plessy ]

Modified: trunk/packages/staden-io-lib/trunk/debian/copyright
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/copyright	2015-11-24 18:56:58 UTC (rev 20534)
+++ trunk/packages/staden-io-lib/trunk/debian/copyright	2015-11-24 19:30:12 UTC (rev 20535)
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://qa.debian.org/watch/sf.php/staden/io_lib-1.14.3.tar.gz
+Source: http://qa.debian.org/watch/sf.php/staden/io_lib-1.13.7.tar.gz
 
 Files: *
 Copyright: © 1994 Medical Research Council

Modified: trunk/packages/staden-io-lib/trunk/debian/rules
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/rules	2015-11-24 18:56:58 UTC (rev 20534)
+++ trunk/packages/staden-io-lib/trunk/debian/rules	2015-11-24 19:30:12 UTC (rev 20535)
@@ -10,27 +10,30 @@
 %:
 	dh $@ --with autoreconf
 
-override_dh_install:
-	dh_install
+override_dh_install-arch:
+	dh_install -a
 	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/ \
+		    --exclude-la \
 		    --movedev "debian/tmp/usr/include" usr \
 		    debian/tmp/usr/lib/*/$(libpkg).so
 
+#override_dh_installman:
+	#dh_installman
 	# manpages need some post editing but in case it could be automated, this code would help
 	# mkdir -p $(mandir)
 	# help2man --no-discard-stderr --no-info --help-option='""' \
 	#	 --name='filter SRF files for various purposes' \
 	#	 --version-string="$(version)" \
 	#	 $(CURDIR)/debian/$(utils)/usr/bin/srf_filter > $(mandir)/srf_filter.1
+
+override_dh_install-indep:
+	dh_install -i
 	mkdir -p $(testdir)
         # fix path to staden-io-lib executable in examples
 	for tst in `ls tests/*.test` ; do \