r15004 - packages/trunk/morris/debian

[Vincent Cheng]

Author: vcheng
Date: 2014-03-31 08:13:41 +0000 (Mon, 31 Mar 2014)
New Revision: 15004

Modified:
   packages/trunk/morris/debian/changelog
   packages/trunk/morris/debian/rules
Log:
Merge FTBFS fix from Ubuntu


Modified: packages/trunk/morris/debian/changelog
===================================================================
--- packages/trunk/morris/debian/changelog	2014-03-31 07:45:05 UTC (rev 15003)
+++ packages/trunk/morris/debian/changelog	2014-03-31 08:13:41 UTC (rev 15004)
@@ -1,3 +1,21 @@
+morris (0.2-2) unstable; urgency=medium
+
+  * Team upload.
+
+  * Merged from Ubuntu:
+
+  [ Jackson Doak ]
+  * debian/rules: include /usr/share/dpkg/default.mk and
+    add --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) 
+    to configure. Fixes FTBFS (Closes: #741751)
+
+  [ Logan Rosen ]
+  * Use debhelper functions from autotools-dev to update config.{sub,guess}
+    instead of doing it manually to try to fix FTBFS on arm64 and ppc64el.
+  * Have clean not depend on config, as we are configuring twice.
+
+ -- Vincent Cheng <vcheng at debian.org>  Mon, 31 Mar 2014 01:08:37 -0700
+
 morris (0.2-1) unstable; urgency=low
 
   * Initial release. Closes: #719491

Modified: packages/trunk/morris/debian/rules
===================================================================
--- packages/trunk/morris/debian/rules	2014-03-31 07:45:05 UTC (rev 15003)
+++ packages/trunk/morris/debian/rules	2014-03-31 08:13:41 UTC (rev 15004)
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/default.mk
+
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
@@ -13,12 +15,7 @@
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	dh_autotools-dev_updateconfig
 	./configure $(CROSS) \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -27,6 +24,7 @@
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--with-gconf-schema-file-dir=\$${prefix}/share/gconf/schemas/ \
+		--with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
 		LDFLAGS="$(LDFLAGS) $(LDFLAGS2)"
@@ -43,13 +41,14 @@
 
 build: build-arch build-indep
 
-clean: config
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess config.cache config.log
+	rm -f config.cache config.log
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 install: build