r3140 - packages/mbsystem/trunk/debian

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2014-03-22 09:35:46 +0000 (Sat, 22 Mar 2014)
New Revision: 3140

Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/mbsystem-doc.install
   packages/mbsystem/trunk/debian/rules
Log:
update for upstream release 5.4.2176; explicit autoconf no longer needed


Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog	2014-03-16 01:09:27 UTC (rev 3139)
+++ packages/mbsystem/trunk/debian/changelog	2014-03-22 09:35:46 UTC (rev 3140)
@@ -1,11 +1,11 @@
-mbsystem (5.4.2149-0) UNRELEASED; urgency=low
+mbsystem (5.4.2176-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages
   * Added doc-base registration
   * GSF support disabled (unclear SAIC copyright status)
 
- -- Hamish Bowman <hamish_b yahoo.com>  Sun, 02 Jun 2013 13:09:24 +1200
+ -- Hamish Bowman <hamish_b yahoo.com>  Sat, 22 Mar 2014 14:22:58 +1300
 
 mbsystem (5.1.2-0) UNRELEASED; urgency=low
 

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.install	2014-03-16 01:09:27 UTC (rev 3139)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install	2014-03-22 09:35:46 UTC (rev 3140)
@@ -1,2 +1,2 @@
-usr/share/doc/mbsystem/html /usr/share/doc/mbsystem-doc/docs/
-usr/share/doc/mbsystem/ps /usr/share/doc/mbsystem-doc/docs/
+usr/share/doc/mbsystem/docs/html /usr/share/doc/mbsystem-doc/docs/
+usr/share/doc/mbsystem/docs/ps /usr/share/doc/mbsystem-doc/docs/

Modified: packages/mbsystem/trunk/debian/rules
===================================================================
--- packages/mbsystem/trunk/debian/rules	2014-03-16 01:09:27 UTC (rev 3139)
+++ packages/mbsystem/trunk/debian/rules	2014-03-22 09:35:46 UTC (rev 3140)
@@ -7,20 +7,16 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@ --parallel
 
-override_dh_autoreconf:
-	[ ! -x "./autogen.sh" ] || ./autogen.sh
-	dh_autoreconf
 
-
 override_dh_auto_configure:
+	$(shell dpkg-buildflags --export=configure) \
 	dh_auto_configure -- \
 		--includedir=/usr/include/mbsystem \
 		--docdir=/usr/share/doc/mbsystem/docs \
 		--with-gmt-include=/usr/include/gmt \
-		--without-gsf \
-		$(shell dpkg-buildflags --export=configure)
+		--without-gsf
 
 # dpkg-buildflags needed for hardening support if compat is held at '8'.
 # The --exp=config doesn't exist on Squeeze, remove the line when building