Source: libgnomecanvasmm2.6
Followup-For: Bug #744610

Hello.

As suggested by Matthias, using dh-autoreconf fixes the ftbfs.
But it is not straightforward. Due to difference of autoconf versions 
(probably),
the macro AC_DEFINE_UNQUOTED in configure.in, which comes with 2 arguments, 
breaks
the autoreconf.
Also there is a m4 file with macros expansion which was not included in 
configure.in.
So, in the attached patch, you will see some modifications to configure.in and
in debian/rules.

Thanks and Regards


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: ppc64el (ppc64le)

Kernel: Linux 3.13-1-powerpc64le (SMP w/16 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libgnomecanvasmm2.6-2.26.0/debian/control.in libgnomecanvasmm2.6-2.26.0/debian/control.in
--- libgnomecanvasmm2.6-2.26.0/debian/control.in
+++ libgnomecanvasmm2.6-2.26.0/debian/control.in
@@ -8,6 +8,7 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6
 Build-Depends: cdbs (>= 0.4.51),
+               dh-autoreconf,
                chrpath,
                debhelper (>= 6),
                dpkg-dev (>= 1.14.16),
diff -u libgnomecanvasmm2.6-2.26.0/debian/control libgnomecanvasmm2.6-2.26.0/debian/control
--- libgnomecanvasmm2.6-2.26.0/debian/control
+++ libgnomecanvasmm2.6-2.26.0/debian/control
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: libgnomecanvasmm2.6
 Section: libs
 Priority: optional
@@ -8,6 +13,7 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6
 Build-Depends: cdbs (>= 0.4.51),
+               dh-autoreconf,
                chrpath,
                debhelper (>= 6),
                dpkg-dev (>= 1.14.16),
diff -u libgnomecanvasmm2.6-2.26.0/debian/changelog libgnomecanvasmm2.6-2.26.0/debian/changelog
--- libgnomecanvasmm2.6-2.26.0/debian/changelog
+++ libgnomecanvasmm2.6-2.26.0/debian/changelog
@@ -1,3 +1,11 @@
+libgnomecanvasmm2.6 (2.26.0-1ppc6el1) UNRELEASED; urgency=medium
+
+  * Added cdbs' autoreconf to the build
+  * Added AC_CONFIG_MACRO_DIR([scripts]) to configure.in so it uses macros.m4 to expand
+  * Modified AC_DEFINE_UNQUOTED to 3 arguments instead of 2 due to breaking autoconf
+
+ -- Fernando Seiti Furusato <[email protected]>  Fri, 01 Aug 2014 06:05:14 +0000
+
 libgnomecanvasmm2.6 (2.26.0-1) unstable; urgency=low
 
   * New upstream stable release.
diff -u libgnomecanvasmm2.6-2.26.0/debian/rules libgnomecanvasmm2.6-2.26.0/debian/rules
--- libgnomecanvasmm2.6-2.26.0/debian/rules
+++ libgnomecanvasmm2.6-2.26.0/debian/rules
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
only in patch2:
unchanged:
--- libgnomecanvasmm2.6-2.26.0.orig/debian/patches/fix-configure-in.patch
+++ libgnomecanvasmm2.6-2.26.0/debian/patches/fix-configure-in.patch
@@ -0,0 +1,25 @@
+Index: libgnomecanvasmm2.6-2.26.0/configure.in
+===================================================================
+--- libgnomecanvasmm2.6-2.26.0.orig/configure.in	2009-03-16 17:21:10.000000000 +0000
++++ libgnomecanvasmm2.6-2.26.0/configure.in	2014-08-01 06:13:28.430004306 +0000
+@@ -12,6 +12,7 @@
+ #  Copyright 1998 Stephan Kulow 
+ #
+ AC_INIT(libgnomecanvas/libgnomecanvasmmconfig.h.in)
++AC_CONFIG_MACRO_DIR([scripts])
+ 
+ #########################################################################
+ #  Version and initialization
+@@ -31,9 +32,9 @@
+ 
+ LIBGNOMECANVASMM_VERSION=$LIBGNOMECANVASMM_MAJOR_VERSION.$LIBGNOMECANVASMM_MINOR_VERSION.$LIBGNOMECANVASMM_MICRO_VERSION
+ LIBGNOMECANVASMM_RELEASE=$LIBGNOMECANVASMM_MAJOR_VERSION.$LIBGNOMECANVASMM_MINOR_VERSION
+-AC_DEFINE_UNQUOTED(LIBGNOMECANVASMM_MAJOR_VERSION, $LIBGNOMECANVASMM_MAJOR_VERSION)
+-AC_DEFINE_UNQUOTED(LIBGNOMECANVASMM_MINOR_VERSION, $LIBGNOMECANVASMM_MINOR_VERSION)
+-AC_DEFINE_UNQUOTED(LIBGNOMECANVASMM_MICRO_VERSION, $LIBGNOMECANVASMM_MICRO_VERSION)
++AC_DEFINE_UNQUOTED(LIBGNOMECANVASMM_MAJOR_VERSION, $LIBGNOMECANVASMM_MAJOR_VERSION, [ ])
++AC_DEFINE_UNQUOTED(LIBGNOMECANVASMM_MINOR_VERSION, $LIBGNOMECANVASMM_MINOR_VERSION, [ ])
++AC_DEFINE_UNQUOTED(LIBGNOMECANVASMM_MICRO_VERSION, $LIBGNOMECANVASMM_MICRO_VERSION, [ ])
+ AC_SUBST(LIBGNOMECANVASMM_VERSION)
+ AC_SUBST(LIBGNOMECANVASMM_RELEASE)
+ AC_SUBST(LIBGNOMECANVASMM_SO_VERSION)
only in patch2:
unchanged:
--- libgnomecanvasmm2.6-2.26.0.orig/debian/patches/series
+++ libgnomecanvasmm2.6-2.26.0/debian/patches/series
@@ -0,0 +1 @@
+fix-configure-in.patch

Reply via email to