Package: grisbi
Version: 1.0.0-2
Followup-For: Bug #744585
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch
As a followup to my last patch, I note that it won't work when building
arch:all packages (should have tested it earlier) without also applying
this short patch:
* 0099-reorder-autoconf.patch: Run AM_INIT_AUTOMAKE earlier to
work around buggy behaviour in certain versions of autotools
This should probably be forwarded upsteam to robustify their autoconf
setup against being rebuilt with broken/confused autotools versions.
... 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/patches/0099-reorder-autoconf.patch grisbi-1.0.0/debian/patches/0099-reorder-autoconf.patch
--- grisbi-1.0.0/debian/patches/0099-reorder-autoconf.patch 1969-12-31 17:00:00.000000000 -0700
+++ grisbi-1.0.0/debian/patches/0099-reorder-autoconf.patch 2014-05-03 16:00:09.000000000 -0600
@@ -0,0 +1,27 @@
+Description: Run AM_INIT_AUTOMAKE earlier to work around buggy autotools
+Author: Adam Conrad <adcon...@ubuntu.com>
+Origin: http://cgit.freedesktop.org/xcb/libxcb/commit/?id=50fb3a6312dd0b6b613fc886ffd6827952d1e286
+Upstream-Bug: http://lists.gnu.org/archive/html/bug-autoconf/2013-07/msg00000.html
+
+--- grisbi-1.0.0.orig/configure.in
++++ grisbi-1.0.0/configure.in
+@@ -22,6 +22,9 @@ dnl ====================================
+ dnl Standard checks.
+ dnl ================================================================
+
++AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 no-dist-gzip])
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++
+ AC_PROG_CC
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_HEADER_STDC
+@@ -33,9 +36,6 @@ AC_PROG_OBJC
+ dnl Check if we have backtrace support
+ AC_CHECK_FUNCS(backtrace)
+
+-AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 no-dist-gzip])
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-
+ dnl Initialize libtool
+ LT_INIT
+
diff -Nru grisbi-1.0.0/debian/patches/series grisbi-1.0.0/debian/patches/series
--- grisbi-1.0.0/debian/patches/series 2014-04-07 18:02:42.000000000 -0600
+++ grisbi-1.0.0/debian/patches/series 2014-05-03 15:55:24.000000000 -0600
@@ -1,3 +1,4 @@
0001-Tune-grisbi.desktop.patch
0002-Add-.pc-quilt-to-POTFILES.skip.patch
0003-Fix-variable-of-type-PangoAlignment-expected-instead.patch
+0099-reorder-autoconf.patch
