Package: geda-gaf
Version: 1:1.8.2-2
Followup-For: Bug #724922
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch


In Ubuntu, the attached patch was applied to achieve the following:

  * Switch to dh_autoreconf to update libtool macros for new ports.
  * Re-enable tests on all arches; autoreconf fixes the fork bomb.

So, I actually did this to add support for ppc64el but, as a happy
accident, I noticed that autoreconfing fixes whatever braindamage
the upstream makefiles had that was causing the fork bomb recursion
madness.  So, here's a twofer, extra arch support and an FTBFS fix.

And, before you ask, yes, you can replace autotools-dev with reconf
in this case, as automake-using projects update config.{sub,guess}
on autoreconf, so you can consider it a superset in those cases.

... Adam

-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-19-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru geda-gaf-1.8.2/debian/changelog geda-gaf-1.8.2/debian/changelog
diff -Nru geda-gaf-1.8.2/debian/control geda-gaf-1.8.2/debian/control
--- geda-gaf-1.8.2/debian/control	2013-10-17 17:19:16.000000000 -0600
+++ geda-gaf-1.8.2/debian/control	2014-03-24 21:36:32.000000000 -0600
@@ -4,7 +4,7 @@
 Maintainer: Debian Electronics Team <pkg-electronics-de...@lists.alioth.debian.org>
 Uploaders: Peter Clifton <pc...@cam.ac.uk>, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@sabily.org>, Hamish Moffatt <ham...@debian.org>, Bdale Garbee <bd...@gag.com>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.16.0), guile-2.0-dev [!ia64 !hurd-i386], guile-1.8-dev [ia64 hurd-i386], libgd-dev, libxml-parser-perl, ghostscript, transfig, libstroke0-dev, groff, libglib2.0-dev, flex, intltool, autotools-dev
+Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.16.0), guile-2.0-dev [!ia64 !hurd-i386], guile-1.8-dev [ia64 hurd-i386], libgd-dev, libxml-parser-perl, ghostscript, transfig, libstroke0-dev, groff, libglib2.0-dev, flex, intltool, dh-autoreconf
 Homepage: http://geda.seul.org/
 Vcs-Git: git://anonscm.debian.org/pkg-electronics/geda-gaf.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-electronics/geda-gaf.git
diff -Nru geda-gaf-1.8.2/debian/rules geda-gaf-1.8.2/debian/rules
--- geda-gaf-1.8.2/debian/rules	2013-10-17 17:19:16.000000000 -0600
+++ geda-gaf-1.8.2/debian/rules	2014-03-24 20:47:51.000000000 -0600
@@ -4,7 +4,7 @@
 TEST_HOME=$(CURDIR)/tmp-home
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf
 
 override_dh_clean:
 	# gnetlist.orig is an upstream file that should not be removed:
@@ -18,12 +18,8 @@
 	                     --disable-rpath LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
 
 override_dh_auto_test:
-ifneq (${DEB_BUILD_ARCH},armel)
-  ifneq (${DEB_BUILD_ARCH},armhf)
 	mkdir -p $(TEST_HOME)
 	HOME=$(TEST_HOME) dh_auto_test
-  endif
-endif
 
 LIBPKG=libgeda42
 DEVPKG=libgeda-dev

Reply via email to