Package: grisbi
Version: 1.0.0-2
Followup-For: Bug #744585
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch



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

  * Replace manual config.{sub,guess} updating with dh-autoreconf.

This replaces the manual copying bits with dh-autoreconf, greatly
simplifying debian/rules and fixing an FTBFS on ppc64el.  Please
consider applying it.

... Adam

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

Kernel: Linux 3.13.0-24-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 grisbi-1.0.0/debian/changelog grisbi-1.0.0/debian/changelog
diff -Nru grisbi-1.0.0/debian/control grisbi-1.0.0/debian/control
--- grisbi-1.0.0/debian/control	2014-04-19 03:25:41.000000000 -0600
+++ grisbi-1.0.0/debian/control	2014-05-03 15:42:41.000000000 -0600
@@ -5,6 +5,7 @@
 Uploaders: Roberto C. Sanchez <robe...@connexer.com>
 Build-Depends:
  debhelper (>= 9),
+ dh-autoreconf,
  libgtk2.0-dev,
  libxml2-dev,
  libofx-dev,
diff -Nru grisbi-1.0.0/debian/rules grisbi-1.0.0/debian/rules
--- grisbi-1.0.0/debian/rules	2014-04-20 01:19:49.000000000 -0600
+++ grisbi-1.0.0/debian/rules	2014-05-03 15:33:01.000000000 -0600
@@ -3,35 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-SHARED_CONFIG := /usr/share/misc/config
-
 %:
-	dh $@
-
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure: config-stamp
-	dh_auto_configure
-
-config-stamp:
-# Use most up-to-date config.{sub,guess}
-	for u in sub guess; do \
-	  if [ -f $(SHARED_CONFIG).$$u ]; then \
-	    mv config.$$u debian && \
-	    cp $(SHARED_CONFIG).$$u .; \
-	  fi; \
-	done
-	touch $@
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-# Restore upstream config.{sub,guess}
-	for u in sub guess; do \
-	  if [ -f debian/config.$$u ]; then \
-	    mv debian/config.$$u .; \
-	  fi; \
-	done
-	rm -f config-stamp
-	dh_auto_clean
+	dh $@ --with autoreconf
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:

Reply via email to