tags 727501 + patch
tags 727501 + pending
thanks

Dear maintainer,

This bug has been pending for some time, and needs fixing for new
ports, including arm64 which is building now:
(http://buildd.debian-ports.org/status/architecture.php?a=arm64&suite=sid).

So I've prepared an NMU for rxvt (versioned as 1:2.7.10-5.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I should
delay it longer.

Discussion on debian-devel revealed consensus that the right way to
ensure successful builds on all new architectures was to autoreconf
packages, so that method has been used to fix this bug. This works for
all arches, even those that need libtool changes, and will continue to
work into the future without an update as each new arch comes along.
(Discussion at
https://lists.debian.org/debian-devel/2014/04/msg00383.html, thread
starting at https://lists.debian.org/debian-devel/2014/04/msg00342.html

For this package dh_autoreconf-ing is a bit more intrusive than normal
because autoreconf needs to be run in a subdir, but the configure
script is copied out and run from the top level. Also the package only
uses autoconf so an autoreconf does not automatically update
config.{sub,guess} - that has to be done explicitly.

Attached is a simpler alternate patch to just update
config.{sub,guess}, which is neater but is a less-technically complete
solution (see above thread). You could use this one instead if you
prefer.

Regards.
diff -Nru rxvt-2.7.10/debian/autoreconf rxvt-2.7.10/debian/autoreconf
--- rxvt-2.7.10/debian/autoreconf	1970-01-01 01:00:00.000000000 +0100
+++ rxvt-2.7.10/debian/autoreconf	2014-06-23 21:59:15.000000000 +0100
@@ -0,0 +1 @@
+autoconf
diff -Nru rxvt-2.7.10/debian/changelog rxvt-2.7.10/debian/changelog
--- rxvt-2.7.10/debian/changelog	2013-09-21 23:13:42.000000000 +0100
+++ rxvt-2.7.10/debian/changelog	2014-06-23 23:06:01.000000000 +0100
@@ -1,3 +1,10 @@
+rxvt (1:2.7.10-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use dh-autoreconf in build to support new architectures (Closes: #727501)
+
+ -- Wookey <woo...@debian.org>  Fri, 06 Jun 2014 20:44:21 +0800
+
 rxvt (1:2.7.10-5) unstable; urgency=low
 
   * Applied the following patches which were applied to rxvt-beta:
diff -Nru rxvt-2.7.10/debian/control rxvt-2.7.10/debian/control
--- rxvt-2.7.10/debian/control	2013-07-12 02:33:09.000000000 +0100
+++ rxvt-2.7.10/debian/control	2014-06-23 03:27:59.000000000 +0100
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: George Gensure <wer...@gmail.com>
-Build-Depends: libx11-dev, libxt-dev, libxpm-dev, debhelper (>= 9), autotools-dev
+Build-Depends: libx11-dev, libxt-dev, libxpm-dev, debhelper (>= 9), dh-autoreconf, autotools-dev
 Standards-Version: 3.9.4
 Homepage: http://rxvt.sourceforge.net/
 
diff -Nru rxvt-2.7.10/debian/rules rxvt-2.7.10/debian/rules
--- rxvt-2.7.10/debian/rules	2013-08-29 02:40:18.000000000 +0100
+++ rxvt-2.7.10/debian/rules	2014-06-23 22:47:53.000000000 +0100
@@ -51,6 +51,9 @@
 	[ ! -f Makefile ] || $(MAKE) -i distclean
 	rm -f src/rxvt-xterm src/rxvt-xpm src/krxvt src/grxvt src/crxvt-gb src/crxvt-big5
 	rm -f doc/rxvt.1 rxvt-xterm.1 src/rxvtlib.h doc/Makefile doc/yodl/rxvtRef.yo
+	dh_autoreconf_clean
+	dh_autotools-dev_restoreconfig
+	[ ! -f .configure.orig ] || mv .configure.orig configure
 	dh_clean
 
 build: build-arch build-indep
@@ -60,6 +63,10 @@
 build.stamp:
 	dh_testdir
 
+	dh_autotools-dev_updateconfig
+	dh_autoreconf
+	mv configure .configure.orig
+	cp autoconf/configure .
 	./configure $(CFG_BASE) --without-xpm
 	echo "#define PTYS_ARE_GETPT 1" >> config.h
 	$(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' all clock
diff -Nru rxvt-2.7.10/debian/changelog rxvt-2.7.10/debian/changelog
--- rxvt-2.7.10/debian/changelog	2013-09-21 22:13:42.000000000 +0000
+++ rxvt-2.7.10/debian/changelog	2014-06-23 22:06:52.000000000 +0000
@@ -1,3 +1,10 @@
+rxvt (1:2.7.10-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use autotools-dev in build to support new architectures (Closes: #727501)
+
+ -- Chen Baozi <baoz...@gmail.com>  Fri, 06 Jun 2014 20:44:21 +0800
+
 rxvt (1:2.7.10-5) unstable; urgency=low
 
   * Applied the following patches which were applied to rxvt-beta:
diff -Nru rxvt-2.7.10/debian/rules rxvt-2.7.10/debian/rules
--- rxvt-2.7.10/debian/rules	2013-08-29 01:40:18.000000000 +0000
+++ rxvt-2.7.10/debian/rules	2014-06-23 22:07:52.000000000 +0000
@@ -51,6 +51,7 @@
 	[ ! -f Makefile ] || $(MAKE) -i distclean
 	rm -f src/rxvt-xterm src/rxvt-xpm src/krxvt src/grxvt src/crxvt-gb src/crxvt-big5
 	rm -f doc/rxvt.1 rxvt-xterm.1 src/rxvtlib.h doc/Makefile doc/yodl/rxvtRef.yo
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 build: build-arch build-indep
@@ -60,6 +61,7 @@
 build.stamp:
 	dh_testdir
 
+	dh_autotools-dev_updateconfig
 	./configure $(CFG_BASE) --without-xpm
 	echo "#define PTYS_ARE_GETPT 1" >> config.h
 	$(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' all clock

Reply via email to