Package: src:silly
Followup-For: Bug #758747

silly is also FTBFS on arm64:
https://buildd.debian.org/status/fetch.php?pkg=silly&arch=arm64&ver=0.1.0-3&stamp=1408660002

I have updated this patch a little to not need automake1.11 or the
NEWS & README creation just to keep autofoo happy. It tests fine on
arm64 and is almost certainly fine on ppc64el too.

The package could use some more updating of configure.ac to modern
macros to remove warnings and future-proof, but the packages come out
correctly so it'll do as it is.

As this bug has been around for a couple of months and the freeze
approaches fast I have NMUed this to delayed/4. Hope that's OK.
diff -Nru silly-0.1.0/debian/changelog silly-0.1.0/debian/changelog
--- silly-0.1.0/debian/changelog	2012-04-10 12:22:59.000000000 +0000
+++ silly-0.1.0/debian/changelog	2014-10-28 03:19:49.000000000 +0000
@@ -1,3 +1,10 @@
+silly (0.1.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use dh-autoreconf on build for new architectures (Closes: 758747)
+
+ -- Wookey <woo...@debian.org>  Tue, 28 Oct 2014 01:54:16 +0000
+
 silly (0.1.0-3) unstable; urgency=low
 
   * debian/control:
diff -Nru silly-0.1.0/debian/control silly-0.1.0/debian/control
--- silly-0.1.0/debian/control	2012-04-10 11:21:56.000000000 +0000
+++ silly-0.1.0/debian/control	2014-10-28 03:20:36.000000000 +0000
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Muammar El Khatib <muam...@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, libpng-dev, libjpeg-dev,
-               doxygen, pkg-config
+               doxygen, pkg-config, dh-autoreconf
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.cegui.org.uk
diff -Nru silly-0.1.0/debian/patches/autoreconf-fixups.patch silly-0.1.0/debian/patches/autoreconf-fixups.patch
--- silly-0.1.0/debian/patches/autoreconf-fixups.patch	1970-01-01 00:00:00.000000000 +0000
+++ silly-0.1.0/debian/patches/autoreconf-fixups.patch	2014-10-28 03:19:49.000000000 +0000
@@ -0,0 +1,13 @@
+Index: silly-0.1.0/configure.ac
+===================================================================
+--- silly-0.1.0.orig/configure.ac	2006-11-05 14:03:06.000000000 +0000
++++ silly-0.1.0/configure.ac	2014-10-28 02:42:15.251984601 +0000
+@@ -22,7 +22,7 @@
+ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+-AM_INIT_AUTOMAKE([pkg_name], [pkg_version])
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_HEADERS([include/SILLYOptions.h])
+ AC_CONFIG_SRCDIR([src/SILLYImage.cpp])
diff -Nru silly-0.1.0/debian/patches/series silly-0.1.0/debian/patches/series
--- silly-0.1.0/debian/patches/series	2012-04-10 11:07:25.000000000 +0000
+++ silly-0.1.0/debian/patches/series	2014-10-28 03:19:49.000000000 +0000
@@ -1 +1,2 @@
 01_SILLYPNGImageLoader.patch
+autoreconf-fixups.patch
diff -Nru silly-0.1.0/debian/rules silly-0.1.0/debian/rules
--- silly-0.1.0/debian/rules	2011-07-23 19:12:32.000000000 +0000
+++ silly-0.1.0/debian/rules	2014-10-28 03:19:49.000000000 +0000
@@ -19,7 +19,8 @@
         CFLAGS += -O2
 endif
 
-config.status: configure
+config.status:
+	dh_autoreconf 
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include 
@@ -36,6 +37,7 @@
 	touch build-stamp
 
 clean:
+	dh_autoreconf_clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -57,7 +59,7 @@
 
 	# Add here commands to install the package into debian/<packagename>
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	
+
 
 # Build architecture-independent files here.
 binary-indep: build install

Reply via email to