r42700 - in /attic/libglademm2.4/debian: changelog control control.in patches/autoreconf_fix.patch rules

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Sep  9 17:12:09 2014
New Revision: 42700

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42700
Log:
Update libtool at build time using dh-autoreconf, in order to fix a
build failure on x32. (Closes: #702355)

Added:
    attic/libglademm2.4/debian/patches/autoreconf_fix.patch
Modified:
    attic/libglademm2.4/debian/changelog
    attic/libglademm2.4/debian/control
    attic/libglademm2.4/debian/control.in
    attic/libglademm2.4/debian/rules

Modified: attic/libglademm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libglademm2.4/debian/changelog?rev=42700&op=diff
==============================================================================
--- attic/libglademm2.4/debian/changelog	[utf-8] (original)
+++ attic/libglademm2.4/debian/changelog	[utf-8] Tue Sep  9 17:12:09 2014
@@ -1,4 +1,4 @@
-libglademm2.4 (2.6.7-3) UNRELEASED; urgency=low
+libglademm2.4 (2.6.7-3) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * debian/control.in,
@@ -8,7 +8,11 @@
   [ Josselin Mouette ]
   * Update repository URL.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 11 Dec 2010 13:27:04 +0100
+  [ Daniel Schepler ]
+  * Update libtool at build time using dh-autoreconf, in order to fix a
+    build failure on x32. (Closes: #702355)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 09 Sep 2014 19:07:27 +0200
 
 libglademm2.4 (2.6.7-2) unstable; urgency=low
 

Modified: attic/libglademm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libglademm2.4/debian/control?rev=42700&op=diff
==============================================================================
--- attic/libglademm2.4/debian/control	[utf-8] (original)
+++ attic/libglademm2.4/debian/control	[utf-8] Tue Sep  9 17:12:09 2014
@@ -17,7 +17,8 @@
                dpkg-dev (>= 1.14.16),
                gnome-pkg-tools (>= 0.11),
                libglade2-dev (>= 1:2.6.1),
-               libgtkmm-2.4-dev (>= 1:2.6.0)
+               libgtkmm-2.4-dev (>= 1:2.6.0),
+               dh-autoreconf
 Standards-Version: 3.8.1
 
 Package: libglademm-2.4-dev

Modified: attic/libglademm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libglademm2.4/debian/control.in?rev=42700&op=diff
==============================================================================
--- attic/libglademm2.4/debian/control.in	[utf-8] (original)
+++ attic/libglademm2.4/debian/control.in	[utf-8] Tue Sep  9 17:12:09 2014
@@ -12,7 +12,8 @@
                dpkg-dev (>= 1.14.16),
                gnome-pkg-tools (>= 0.11),
                libglade2-dev (>= 1:2.6.1),
-               libgtkmm-2.4-dev (>= 1:2.6.0)
+               libgtkmm-2.4-dev (>= 1:2.6.0),
+               dh-autoreconf
 Standards-Version: 3.8.1
 
 Package: libglademm-2.4-dev

Added: attic/libglademm2.4/debian/patches/autoreconf_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libglademm2.4/debian/patches/autoreconf_fix.patch?rev=42700&op=file
==============================================================================
--- attic/libglademm2.4/debian/patches/autoreconf_fix.patch	(added)
+++ attic/libglademm2.4/debian/patches/autoreconf_fix.patch	[utf-8] Tue Sep  9 17:12:09 2014
@@ -0,0 +1,35 @@
+Index: libglademm2.4-2.6.7/configure.in
+===================================================================
+--- libglademm2.4-2.6.7.orig/configure.in	2013-03-05 08:10:23.000000000 -0800
++++ libglademm2.4-2.6.7/configure.in	2013-03-05 08:11:18.000000000 -0800
+@@ -43,6 +43,7 @@
+ AC_SUBST(LIBGLADEMM_SO_VERSION)
+ 
+ AC_CONFIG_AUX_DIR(scripts)
++AC_CONFIG_MACRO_DIR(scripts)
+ 
+ dnl For automake.
+ VERSION=$LIBGLADEMM_VERSION
+@@ -141,10 +142,6 @@
+ SUN make does not work for building gtkmm.
+ Please install GNU make.]))
+ 
+-# This macro is installed by glibmm
+-# Doxygen needs the path to the installed perl.
+-GLIBMM_CHECK_PERL([5.6.0])
+-
+ #########################################################################
+ #  Dependancy checks
+ #########################################################################
+Index: libglademm2.4-2.6.7/Makefile.am
+===================================================================
+--- libglademm2.4-2.6.7.orig/Makefile.am	2013-03-05 08:10:23.000000000 -0800
++++ libglademm2.4-2.6.7/Makefile.am	2013-03-05 08:10:23.000000000 -0800
+@@ -6,6 +6,7 @@
+ 		  build_shared/Makefile_build_gensrc.am_fragment \
+ 		  build_shared/Makefile_gensrc.am_fragment
+ 
++ACLOCAL_AMFLAGS = -I scripts
+ 
+ all-local:
+ 	@echo "*** Everything completed ***"

Modified: attic/libglademm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libglademm2.4/debian/rules?rev=42700&op=diff
==============================================================================
--- attic/libglademm2.4/debian/rules	[utf-8] (original)
+++ attic/libglademm2.4/debian/rules	[utf-8] Tue Sep  9 17:12:09 2014
@@ -6,6 +6,7 @@
 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
+include /usr/share/cdbs/1/rules/autoreconf.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := libglademm
@@ -20,6 +21,7 @@
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o
+export AUTOHEADER=true
 
 install/$(DOC_PKG)::
 	$(MAKE) -C $(CURDIR)/examples clean