[Pkg-apache-commits] r1046 - in /trunk/apr-util: changelog patches/00list patches/015_disable_expat_buildconf.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sat Sep 12 12:50:55 2009
New Revision: 1046

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1046
Log:
fix FTBFS with sh != dash

Added:
    trunk/apr-util/patches/015_disable_expat_buildconf.dpatch   (with props)
Modified:
    trunk/apr-util/changelog
    trunk/apr-util/patches/00list

Modified: trunk/apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/changelog?rev=1046&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Sat Sep 12 12:50:55 2009
@@ -1,5 +1,7 @@
 apr-util (1.3.9+dfsg-2) UNRELEASED; urgency=low
 
+  * Fix FTBFS (closes: #545718). The FTBFS didn't happen with dash as /bin/sh
+    due to dash bug #514863.
   * Make libaprutil1-dev depend on libmysqlclient-dev instead of
     libmysqlclient15-dev.
 

Modified: trunk/apr-util/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/00list?rev=1046&op=diff
==============================================================================
--- trunk/apr-util/patches/00list (original)
+++ trunk/apr-util/patches/00list Sat Sep 12 12:50:55 2009
@@ -6,4 +6,5 @@
 011_avoid_ldap_by_defaut.dpatch
 013_ship_find_apu.m4
 014_apu_config_dont_list_indep_libs
+015_disable_expat_buildconf.dpatch
 099_alternate_md4_md5_impl

Added: trunk/apr-util/patches/015_disable_expat_buildconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/015_disable_expat_buildconf.dpatch?rev=1046&op=file
==============================================================================
--- trunk/apr-util/patches/015_disable_expat_buildconf.dpatch (added)
+++ trunk/apr-util/patches/015_disable_expat_buildconf.dpatch Sat Sep 12 12:50:55 2009
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 015_disable_expat_buildconf.dpatch by Stefan Fritsch <sf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: We don't need the bundled expat. This allows us to avoid a build-dep
+## DP: on libtool.
+
+ at DPATCH@
+diff -urNad trunk~/buildconf trunk/buildconf
+--- trunk~/buildconf	2009-09-12 14:45:13.892735207 +0200
++++ trunk/buildconf	2009-09-12 14:45:46.560734181 +0200
+@@ -84,14 +84,6 @@
+ echo "Generating 'make' outputs ..."
+ $apr_src_dir/build/gen-build.py make
+ 
+-#
+-# If Expat has been bundled, then go and configure the thing
+-#
+-if [ -f xml/expat/buildconf.sh ]; then
+-  echo "Invoking xml/expat/buildconf.sh ..."
+-  (cd xml/expat; ./buildconf.sh)
+-fi
+-
+ # Remove autoconf cache again
+ rm -rf autom4te*.cache
+ 

Propchange: trunk/apr-util/patches/015_disable_expat_buildconf.dpatch
------------------------------------------------------------------------------
    svn:executable = *