--- apr-util-1.4.1.orig/debian/rules
+++ apr-util-1.4.1/debian/rules
@@ -0,0 +1,135 @@
+#!/usr/bin/make -f
+
+# Turn on VERBOSE output
+#export DH_VERBOSE=1
+export DH_OPTIONS
+
+# for ppc64 on Ubuntu
+export DEB_GCC_NO_O3=1
+
+#enable dpatch
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# get cflags frpm apr-config but remove -O2
+CFLAGS := $(CFLAGS) $(shell apr-1-config --cflags |perl -p -e 's!-O.( |$$)!!')
+LDFLAGS := $(LDFLAGS) $(shell apr-1-config --ldflags)
+
+# hardening options
+H_CFLAGS := -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+H_LDFLAGS := -Wl,-z,relro
+
+# Enable debug builds
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O0
+else
+  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+  else
+    CFLAGS += -O2
+  endif
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS))$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	TEST_TARGET = test
+else
+	TEST_TARGET =
+endif
+
+# disable tests on hurd until they are fixed (see #530287)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifeq (hurd, $(DEB_HOST_ARCH_OS))
+	TEST_TARGET =
+endif
+
+ifeq ($(DEB_BUILD_ARCH),i386)
+        CONFFLAGS=apr_lock_method=USE_PROC_PTHREAD_SERIALIZE
+else
+        CONFFLAGS=ac_cv_func_pthread_mutexattr_setpshared=no ac_cv_func_sem_open=no
+endif
+
+CONFFLAGS += ac_cv_prog_AWK=mawk
+# workaround for #651147, remove in 1.4.x:
+CONFFLAGS += ac_cv_ldap_set_rebind_proc_style=three
+
+SHELL=/bin/bash
+
+config.status: configure.in patch-stamp
+	dh_testdir
+	./buildconf --with-apr=$(shell apr-1-config --srcdir)
+	$(CONFFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --with-apr=/usr/bin/apr-1-config --with-ldap=yes --with-dbm=db --with-sqlite3 --with-pgsql=/usr --without-gdbm --without-sqlite2 --with-berkeley-db --with-mysql=/usr --with-freetds=/usr --with-odbc=/usr --with-openssl=/usr
+
+build: patch-stamp build-stamp
+
+build-stamp: config.status
+	dh_testdir
+
+	# LDFLAGS=-Wl,--as-needed does not work since it affects only libraries
+	# given _after_ it on the command line, but apr's libtool puts the 
+	# "-l..." _before_ the "-Wl,--as-needed"
+	$(MAKE) CFLAGS="$(CFLAGS) $(H_CFLAGS)" LDFLAGS="$(LDFLAGS) $(H_LDFLAGS)" EXTRA_CFLAGS=""
+	$(MAKE) dox
+
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp test-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f test/data/test-db test/data/test-sdbm.dir test/data/test-sdbm.pag
+	rm -f xml/expat/aclocal.m4 xml/expat/configure xml/expat/conftools/ltmain.sh
+	rm -f build-outputs.mk build/apr_common.m4 build/config.guess build/config.sub config.nice configure config.log
+	rm -rf docs/dox
+
+	dh_clean
+
+test: test-stamp
+
+test-stamp: build
+	dh_testdir
+	$(MAKE) -j 1 check
+
+	touch $@
+
+install: build $(TEST_TARGET)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	perl -p -i -e "s,^dependency_libs=.*,dependency_libs=''," $(CURDIR)/debian/tmp/usr/lib/libaprutil-1.la
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES
+	dh_installdocs
+	dh_lintian
+	dh_install -a
+	dh_link
+	dh_strip --dbg-package=libaprutil1-dbg
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -plibaprutil1
+	dh_makeshlibs -n -Nlibaprutil1
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- apr-util-1.4.1.orig/debian/libaprutil1-ldap.install
+++ apr-util-1.4.1/debian/libaprutil1-ldap.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/apr-util-1/apr_ldap-1.so usr/lib/apr-util-1/
+debian/tmp/usr/lib/apr-util-1/apr_ldap.so usr/lib/apr-util-1/
+
--- apr-util-1.4.1.orig/debian/libaprutil1-dbd-mysql.install
+++ apr-util-1.4.1/debian/libaprutil1-dbd-mysql.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/apr-util-1/apr_dbd_mysql-1.so usr/lib/apr-util-1/
+debian/tmp/usr/lib/apr-util-1/apr_dbd_mysql.so usr/lib/apr-util-1/
+
--- apr-util-1.4.1.orig/debian/libaprutil1-dbd-sqlite3.install
+++ apr-util-1.4.1/debian/libaprutil1-dbd-sqlite3.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/apr-util-1/apr_dbd_sqlite3-1.so usr/lib/apr-util-1/
+debian/tmp/usr/lib/apr-util-1/apr_dbd_sqlite3.so usr/lib/apr-util-1/
+
--- apr-util-1.4.1.orig/debian/compat
+++ apr-util-1.4.1/debian/compat
@@ -0,0 +1 @@
+6
--- apr-util-1.4.1.orig/debian/copyright
+++ apr-util-1.4.1/debian/copyright
@@ -0,0 +1,196 @@
+This package was debianized by Thom May <thom@debian.org> on
+Wed, 17 Nov 2004 11:27:14 -0800
+
+It was downloaded from http://httpd.apache.org/download.cgi
+
+Upstream Authors: The Apache Software Foundation - http://apr.apache.org/
+
+Copyright:
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. The ASF licenses this work to You under the Apache License,
+Version 2.0 (the "License"); you may not use this work except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+On a Debian system, the license can be found at
+/usr/share/common-licenses/Apache-2.0 .
+
+
+APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
+file_io/unix/mktemp.c, strings/apr_strings.c:
+
+/* 
+ * Copyright (c) 1987, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+From dso/aix/dso.c:
+
+ *  Based on libdl (dlfcn.c/dlfcn.h) which is
+ *  Copyright (c) 1992,1993,1995,1996,1997,1988
+ *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ *
+ *  Not derived from licensed software.
+ *
+ *  Permission is granted to freely use, copy, modify, and redistribute
+ *  this software, provided that the author is not construed to be liable
+ *  for any results of using the software, alterations are clearly marked
+ *  as such, and this notice is not modified.
+
+From strings/apr_strnatcmp.c, include/apr_strings.h:
+
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+
+From test/CuTest.c, test/CuTest.h:
+
+ * Copyright (c) 2002-2006 Asim Jalis
+ * 
+ * This library is released under the zlib/libpng license as described at
+ * 
+ * http://www.opensource.org/licenses/zlib-license.html
+ * 
+ * Here is the statement of the license:
+ * 
+ * This software is provided 'as-is', without any express or implied warranty. 
+ * In no event will the authors be held liable for any damages arising from 
+ * the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose, 
+ * including commercial applications, and to alter it and redistribute it 
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not 
+ * claim that you wrote the original software. If you use this software in a 
+ * product, an acknowledgment in the product documentation would be 
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source distribution.
+
+
+The source files crypto/apr_md4.c and crypto/apr_md5.c contain code which is
+derived from reference code from RFC-1320, and RFC-1321. This code is
+copyright RSA Data Security, Inc. ("RSA"). RSA made the following statement
+about the conditions of use of this code. Debian chooses to use and
+distribute this code according to the conditions outlined in this statement
+and NOT according to the license contained in the source files.
+
+  The following was recevied Fenbruary 23,2000 From: "Linn, John" February 19,
+  2000
+  
+  The purpose of this memo is to clarify the status of intellectual
+  property rights asserted by RSA Security Inc. ("RSA") in the MD2, MD4 and
+  MD5 message-digest algorithms, which are documented in RFC-1319, RFC-1320,
+  and RFC-1321 respectively. Implementations of these message-digest
+  algorithms, including implementations derived from the reference C code in
+  RFC-1319, RFC-1320, and RFC-1321, may be made, used, and sold without
+  license from RSA for any purpose. No rights other than the ones explicitly
+  set forth above are granted. Further, although RSA grants rights to
+  implement certain algorithms as defined by identified RFCs, including
+  implementations derived from the reference C code in those RFCs, no right to
+  use, copy, sell, or distribute any other implementations of the MD2, MD4, or
+  MD5 message-digest algorithms created, implemented, or distributed by RSA is
+  hereby granted by implication, estoppel, or otherwise. Parties interested in
+  licensing security components and toolkits written by RSA should contact the
+  company to discuss receiving a license. All other questions should be
+  directed to Margaret K. Seif, General Counsel, RSA Security Inc., 36 Crosby
+  Drive, Bedford, Massachusetts 01730.  Implementations of the MD2, MD4, or
+  MD5 algorithms may be subject to United States laws and regulations
+  controlling the export of technical data, computer software, laboratory
+  prototypes and other commodities (including the Arms Export Control Act, as
+  amended, and the Export Administration Act of 1970). The transfer of certain
+  technical data and commodities may require a license from the cognizant
+  agency of the United States Government. RSA neither represents that a
+  license shall not be required for a particular implementation nor that, if
+  required, one shall be issued.
+  
+  DISCLAIMER: RSA MAKES NO REPRESENTATIONS AND EXTENDS NO WARRANTIES OF ANY
+  KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, VALIDITY OF INTELLECTUAL
+  PROPERTY RIGHTS, ISSUED OR PENDING, OR THE ABSENCE OF LATENT OR OTHER
+  DEFECTS, WHETHER OR NOT DISCOVERABLE, IN CONNECTION WITH THE MD2, MD4, OR
+  MD5 ALGORITHMS. NOTHING IN THIS GRANT OF RIGHTS SHALL BE CONSTRUED AS A
+  REPRESENTATION OR WARRANTY GIVEN BY RSA THAT THE IMPLEMENTATION OF THE
+  ALGORITHM WILL NOT INFRINGE THE INTELLECTUAL PROPERTY RIGHTS OF ANY THIRD
+  PARTY. IN NO EVENT SHALL RSA, ITS TRUSTEES, DIRECTORS, OFFICERS, EMPLOYEES,
+  PARENTS AND AFFILIATES BE LIABLE FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES OF
+  ANY KIND RESULTING FROM IMPLEMENTATION OF THIS ALGORITHM, INCLUDING ECONOMIC
+  DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS, REGARDLESS OF WHETHER RSA
+  SHALL BE ADVISED, SHALL HAVE OTHER REASON TO KNOW, OR IN FACT SHALL KNOW OF
+  THE POSSIBILITY OF SUCH INJURY OR DAMAGE.
+
+The statement was downloaded from http://www.ietf.org/ietf-ftp/IPR/RSA-MD-all
+on January 8th, 2012.
--- apr-util-1.4.1.orig/debian/changelog
+++ apr-util-1.4.1/debian/changelog
@@ -0,0 +1,378 @@
+apr-util (1.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Build new apr_crypto API (using openssl).
+  * Stop repacking the source tarball to remove the MD4/MD5 implementations
+    derived from RSA's code. RSA has released a statement that revised the
+    conditions of use for this code. Debian uses the code according to the
+    conditions from this statement, which is now included in the copyright
+    file of the Debian package.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 08 Jan 2012 20:44:17 +0100
+
+apr-util (1.3.12+dfsg-3) unstable; urgency=high
+
+  * Add workaround for ldap detection problem, to fix FTBFS with gcc 4.6.
+    Closes: #651147
+  * Remove Tollef Fog Heen and Ryan Niebur from uploaders. Thanks for your
+    work in the past.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 07 Dec 2011 20:25:16 +0100
+
+apr-util (1.3.12+dfsg-2) unstable; urgency=low
+
+  * Fix unsafe pool usage in apr_thread_pool. This hopefully fixes the
+    occasional testreslist failures.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 22 May 2011 20:37:08 +0200
+
+apr-util (1.3.12+dfsg-1) unstable; urgency=low
+
+  * New upstream version
+  * Make apu-config not output dbm libs by default. Closes: #622081
+  * Set DEB_GCC_NO_O3=1 for the benefit of ppc64 on Ubuntu.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 22 May 2011 01:27:59 +0200
+
+apr-util (1.3.10+dfsg-2) unstable; urgency=low
+
+  * Remove libdb4.8-dev dependency in libaprutil1-dev. This allows packages
+    build-depending on apr-util1 to use a different version of db than
+    apr-util.
+  * With the libdb build-dependency decoupled from subversion, we can now
+    build-depend on libdb-dev instead of libdb4.8-dev. Users of APU_WANT_DB
+    in apu_want.h would have to depend on libdb-dev explicitly, but there
+    are none outside of apr-util itself. Closes: #621366
+  * Add configure support for libdb 5.1.
+  * Bump standards version to 3.9.2 (no changes)
+  * Fix some lintian warnings about the short descriptions.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 08 Apr 2011 19:19:23 +0200
+
+apr-util (1.3.10+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add ${misc:Depends} to Depends.
+  * Remove some old Conflicts and Breaks.
+  * Bump standards version to 3.9.1:
+    - empty dependency_libs section in libaprutil-1.la
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 08 Feb 2011 22:53:01 +0100
+
+apr-util (1.3.9+dfsg-5) unstable; urgency=low
+
+  * Backports from 1.3.10:
+    - apr_thread_pool: Fix some potential deadlock situations.  PR 49709.
+    - apr_thread_pool_create: Fix pool corruption caused by multithreaded
+      use of the pool when multiple initial threads are created.  PR 47843.
+    - apr_thread_pool_create: Only set the output variable on success.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 01 Oct 2010 22:05:54 +0200
+
+apr-util (1.3.9+dfsg-4) unstable; urgency=high
+
+  * CVE-2010-1623: Fix denial of service vulnerability through memory
+    consumption in apr_brigade_split_line()
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 01 Oct 2010 18:19:38 +0200
+
+apr-util (1.3.9+dfsg-3) unstable; urgency=low
+
+  * Update to db4.8 (closes: #550443)
+  * Bump standards-version:
+    - Use DEB_*_ARCH_* where applicable
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 01 Nov 2009 10:40:53 +0100
+
+apr-util (1.3.9+dfsg-2) unstable; urgency=low
+
+  * Fix FTBFS (closes: #545718). The FTBFS didn't happen with dash as /bin/sh
+    due to dash bug #514863.
+  * Ship the html documentation in the -dev package. Thanks to Joel Smith for
+    the patch (closes: #543554).
+  * Make libaprutil1-dev depend on libmysqlclient-dev instead of
+    libmysqlclient15-dev.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 12 Sep 2009 15:04:55 +0200
+
+apr-util (1.3.9+dfsg-1) unstable; urgency=high
+
+  [ Stefan Fritsch ]
+  * Enable -fstack-protector for arm/armel. A workaround has been added to
+    gcc.
+  * Remove obsolete libmysqlclient15off dependency. Update build-dep to
+    libmysqlclient-dev.
+
+  [ Peter Samuelson ]
+  * New upstream security release.
+    - Fix CVE-2009-2412, overflow in RMM allocations due to alignment.
+  * Add myself to Uploaders.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 06 Aug 2009 13:21:48 -0500
+
+apr-util (1.3.8+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+  * Add two CVE ids to 1.3.7+dfsg-1 changelog entry.
+  * Bump standards version (no changes).
+  * Make libaprutil1-dbd-sqlite3 the default dbd driver, to reduce the size
+    of dependencies pulled in by apache2.2-bin by default (closes: #536466)
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 25 Jul 2009 20:08:37 +0200
+
+apr-util (1.3.7+dfsg-1) unstable; urgency=high
+
+  * New upstream version:
+    - CVE-2009-0023: Fix underflow in apr_strmatch_precompile() which causes
+      remotely exploitable DoS vulnerabilities in mod_dav_svn and libapreq2.
+    - CVE-2009-1955: Fix DoS vulnerability (memory consumption) in handling of
+      internal xml entities.
+    - CVE-2009-1956: Fix off by one overflow in apr_brigade_vprintf.
+  * Disable test suite on hurd for now (closes: #530287).
+  * Override lintian warning about soname.
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 04 Jun 2009 20:53:47 +0200
+
+apr-util (1.3.4+dfsg-2) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * move the versioned libmysqlclient15off dependency from libaprutil1
+    to libaprutil1-dbd-mysql (Closes: #481976)
+
+  [ Stefan Fritsch ]
+  * Add workaround to fix FTBFS when doing parallel build (closes: #527812)
+  * Add "Breaks: apache2.2-common << 2.2.11-3", to make upgrades from lenny
+    to squeeze less noisy.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 10 May 2009 19:18:48 +0200
+
+apr-util (1.3.4+dfsg-1) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * New upstream version
+  * add me to Uploaders
+  * add repack.sh
+  * update to libdb4.7-dev (Closes: #519818)
+  * Debian policy 3.8.1
+  * remove *.dirs, they're not needed
+  * lintian overrides for the symbols file depending on different
+    packages, we have those "unusual circumstances" :)
+    - debhelper 6 (needed for dh_lintian)
+  * remove build/apr_common.m4 in the clean target, it gets modified
+    during build and is automatically generated
+  * switch the libaprutil1-dbg package to the debug section
+  * don't output ldap libs by default from apu-config
+  * upload to unstable this time
+
+  [ Stefan Fritsch ]
+  * Fix description for libaprutil1-dbg (closes: #508145).
+  * Recognize DEB_BUILD_OPTIONS=nocheck in addition to notest (closes: #515352).
+  * Make dpkg-shlibdeps automatically generate the needed dependencies for
+    programs that use apr_ldap_init() or apr_dbd_init().
+    For dbd, we will genreate an ORed dependency on all libaprutil1-dbd-*
+    packages, using libaprutil1-dbd-mysql as default.
+
+ -- Ryan Niebur <ryanryan52@gmail.com>  Thu, 26 Mar 2009 22:25:48 -0700
+
+apr-util (1.3.2+dfsg-1) experimental; urgency=low
+
+  [ Ryan Niebur ]
+  * new upstream release
+  * added a note to README.source about repackaging upstream tarballs
+  * put the mysql, sqlite3, pgsql, and ldap drivers into their own package.
+    (Closes: #481976, #482946)
+  * use symbol files
+  * fixed watch file
+
+  [ Stefan Fritsch ]
+  * Compile drivers for odbc and freetds and add packages for them.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 29 Jul 2008 23:09:01 +0200
+
+apr-util (1.2.12+dfsg-8) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * Upgraded to policy version 3.8.0
+    - Reference the copyright in common-licenses instead of including it
+    - support for noopt in DEB_BUILD_OPTIONS
+    - Added a README.source
+    - added support for parallel in DEB_BUILD_OPTIONS
+  * Dropped the XS- prefix for the Vcs fields in debian/control
+  * Made the watch file notice 1.3.x
+
+  [ Stefan Fritsch ]
+  * Bump libmysqlclient dependency to 5.0.51a since 5.0.32 from etch has some
+    bugs that can make apache2 hang (closes: #490859).
+  * Add 'Provides' for the modules that are still included in libaprutil1, but
+    will be moved to separate packages with apr-util 1.3.x. This will make
+    back-porting packages from lenny+1 to lenny easier.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 20 Aug 2008 22:29:26 +0200
+
+apr-util (1.2.12+dfsg-7) unstable; urgency=medium
+
+  * Apply hardening build options independently from apr.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 21 Jun 2008 13:29:48 +0200
+
+apr-util (1.2.12+dfsg-6) unstable; urgency=low
+
+  * Make libaprutil1-dev depend on libmysqlclient15-dev. Libtool needs it for
+    linking (really closes: #482270).
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 26 May 2008 23:45:44 +0200
+
+apr-util (1.2.12+dfsg-5) unstable; urgency=low
+
+  * Don't output "-lmysqlclient_r" in "apu-config --ldflags". It is enough if
+    libaprutil links to mysql, applications don't need to do it, too.
+    (Closes: #482270)
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 25 May 2008 22:53:36 +0200
+
+apr-util (1.2.12+dfsg-4) unstable; urgency=low
+
+  * Activate mysql support (closes: #395959). This is made possible by php5
+    now linking against the threadsafe version of libmysqlclient. Therefore
+    add a conflict with older versions of php5-mysql and with php4-mysql.
+  * Rebuild against apr with hardening options: CFLAGS are taken from apr, set
+    LDFLAGS=-Wl,-z,relro explicitly.
+  * Conflict with apache2 << 2.2.8-1, which used an older version of libldap
+    and now segfaults with current libaprutil1+libldap.
+  * Remove Thom May, Fabio M. Di Nitto, Daniel Stone, and Adam Conrad from the
+    uploaders field (thanks for your work).
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 18 May 2008 17:13:24 +0200
+
+apr-util (1.2.12+dfsg-3) unstable; urgency=medium
+
+  * Fix integer overflow in apr_brigade_partition on 32bit systems.  Urgency
+    medium because this made apache segfault when resuming a file larger than
+    4GB.
+  * Point VCS tags in debian control to trunk, to make them useful with
+    debcheckout.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 29 Feb 2008 20:59:49 +0100
+
+apr-util (1.2.12+dfsg-2) unstable; urgency=low
+
+  * Build-Depend on libdb4.6-dev instead of libdb-dev >= 4.6, as the latter
+    causes problems with sbuild.
+  * Change server in watch file since www.eu.apache.org is unreliable.
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 12 Jan 2008 10:17:09 +0100
+
+apr-util (1.2.12+dfsg-1) unstable; urgency=low
+
+  [ Stefan Fritsch ]
+  * New upstream version (Closes: #447146)
+  * Fix debian/rules clean
+  * Don't ship .svn directories. (Closes: #431508)
+  * Fix some lintian warnings:
+    - Use ${binary:Version} instead of ${Source-Version}.
+    - Bump standards-version to 3.7.3 (no changes).
+    - Remove empty /usr/share/doc/libapr1.0/.
+    - Don't ignore make clean errors.
+  * Add myself to Uploaders.
+  * Add Vcs info and homepage to debian/control.
+  * Change handling of CFLAGS in debian/rules so that they are actually used.
+    Fixes DEB_BUILD_OPTIONS=debug.
+
+  [ Tollef Fog Heen ]
+  * Make libaprutil1-dbg Priority: extra to match overrides.
+
+  [ Peter Samuelson ]
+  * Compile with db 4.6.  (Closes: #422465, #429025)
+  * Add watch file.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 11 Jan 2008 18:43:17 +0100
+
+apr-util (1.2.7+dfsg-2) unstable; urgency=low
+
+  * Fix stupid code duplication in apr_md[45].c resulting from C&P.
+    Thanks to Peter Samuelson for notifying me.  This makes md[45] work
+    correctly.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 18 Aug 2006 19:50:31 +0200
+
+apr-util (1.2.7+dfsg-1) unstable; urgency=low
+
+  * Remove dependency on libgdbm1 from libaprutil1-dev.
+  * Build against libdb 4.4.  Closes: #354510
+  * Remove most libs from apu-config --link-ld --libs.  Thanks to Peter
+    Samuelson, Closes: #378105
+  * Use md4 and md5 implementation from Solar Designer as this is in the
+    public domain and not subject to RSA copyright.  This requires a
+    repacked source, so add +dfsg to the version number.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 14 Jul 2006 15:31:22 +0200
+
+apr-util (1.2.7-2) unstable; urgency=low
+
+  * Fix override disparity.
+  * Compile without gdbm.
+  * Get rid of all the evil libtool hacks and adjust build-depends
+    accordingly.
+  * Remove --includedir parameter and adjust config.layout instead.  This
+    works around damage in newer autoconfs.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Mon,  1 May 2006 17:05:28 +0200
+
+apr-util (1.2.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Tighten build dependency on apr to a version which ships
+    get-version.sh
+  * Grab get-version.sh from APR build
+  * Pass --with-berkeley-db to configure so it actually picks up our
+    preferred BDB version.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 28 Apr 2006 21:59:55 +0200
+
+apr-util (1.2.2-4) unstable; urgency=low
+
+  * Compile with -fPIC.  Closes: #350677
+  * Build with -i to avoid .svn directories in source.  Closes: #357175
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 27 Jan 2006 18:50:04 +0100
+
+apr-util (1.2.2-3) unstable; urgency=low
+
+  * Add proper depends to libaprutil1-dev
+  * Rename source package to match upstream.
+  * Rename to libaprutil1 instead of libaprutil1.0
+  * Use libdb4.3, not 4.2
+  * Conflict with old package names
+  * Add gdbm support
+  * Fix call to configure to avoid double linking to sqlite and sqlite3
+  * Update to Standards Version: 3.6.2.2: no changes.
+  * Add apu-config compatibility symlink.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 27 Jan 2006 18:50:04 +0100
+
+apr-util1.0 (1.2.2-2) unstable; urgency=low
+
+  * Upgrade to debhelper v5
+  * Call dh_installdocs, so we actually get a copyright.
+
+ -- Thom May <thom@debian.org>  Tue,  3 Jan 2006 13:05:02 +0000
+
+apr-util1.0 (1.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Enable postgres and sqlite3 support
+
+ -- Thom May <thom@debian.org>  Fri, 30 Dec 2005 10:40:03 +0000
+
+apr-util1.0 (1.1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Sun,  8 May 2005 17:12:22 +0100
+
+apr-util1.0 (1.1.0-1) unstable; urgency=low
+
+  * New Upstream Release
+  * First Package Release
+
+ -- Thom May <thom@debian.org>  Wed, 17 Nov 2004 11:51:32 -0800
--- apr-util-1.4.1.orig/debian/control
+++ apr-util-1.4.1/debian/control
@@ -0,0 +1,128 @@
+Source: apr-util
+Section: libs
+Priority: optional
+Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
+Uploaders: Stefan Fritsch <sf@debian.org>, Peter Samuelson <peter@p12n.org>
+Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb-dev, libpcre3-dev, dpatch (>= 1.11), binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev, doxygen, libssl-dev
+Standards-Version: 3.9.2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util
+Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr-util
+Homepage: http://apr.apache.org/
+
+Package: libaprutil1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+
+Package: libaprutil1-ldap
+Architecture: any
+Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - LDAP Driver
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the LDAP driver.
+
+Package: libaprutil1-dbd-mysql
+Architecture: any
+Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - MySQL Driver
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the MySQL database driver.
+
+Package: libaprutil1-dbd-sqlite3
+Architecture: any
+Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - SQLite3 Driver
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the SQLite3 database driver.
+
+Package: libaprutil1-dbd-odbc
+Architecture: any
+Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - ODBC Driver
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the ODBC database driver.
+
+Package: libaprutil1-dbd-pgsql
+Architecture: any
+Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - PostgreSQL Driver
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the PostgreSQL database driver.
+
+Package: libaprutil1-dbd-freetds
+Architecture: any
+Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - FreeTDS Driver
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the FreeTDS (MS SQL and Sybase) database driver.
+
+Package: libaprutil1-dev
+Architecture: any
+Section: libdevel
+Depends: libaprutil1 (= ${binary:Version}), libldap2-dev, libexpat1-dev, libpcre3-dev, libapr1-dev (>= 1.2.2-1), libsqlite3-dev, libpq-dev, libmysqlclient-dev, ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - Development Headers
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains development headers for APR util.
+
+Package: libaprutil1-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: libaprutil1 (= ${binary:Version}), ${misc:Depends}
+Description: Apache Portable Runtime Utility Library - Debugging Symbols
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ APR Util is a utilities library implemented on top of apr, providing database
+ access, xml parsing, and other useful functionality.
+ .
+ This package contains the debugging symbols for APR util.
--- apr-util-1.4.1.orig/debian/libaprutil1-dev.install
+++ apr-util-1.4.1/debian/libaprutil1-dev.install
@@ -0,0 +1,6 @@
+debian/tmp/usr/include/apr-1.0
+debian/tmp/usr/lib/libapr*a
+debian/tmp/usr/lib/libaprutil-1.so
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/bin
+docs/dox/html usr/share/doc/libaprutil1-dev
--- apr-util-1.4.1.orig/debian/libaprutil1-dev.links
+++ apr-util-1.4.1/debian/libaprutil1-dev.links
@@ -0,0 +1 @@
+usr/bin/apu-1-config usr/bin/apu-config
--- apr-util-1.4.1.orig/debian/watch
+++ apr-util-1.4.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/apr/apr-util-(1\..\..*)\.tar\.gz debian
--- apr-util-1.4.1.orig/debian/README.source
+++ apr-util-1.4.1/debian/README.source
@@ -0,0 +1,17 @@
+Debian-apache uses dpatch to make changes to the upstream source.
+
+To apply all of the patches run:
+./debian/rules patch
+
+To unapply all of the patches run:
+./debian/rules unpatch
+
+To add (or edit) a patch run:
+dpatch-edit-patch name_of_patch_goes_here
+#make your changes
+exit
+
+dpatch will make a new patch in debian/patches/ if one with that name doesn't already exist, otherwise it will change the existing one.
+To make it get used add it to debian/patches/00list .
+
+To make a patch not get used remove it from debian/patches/00list .
--- apr-util-1.4.1.orig/debian/libaprutil1-dbd-freetds.install
+++ apr-util-1.4.1/debian/libaprutil1-dbd-freetds.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/apr-util-1/apr_dbd_freetds-1.so usr/lib/apr-util-1/
+debian/tmp/usr/lib/apr-util-1/apr_dbd_freetds.so usr/lib/apr-util-1/
--- apr-util-1.4.1.orig/debian/libaprutil1-dbd-pgsql.install
+++ apr-util-1.4.1/debian/libaprutil1-dbd-pgsql.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/apr-util-1/apr_dbd_pgsql-1.so usr/lib/apr-util-1/
+debian/tmp/usr/lib/apr-util-1/apr_dbd_pgsql.so usr/lib/apr-util-1/
+
--- apr-util-1.4.1.orig/debian/libaprutil1.symbols
+++ apr-util-1.4.1/debian/libaprutil1.symbols
@@ -0,0 +1,319 @@
+libaprutil-1.so.0 libaprutil1 #MINVER#
+| libaprutil1-ldap , libaprutil1 #MINVER#
+| libaprutil1-dbd-sqlite3|libaprutil1-dbd-mysql|libaprutil1-dbd-odbc|libaprutil1-dbd-pgsql|libaprutil1-dbd-freetds , libaprutil1 #MINVER#
+ apr_base64_decode@Base 1.2.7+dfsg
+ apr_base64_decode_binary@Base 1.2.7+dfsg
+ apr_base64_decode_len@Base 1.2.7+dfsg
+ apr_base64_encode@Base 1.2.7+dfsg
+ apr_base64_encode_binary@Base 1.2.7+dfsg
+ apr_base64_encode_len@Base 1.2.7+dfsg
+ apr_brigade_cleanup@Base 1.2.7+dfsg
+ apr_brigade_create@Base 1.2.7+dfsg
+ apr_brigade_destroy@Base 1.2.7+dfsg
+ apr_brigade_flatten@Base 1.2.7+dfsg
+ apr_brigade_insert_file@Base 1.2.7+dfsg
+ apr_brigade_length@Base 1.2.7+dfsg
+ apr_brigade_partition@Base 1.2.7+dfsg
+ apr_brigade_pflatten@Base 1.2.7+dfsg
+ apr_brigade_printf@Base 1.2.7+dfsg
+ apr_brigade_putc@Base 1.2.7+dfsg
+ apr_brigade_puts@Base 1.2.7+dfsg
+ apr_brigade_putstrs@Base 1.2.7+dfsg
+ apr_brigade_split@Base 1.2.7+dfsg
+ apr_brigade_split_ex@Base 1.3.2+dfsg
+ apr_brigade_split_line@Base 1.2.7+dfsg
+ apr_brigade_to_iovec@Base 1.2.7+dfsg
+ apr_brigade_vprintf@Base 1.2.7+dfsg
+ apr_brigade_vputstrs@Base 1.2.7+dfsg
+ apr_brigade_write@Base 1.2.7+dfsg
+ apr_brigade_writev@Base 1.2.7+dfsg
+ apr_bucket_alloc@Base 1.2.7+dfsg
+ apr_bucket_alloc_create@Base 1.2.7+dfsg
+ apr_bucket_alloc_create_ex@Base 1.2.7+dfsg
+ apr_bucket_alloc_destroy@Base 1.2.7+dfsg
+ apr_bucket_copy_notimpl@Base 1.2.7+dfsg
+ apr_bucket_destroy_noop@Base 1.2.7+dfsg
+ apr_bucket_eos_create@Base 1.2.7+dfsg
+ apr_bucket_eos_make@Base 1.2.7+dfsg
+ apr_bucket_file_create@Base 1.2.7+dfsg
+ apr_bucket_file_enable_mmap@Base 1.2.7+dfsg
+ apr_bucket_file_make@Base 1.2.7+dfsg
+ apr_bucket_flush_create@Base 1.2.7+dfsg
+ apr_bucket_flush_make@Base 1.2.7+dfsg
+ apr_bucket_free@Base 1.2.7+dfsg
+ apr_bucket_heap_create@Base 1.2.7+dfsg
+ apr_bucket_heap_make@Base 1.2.7+dfsg
+ apr_bucket_immortal_create@Base 1.2.7+dfsg
+ apr_bucket_immortal_make@Base 1.2.7+dfsg
+ apr_bucket_mmap_create@Base 1.2.7+dfsg
+ apr_bucket_mmap_make@Base 1.2.7+dfsg
+ apr_bucket_pipe_create@Base 1.2.7+dfsg
+ apr_bucket_pipe_make@Base 1.2.7+dfsg
+ apr_bucket_pool_create@Base 1.2.7+dfsg
+ apr_bucket_pool_make@Base 1.2.7+dfsg
+ apr_bucket_setaside_noop@Base 1.2.7+dfsg
+ apr_bucket_setaside_notimpl@Base 1.2.7+dfsg
+ apr_bucket_shared_copy@Base 1.2.7+dfsg
+ apr_bucket_shared_destroy@Base 1.2.7+dfsg
+ apr_bucket_shared_make@Base 1.2.7+dfsg
+ apr_bucket_shared_split@Base 1.2.7+dfsg
+ apr_bucket_simple_copy@Base 1.2.7+dfsg
+ apr_bucket_simple_split@Base 1.2.7+dfsg
+ apr_bucket_socket_create@Base 1.2.7+dfsg
+ apr_bucket_socket_make@Base 1.2.7+dfsg
+ apr_bucket_split_notimpl@Base 1.2.7+dfsg
+ apr_bucket_transient_create@Base 1.2.7+dfsg
+ apr_bucket_transient_make@Base 1.2.7+dfsg
+ apr_bucket_type_eos@Base 1.2.7+dfsg
+ apr_bucket_type_file@Base 1.2.7+dfsg
+ apr_bucket_type_flush@Base 1.2.7+dfsg
+ apr_bucket_type_heap@Base 1.2.7+dfsg
+ apr_bucket_type_immortal@Base 1.2.7+dfsg
+ apr_bucket_type_mmap@Base 1.2.7+dfsg
+ apr_bucket_type_pipe@Base 1.2.7+dfsg
+ apr_bucket_type_pool@Base 1.2.7+dfsg
+ apr_bucket_type_socket@Base 1.2.7+dfsg
+ apr_bucket_type_transient@Base 1.2.7+dfsg
+ apr_crypto_block_cleanup@Base 1.4.0
+ apr_crypto_block_decrypt@Base 1.4.0
+ apr_crypto_block_decrypt_finish@Base 1.4.0
+ apr_crypto_block_decrypt_init@Base 1.4.0
+ apr_crypto_block_encrypt@Base 1.4.0
+ apr_crypto_block_encrypt_finish@Base 1.4.0
+ apr_crypto_block_encrypt_init@Base 1.4.0
+ apr_crypto_cleanup@Base 1.4.0
+ apr_crypto_clear@Base 1.4.0
+ apr_crypto_driver_name@Base 1.4.0
+ apr_crypto_error@Base 1.4.0
+ apr_crypto_get_block_key_modes@Base 1.4.0
+ apr_crypto_get_block_key_types@Base 1.4.0
+ apr_crypto_get_driver@Base 1.4.0
+ apr_crypto_init@Base 1.4.0
+ apr_crypto_make@Base 1.4.0
+ apr_crypto_passphrase@Base 1.4.0
+ apr_crypto_shutdown@Base 1.4.0
+ apr_current_hooking_module@Base 1.2.7+dfsg
+ apr_date_checkmask@Base 1.2.7+dfsg
+ apr_date_parse_http@Base 1.2.7+dfsg
+ apr_date_parse_rfc@Base 1.2.7+dfsg
+ apr_dbd_check_conn@Base 1.2.7+dfsg
+ apr_dbd_close@Base 1.2.7+dfsg
+ apr_dbd_datum_get@Base 1.3.2+dfsg
+ apr_dbd_error@Base 1.2.7+dfsg
+ apr_dbd_escape@Base 1.2.7+dfsg
+ apr_dbd_get_driver@Base 1.2.7+dfsg
+ apr_dbd_get_entry@Base 1.2.7+dfsg
+ apr_dbd_get_name@Base 1.3.2+dfsg
+ apr_dbd_get_row@Base 1.2.7+dfsg
+ apr_dbd_init@Base 1.2.7+dfsg 2
+ apr_dbd_mutex_lock@Base 1.3.2+dfsg
+ apr_dbd_mutex_unlock@Base 1.3.2+dfsg
+#MISSING: 1.3.2+dfsg# apr_dbd_mysql_driver@Base 1.2.12+dfsg
+ apr_dbd_name@Base 1.2.7+dfsg
+ apr_dbd_native_handle@Base 1.2.7+dfsg
+ apr_dbd_num_cols@Base 1.2.7+dfsg
+ apr_dbd_num_tuples@Base 1.2.7+dfsg
+ apr_dbd_open@Base 1.2.7+dfsg
+ apr_dbd_open_ex@Base 1.3.2+dfsg
+ apr_dbd_pbquery@Base 1.3.2+dfsg
+ apr_dbd_pbselect@Base 1.3.2+dfsg
+#MISSING: 1.3.2+dfsg# apr_dbd_pgsql_driver@Base 1.2.7+dfsg
+ apr_dbd_pquery@Base 1.2.7+dfsg
+ apr_dbd_prepare@Base 1.2.7+dfsg
+ apr_dbd_pselect@Base 1.2.7+dfsg
+ apr_dbd_pvbquery@Base 1.3.2+dfsg
+ apr_dbd_pvbselect@Base 1.3.2+dfsg
+ apr_dbd_pvquery@Base 1.2.7+dfsg
+ apr_dbd_pvselect@Base 1.2.7+dfsg
+ apr_dbd_query@Base 1.2.7+dfsg
+ apr_dbd_select@Base 1.2.7+dfsg
+ apr_dbd_set_dbname@Base 1.2.7+dfsg
+#MISSING: 1.3.2+dfsg# apr_dbd_sqlite3_driver@Base 1.2.12+dfsg
+ apr_dbd_transaction_end@Base 1.2.7+dfsg
+ apr_dbd_transaction_mode_get@Base 1.3.2+dfsg
+ apr_dbd_transaction_mode_set@Base 1.3.2+dfsg
+ apr_dbd_transaction_start@Base 1.2.7+dfsg
+ apr_dbm_close@Base 1.2.7+dfsg
+ apr_dbm_delete@Base 1.2.7+dfsg
+ apr_dbm_exists@Base 1.2.7+dfsg
+ apr_dbm_fetch@Base 1.2.7+dfsg
+ apr_dbm_firstkey@Base 1.2.7+dfsg
+ apr_dbm_freedatum@Base 1.2.7+dfsg
+ apr_dbm_get_usednames@Base 1.2.7+dfsg
+ apr_dbm_get_usednames_ex@Base 1.2.7+dfsg
+ apr_dbm_geterror@Base 1.2.7+dfsg
+ apr_dbm_nextkey@Base 1.2.7+dfsg
+ apr_dbm_open@Base 1.2.7+dfsg
+ apr_dbm_open_ex@Base 1.2.7+dfsg
+ apr_dbm_store@Base 1.2.7+dfsg
+#MISSING: 1.3.5+dfsg-1# apr_dbm_type_db@Base 1.2.7+dfsg
+ apr_dbm_type_sdbm@Base 1.2.7+dfsg
+ apr_debug_module_hooks@Base 1.2.7+dfsg
+ apr_dynamic_fn_register@Base 1.2.7+dfsg
+ apr_dynamic_fn_retrieve@Base 1.2.7+dfsg
+ apr_global_hook_pool@Base 1.2.7+dfsg
+ apr_hook_debug_current@Base 1.2.7+dfsg
+ apr_hook_debug_enabled@Base 1.2.7+dfsg
+ apr_hook_debug_show@Base 1.2.7+dfsg
+ apr_hook_deregister_all@Base 1.2.7+dfsg
+ apr_hook_global_pool@Base 1.2.7+dfsg
+ apr_hook_sort_all@Base 1.2.7+dfsg
+ apr_hook_sort_register@Base 1.2.7+dfsg
+ apr_ldap_get_option@Base 1.2.7+dfsg
+ apr_ldap_info@Base 1.2.7+dfsg
+ apr_ldap_init@Base 1.2.7+dfsg 1
+ apr_ldap_is_ldap_url@Base 1.2.7+dfsg
+ apr_ldap_is_ldapi_url@Base 1.2.7+dfsg
+ apr_ldap_is_ldaps_url@Base 1.2.7+dfsg
+ apr_ldap_rebind_add@Base 1.3.2+dfsg
+ apr_ldap_rebind_init@Base 1.3.2+dfsg
+ apr_ldap_rebind_remove@Base 1.3.2+dfsg
+ apr_ldap_set_option@Base 1.2.7+dfsg
+ apr_ldap_ssl_deinit@Base 1.2.7+dfsg
+ apr_ldap_ssl_init@Base 1.2.7+dfsg
+ apr_ldap_url_parse@Base 1.2.7+dfsg
+ apr_ldap_url_parse_ext@Base 1.2.7+dfsg
+ apr_md4@Base 1.2.7+dfsg
+ apr_md4_final@Base 1.2.7+dfsg
+ apr_md4_init@Base 1.2.7+dfsg
+ apr_md4_set_xlate@Base 1.2.7+dfsg
+ apr_md4_update@Base 1.2.7+dfsg
+ apr_md5@Base 1.2.7+dfsg
+ apr_md5_encode@Base 1.2.7+dfsg
+ apr_md5_final@Base 1.2.7+dfsg
+ apr_md5_init@Base 1.2.7+dfsg
+ apr_md5_set_xlate@Base 1.2.7+dfsg
+ apr_md5_update@Base 1.2.7+dfsg
+ apr_memcache_add@Base 1.3.2+dfsg
+ apr_memcache_add_multget_key@Base 1.3.2+dfsg
+ apr_memcache_add_server@Base 1.3.2+dfsg
+ apr_memcache_create@Base 1.3.2+dfsg
+ apr_memcache_decr@Base 1.3.2+dfsg
+ apr_memcache_delete@Base 1.3.2+dfsg
+ apr_memcache_disable_server@Base 1.3.2+dfsg
+ apr_memcache_enable_server@Base 1.3.2+dfsg
+ apr_memcache_find_server@Base 1.3.2+dfsg
+ apr_memcache_find_server_hash@Base 1.3.2+dfsg
+ apr_memcache_find_server_hash_default@Base 1.3.2+dfsg
+ apr_memcache_getp@Base 1.3.2+dfsg
+ apr_memcache_hash@Base 1.3.2+dfsg
+ apr_memcache_hash_crc32@Base 1.3.2+dfsg
+ apr_memcache_hash_default@Base 1.3.2+dfsg
+ apr_memcache_incr@Base 1.3.2+dfsg
+ apr_memcache_multgetp@Base 1.3.2+dfsg
+ apr_memcache_replace@Base 1.3.2+dfsg
+ apr_memcache_server_create@Base 1.3.2+dfsg
+ apr_memcache_set@Base 1.4.0
+ apr_memcache_stats@Base 1.3.2+dfsg
+ apr_memcache_version@Base 1.3.2+dfsg
+ apr_optional_hook_add@Base 1.2.7+dfsg
+ apr_optional_hook_get@Base 1.2.7+dfsg
+ apr_password_validate@Base 1.2.7+dfsg
+ apr_posix_perms2mode@Base 1.2.7+dfsg
+ apr_queue_create@Base 1.2.7+dfsg
+ apr_queue_interrupt_all@Base 1.2.7+dfsg
+ apr_queue_pop@Base 1.2.7+dfsg
+ apr_queue_push@Base 1.2.7+dfsg
+ apr_queue_size@Base 1.2.7+dfsg
+ apr_queue_term@Base 1.2.7+dfsg
+ apr_queue_trypop@Base 1.2.7+dfsg
+ apr_queue_trypush@Base 1.2.7+dfsg
+ apr_reslist_acquire@Base 1.2.7+dfsg
+ apr_reslist_acquired_count@Base 1.3.2+dfsg
+ apr_reslist_cleanup_order_set@Base 1.4.0
+ apr_reslist_create@Base 1.2.7+dfsg
+ apr_reslist_destroy@Base 1.2.7+dfsg
+ apr_reslist_invalidate@Base 1.2.7+dfsg
+ apr_reslist_maintain@Base 1.4.0
+ apr_reslist_release@Base 1.2.7+dfsg
+ apr_reslist_timeout_set@Base 1.2.7+dfsg
+ apr_rmm_addr_get@Base 1.2.7+dfsg
+ apr_rmm_attach@Base 1.2.7+dfsg
+ apr_rmm_calloc@Base 1.2.7+dfsg
+ apr_rmm_destroy@Base 1.2.7+dfsg
+ apr_rmm_detach@Base 1.2.7+dfsg
+ apr_rmm_free@Base 1.2.7+dfsg
+ apr_rmm_init@Base 1.2.7+dfsg
+ apr_rmm_malloc@Base 1.2.7+dfsg
+ apr_rmm_offset_get@Base 1.2.7+dfsg
+ apr_rmm_overhead_get@Base 1.2.7+dfsg
+ apr_rmm_realloc@Base 1.2.7+dfsg
+ apr_sdbm_close@Base 1.2.7+dfsg
+ apr_sdbm_delete@Base 1.2.7+dfsg
+ apr_sdbm_fetch@Base 1.2.7+dfsg
+ apr_sdbm_firstkey@Base 1.2.7+dfsg
+ apr_sdbm_lock@Base 1.2.7+dfsg
+ apr_sdbm_nextkey@Base 1.2.7+dfsg
+ apr_sdbm_open@Base 1.2.7+dfsg
+ apr_sdbm_rdonly@Base 1.2.7+dfsg
+ apr_sdbm_store@Base 1.2.7+dfsg
+ apr_sdbm_unlock@Base 1.2.7+dfsg
+ apr_sha1_base64@Base 1.2.7+dfsg
+ apr_sha1_final@Base 1.2.7+dfsg
+ apr_sha1_init@Base 1.2.7+dfsg
+ apr_sha1_update@Base 1.2.7+dfsg
+ apr_sha1_update_binary@Base 1.2.7+dfsg
+ apr_strmatch_precompile@Base 1.2.7+dfsg
+ apr_text_append@Base 1.2.7+dfsg
+ apr_thread_pool_busy_count@Base 1.3.2+dfsg
+ apr_thread_pool_create@Base 1.3.2+dfsg
+ apr_thread_pool_destroy@Base 1.3.2+dfsg
+ apr_thread_pool_idle_count@Base 1.3.2+dfsg
+ apr_thread_pool_idle_max_get@Base 1.3.2+dfsg
+ apr_thread_pool_idle_max_set@Base 1.3.2+dfsg
+ apr_thread_pool_idle_wait_get@Base 1.3.2+dfsg
+ apr_thread_pool_idle_wait_set@Base 1.3.2+dfsg
+ apr_thread_pool_push@Base 1.3.2+dfsg
+ apr_thread_pool_schedule@Base 1.3.2+dfsg
+ apr_thread_pool_scheduled_tasks_count@Base 1.3.2+dfsg
+ apr_thread_pool_task_owner_get@Base 1.3.2+dfsg
+ apr_thread_pool_tasks_cancel@Base 1.3.2+dfsg
+ apr_thread_pool_tasks_count@Base 1.3.2+dfsg
+ apr_thread_pool_tasks_high_count@Base 1.3.2+dfsg
+ apr_thread_pool_tasks_run_count@Base 1.3.2+dfsg
+ apr_thread_pool_thread_max_get@Base 1.3.2+dfsg
+ apr_thread_pool_thread_max_set@Base 1.3.2+dfsg
+ apr_thread_pool_threads_count@Base 1.3.2+dfsg
+ apr_thread_pool_threads_high_count@Base 1.3.2+dfsg
+ apr_thread_pool_threads_idle_timeout_count@Base 1.3.2+dfsg
+ apr_thread_pool_threshold_get@Base 1.3.2+dfsg
+ apr_thread_pool_threshold_set@Base 1.3.2+dfsg
+ apr_thread_pool_top@Base 1.3.2+dfsg
+ apr_uri_parse@Base 1.2.7+dfsg
+ apr_uri_parse_hostinfo@Base 1.2.7+dfsg
+ apr_uri_port_of_scheme@Base 1.2.7+dfsg
+ apr_uri_unparse@Base 1.2.7+dfsg
+ apr_uuid_format@Base 1.2.7+dfsg
+ apr_uuid_get@Base 1.2.7+dfsg
+ apr_uuid_parse@Base 1.2.7+dfsg
+ apr_xlate_close@Base 1.2.7+dfsg
+ apr_xlate_conv_buffer@Base 1.2.7+dfsg
+ apr_xlate_conv_byte@Base 1.2.7+dfsg
+ apr_xlate_open@Base 1.2.7+dfsg
+ apr_xlate_sb_get@Base 1.2.7+dfsg
+ apr_xml_empty_elem@Base 1.2.7+dfsg
+ apr_xml_insert_uri@Base 1.2.7+dfsg
+ apr_xml_parse_file@Base 1.2.7+dfsg
+ apr_xml_parser_create@Base 1.2.7+dfsg
+ apr_xml_parser_done@Base 1.2.7+dfsg
+ apr_xml_parser_feed@Base 1.2.7+dfsg
+ apr_xml_parser_geterror@Base 1.2.7+dfsg
+ apr_xml_quote_elem@Base 1.2.7+dfsg
+ apr_xml_quote_string@Base 1.2.7+dfsg
+ apr_xml_to_text@Base 1.2.7+dfsg
+ apu__sdbm_chkpage@Base 1.2.7+dfsg
+ apu__sdbm_delpair@Base 1.2.7+dfsg
+ apu__sdbm_duppair@Base 1.2.7+dfsg
+ apu__sdbm_fitpair@Base 1.2.7+dfsg
+ apu__sdbm_getnkey@Base 1.2.7+dfsg
+ apu__sdbm_getpair@Base 1.2.7+dfsg
+ apu__sdbm_hash@Base 1.2.7+dfsg
+ apu__sdbm_nullitem@Base 1.2.7+dfsg
+ apu__sdbm_putpair@Base 1.2.7+dfsg
+ apu__sdbm_splpage@Base 1.2.7+dfsg
+ apu_dso_init@Base 1.3.2+dfsg
+ apu_dso_load@Base 1.4.0
+ apu_dso_mutex_lock@Base 1.3.2+dfsg
+ apu_dso_mutex_unlock@Base 1.3.2+dfsg
+ apu_version@Base 1.2.7+dfsg
+ apu_version_string@Base 1.2.7+dfsg
--- apr-util-1.4.1.orig/debian/libaprutil1.lintian-overrides
+++ apr-util-1.4.1/debian/libaprutil1.lintian-overrides
@@ -0,0 +1,2 @@
+libaprutil1: symbols-declares-dependency-on-other-package
+libaprutil1: package-name-doesnt-match-sonames libaprutil-1-0
--- apr-util-1.4.1.orig/debian/libaprutil1.install
+++ apr-util-1.4.1/debian/libaprutil1.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libaprutil-1.so.* usr/lib/
+debian/tmp/usr/lib/apr-util-1/apr_dbm*.so* usr/lib/apr-util-1
+debian/tmp/usr/lib/apr-util-1/apr_crypt*.so* usr/lib/apr-util-1
--- apr-util-1.4.1.orig/debian/libaprutil1-dbd-odbc.install
+++ apr-util-1.4.1/debian/libaprutil1-dbd-odbc.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/apr-util-1/apr_dbd_odbc-1.so usr/lib/apr-util-1/
+debian/tmp/usr/lib/apr-util-1/apr_dbd_odbc.so usr/lib/apr-util-1/
--- apr-util-1.4.1.orig/debian/patches/010_dont_use_all_pg_build_deps.dpatch
+++ apr-util-1.4.1/debian/patches/010_dont_use_all_pg_build_deps.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 010_dont_use_all_pg_build_deps.dpatch by Ryan Niebur <RyanRyan52@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad aprutil~/build/dbd.m4 aprutil/build/dbd.m4
+--- aprutil~/build/dbd.m4	2008-12-26 13:40:37.000000000 -0800
++++ aprutil/build/dbd.m4	2008-12-26 13:43:37.000000000 -0800
+@@ -44,7 +44,7 @@
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+         if test "x$PGSQL_CONFIG" != 'x'; then
+           unset ac_cv_lib_pq_PQsendQueryPrepared
+-          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++          pgsql_LIBS="-lpq"
+           APR_ADDTO(LIBS, [$pgsql_LIBS])
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+         fi
+@@ -55,7 +55,7 @@
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+           if test "x$PGSQL_CONFIG" != 'x'; then
+             unset ac_cv_lib_pq_PQsendQueryPrepared
+-            pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++            pgsql_LIBS="-lpq"
+             APR_ADDTO(LIBS, [$pgsql_LIBS])
+             AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+           fi
+@@ -85,7 +85,7 @@
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+         if test "x$PGSQL_CONFIG" != 'x'; then
+           unset ac_cv_lib_pq_PQsendQueryPrepared
+-          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++          pgsql_LIBS="-lpq"
+           APR_ADDTO(LIBS, [$pgsql_LIBS])
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+         fi
+@@ -96,7 +96,7 @@
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+           if test "x$PGSQL_CONFIG" != 'x'; then
+             unset ac_cv_lib_pq_PQsendQueryPrepared
+-            pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++            pgsql_LIBS="-lpq"
+             APR_ADDTO(LIBS, [$pgsql_LIBS])
+             AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+           fi
+@@ -121,7 +121,7 @@
+       AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+       if test "x$PGSQL_CONFIG" != 'x'; then
+         unset ac_cv_lib_pq_PQsendQueryPrepared
+-        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++        pgsql_LIBS="-lpq"
+         APR_ADDTO(LIBS, [$pgsql_LIBS])
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+       fi
+@@ -132,7 +132,7 @@
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+         if test "x$PGSQL_CONFIG" != 'x'; then
+           unset ac_cv_lib_pq_PQsendQueryPrepared
+-          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++          pgsql_LIBS="-lpq"
+           APR_ADDTO(LIBS, [$pgsql_LIBS])
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+         fi
--- apr-util-1.4.1.orig/debian/patches/002_configure_in_remove_syspaths.dpatch
+++ apr-util-1.4.1/debian/patches/002_configure_in_remove_syspaths.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 002_configure_in_remove_syspaths.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -urNad apr-util1.0-1.2.2~/configure.in apr-util1.0-1.2.2/configure.in
+--- apr-util1.0-1.2.2~/configure.in	2005-05-05 21:24:29.000000000 +0200
++++ apr-util1.0-1.2.2/configure.in	2006-01-27 13:32:04.000000000 +0100
+@@ -153,6 +153,9 @@
+ dnl
+ APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
+ 
++APR_REMOVEFROM(APRUTIL_LDFLAGS, [-L/usr/lib])
++APR_REMOVEFROM(APRUTIL_INCLUDE, [-I/usr/include])
++
+ AC_SUBST(APRUTIL_EXPORT_LIBS)
+ AC_SUBST(APRUTIL_PRIV_INCLUDES)
+ AC_SUBST(APRUTIL_INCLUDES)
--- apr-util-1.4.1.orig/debian/patches/011_avoid_ldap_by_defaut.dpatch
+++ apr-util-1.4.1/debian/patches/011_avoid_ldap_by_defaut.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## avoid-ldap-by-default.dpatch by Ryan Niebur <ryanryan52@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: by default --avoid-ldap since apache2 is the only user, and we
+## don't want to add extra dependencies to other apr-utils rdepends
+
+@DPATCH@
+diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
+--- apr-util~/apu-config.in
++++ apr-util/apu-config.in
+@@ -30,7 +30,8 @@
+ LIBS="@APRUTIL_EXPORT_LIBS@"
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+-LDAP_LIBS="@LDADD_ldap@"
++ORIG_LDAP_LIBS="@LDADD_ldap@"
++LDAP_LIBS=""
+ DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+@@ -55,7 +56,7 @@
+   --includedir      print location where headers are installed
+   --ldflags         print linker flags
+   --libs            print library information
+-  --avoid-ldap      do not include ldap library information with --libs
++  --avoid-ldap      do not include ldap library information with --libs (default on Debian)
+   --ldap-libs       print library information to link with ldap
+   --avoid-dbm       do not include DBM library information with --libs
+   --dbm-libs        print additional library information to link with DBM
+@@ -125,7 +126,7 @@
+     flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
+     ;;
+     --ldap-libs)
+-    flags="$flags $LDAP_LIBS"
++    flags="$flags $ORIG_LDAP_LIBS"
+     ;;
+     --dbm-libs)
+     flags="$flags $DBM_LIBS"
--- apr-util-1.4.1.orig/debian/patches/001_dbm_read_hash_or_btree
+++ apr-util-1.4.1/debian/patches/001_dbm_read_hash_or_btree
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 001_dbm_read_hash_or_btree by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Be more liberal in the types of DBM files we accept.
+
+@DPATCH@
+--- apr-util/dbm/apr_dbm_berkeleydb.c	2004-02-13 02:52:42.000000000 -0700
++++ apr-util/dbm/apr_dbm_berkeleydb.c	2004-09-28 00:21:37.000000000 -0600
+@@ -172,6 +172,21 @@
+                                            apr_posix_perms2mode(perm))) != 0) {
+                 /* close the DB handler */
+                 (void) (*file.bdb->close)(file.bdb, 0);
++                if (dberr == EINVAL) {
++                   if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) {
++                       if ((dberr = (*file.bdb->open)(file.bdb,
++#if DB_VER == 4
++                                               NULL,
++#endif
++                                               pathname, NULL,
++                                               DB_BTREE, dbmode,
++                                               apr_posix_perms2mode(perm))) != 0) {
++
++                            /* close the DB handler */
++                            (void) (*file.bdb->close)(file.bdb, 0);
++                       }
++		    }
++                }
+             }
+         }
+         file.curs = NULL;
--- apr-util-1.4.1.orig/debian/patches/016_avoid_db_by-default.dpatch
+++ apr-util-1.4.1/debian/patches/016_avoid_db_by-default.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 016_avoid_db_by-default.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: #622081
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/apu-config.in trunk/apu-config.in
+--- trunk~/apu-config.in
++++ trunk/apu-config.in
+@@ -32,7 +32,8 @@
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ ORIG_LDAP_LIBS="@LDADD_ldap@"
+ LDAP_LIBS=""
+-DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
++ORIG_DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
++DBM_LIBS=""
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+ 
+@@ -58,8 +59,8 @@
+   --libs            print library information
+   --avoid-ldap      do not include ldap library information with --libs (default on Debian)
+   --ldap-libs       print library information to link with ldap
+-  --avoid-dbm       do not include DBM library information with --libs
+-  --dbm-libs        print additional library information to link with DBM
++  --avoid-dbm       do not include DBM library information with --libs (default on Debian)
++  --dbm-libs        print library information to link with DBM
+   --srcdir          print APR-util source directory
+   --link-ld         print link switch(es) for linking to APR-util
+   --link-libtool    print the libtool inputs for linking to APR-util
+@@ -129,7 +130,7 @@
+     flags="$flags $ORIG_LDAP_LIBS"
+     ;;
+     --dbm-libs)
+-    flags="$flags $DBM_LIBS"
++    flags="$flags $ORIG_DBM_LIBS"
+     ;;
+     --includedir)
+     if test "$location" = "installed"; then
--- apr-util-1.4.1.orig/debian/patches/004_debian_layout_fix.dpatch
+++ apr-util-1.4.1/debian/patches/004_debian_layout_fix.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 004_debian_layout_fix.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the includedir in the Debian layout.
+
+@DPATCH@
+diff -urNad apr-util-1.2.7~/config.layout apr-util-1.2.7/config.layout
+--- apr-util-1.2.7~/config.layout	2005-02-09 13:18:43.000000000 +0100
++++ apr-util-1.2.7/config.layout	2006-06-15 14:18:42.000000000 +0200
+@@ -223,7 +223,7 @@
+     libexecdir:    ${exec_prefix}/lib/apr/modules
+     mandir:        ${exec_prefix}/share/man
+     datadir:       ${exec_prefix}/share/apr
+-    includedir:    ${exec_prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
++    includedir:    ${exec_prefix}/include/apr-1.0
+     localstatedir: ${prefix}/var/run
+     runtimedir:    ${prefix}/var/run
+     infodir:       ${exec_prefix}/share/info
--- apr-util-1.4.1.orig/debian/patches/003_buildconf_config.guess_sub_location.dpatch
+++ apr-util-1.4.1/debian/patches/003_buildconf_config.guess_sub_location.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 003_buildconf_config.guess_sub_location.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad apr-util-1.2.7~/buildconf apr-util-1.2.7/buildconf
+--- apr-util-1.2.7~/buildconf	2006-04-28 22:53:11.000000000 +0200
++++ apr-util-1.2.7/buildconf	2006-04-28 22:55:02.000000000 +0200
+@@ -56,8 +56,8 @@
+ rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
+       build/config.guess build/config.sub build/get-version.sh
+ cp -p $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
+-      $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
+-      $apr_src_dir/build/config.sub $apr_src_dir/build/get-version.sh \
++      $apr_src_dir/build/install.sh /usr/share/misc/config.guess \
++      /usr/share/misc/config.sub $apr_src_dir/build/get-version.sh \
+       build/
+ 
+ # Remove aclocal.m4 as it'll break some builds...
--- apr-util-1.4.1.orig/debian/patches/014_apu_config_dont_list_indep_libs.dpatch
+++ apr-util-1.4.1/debian/patches/014_apu_config_dont_list_indep_libs.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## apu-config.dpatch by <peter@p12n.org>
+##
+## DP: Prevent recursive linking of dependent libraries by apr-util users.
+
+@DPATCH@
+diff -urNad apr-util~/apr-util.pc.in apr-util/apr-util.pc.in
+--- apr-util~/apr-util.pc.in	2008-06-27 15:36:07.000000000 -0700
++++ apr-util/apr-util.pc.in	2008-06-27 16:03:17.000000000 -0700
+@@ -8,6 +8,7 @@
+ Description: Companion library for APR
+ Version: @APRUTIL_DOTTED_VERSION@
+ # assume that apr-util requires libapr of same major version
+-Requires: apr-@APRUTIL_MAJOR_VERSION@
+-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
++Requires.private: apr-@APRUTIL_MAJOR_VERSION@
++Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@
++Libs.private: @APRUTIL_EXPORT_LIBS@
+ Cflags: -I${includedir}
+diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
+--- apr-util~/apu-config.in	2008-05-23 14:27:59.000000000 -0700
++++ apr-util/apu-config.in	2008-06-27 16:30:04.000000000 -0700
+@@ -27,7 +27,7 @@
+ libdir="@libdir@"
+ includedir="@includedir@"
+ 
+-LIBS="@APRUTIL_EXPORT_LIBS@"
++LIBS=
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ LDAP_LIBS="@LDADD_ldap@"
--- apr-util-1.4.1.orig/debian/patches/013_ship_find_apu.m4.dpatch
+++ apr-util-1.4.1/debian/patches/013_ship_find_apu.m4.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 013_ship_find_apu.m4.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad apr-util~/Makefile.in apr-util/Makefile.in
+--- apr-util~/Makefile.in	2008-06-27 14:56:17.000000000 -0700
++++ apr-util/Makefile.in	2008-06-27 15:33:50.000000000 -0700
+@@ -84,6 +84,12 @@
+ 	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
+ 
++	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
++		@APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
++	fi
++	$(LIBTOOL) --mode=install cp $(top_srcdir)/build/find_apu.m4 \
++		$(DESTDIR)$(installbuilddir)/find_apu.m4
++
+ $(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS)
+ 	$(LINK) @lib_target@ $(EXTRA_OBJECTS) $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
+ 
--- apr-util-1.4.1.orig/debian/patches/015_disable_expat_buildconf.dpatch
+++ apr-util-1.4.1/debian/patches/015_disable_expat_buildconf.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 015_disable_expat_buildconf.dpatch by Stefan Fritsch <sf@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.
+
+@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 $verbose 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 $verbose)
+-fi
+-
+ # Remove autoconf cache again
+ rm -rf autom4te*.cache
+ 
--- apr-util-1.4.1.orig/debian/patches/00list
+++ apr-util-1.4.1/debian/patches/00list
@@ -0,0 +1,10 @@
+001_dbm_read_hash_or_btree
+002_configure_in_remove_syspaths
+003_buildconf_config.guess_sub_location
+004_debian_layout_fix
+010_dont_use_all_pg_build_deps
+011_avoid_ldap_by_defaut.dpatch
+013_ship_find_apu.m4
+014_apu_config_dont_list_indep_libs
+015_disable_expat_buildconf.dpatch
+016_avoid_db_by-default.dpatch
