diff -u apr-1.3.3/debian/changelog apr-1.3.3/debian/changelog --- apr-1.3.3/debian/changelog +++ apr-1.3.3/debian/changelog @@ -1,3 +1,14 @@ +apr (1.3.3-3ubuntu1) karmic; urgency=low + + * debian/patches/025_force_buildconf_to_call_autoreconf.dpatch + - As part of APR's build process, it calls autoconf automatically. This + patch forces that call to autoreconf, which forces macros to be updated + and updates libtool properly, resolving an FTBFS on karmic. (LP: #372068) + * debian/control: + - Added automake to the build-deps for aclocal + + -- Michael Casadevall Tue, 05 May 2009 03:42:41 -0400 + apr (1.3.3-3) unstable; urgency=low * Reduce stack size for the 'testatomic' test since it may otherwise run out diff -u apr-1.3.3/debian/control apr-1.3.3/debian/control --- apr-1.3.3/debian/control +++ apr-1.3.3/debian/control @@ -1,9 +1,10 @@ Source: apr Section: libs Priority: optional -Maintainer: Debian Apache Maintainers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian Apache Maintainers Uploaders: Tollef Fog Heen , Peter Samuelson , Stefan Fritsch , Ryan Niebur -Build-Depends: debhelper (>> 5.0.0), autoconf, autotools-dev, dpatch, mawk, uuid-dev, doxygen, netbase, net-tools, libtool, python +Build-Depends: debhelper (>> 5.0.0), autoconf, autotools-dev, automake, dpatch, mawk, uuid-dev, doxygen, netbase, net-tools, libtool, python Standards-Version: 3.8.0 Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr diff -u apr-1.3.3/debian/patches/00list apr-1.3.3/debian/patches/00list --- apr-1.3.3/debian/patches/00list +++ apr-1.3.3/debian/patches/00list @@ -8,0 +9 @@ +025_force_buildconf_to_call_autoreconf only in patch2: unchanged: --- apr-1.3.3.orig/debian/patches/025_force_buildconf_to_call_autoreconf.dpatch +++ apr-1.3.3/debian/patches/025_force_buildconf_to_call_autoreconf.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 025_force_buildconf_to_call_autoreconf.dpatch by Michael Casadevall +## +## DP: Forces autoreconf to vs autoconf to run and update macros in the configure files + +@DPATCH@ +diff -urNad apr-1.3.3~/buildconf apr-1.3.3/buildconf +--- apr-1.3.3~/buildconf 2006-08-03 06:46:47.000000000 -0400 ++++ apr-1.3.3/buildconf 2009-05-05 03:41:37.660223246 -0400 +@@ -82,7 +82,7 @@ + + echo "Creating configure ..." + ### do some work to toss config.cache? +-${AUTOCONF:-autoconf} ++${AUTOCONF:-autoreconf -fvi} + + # Remove autoconf 2.5x's cache directory + rm -rf autom4te*.cache