[Pkg-apache-commits] r881 - in /trunk/apr-util: changelog control rules

[sf at alioth.debian.org]

Author: sf
Date: Thu Feb 26 11:56:55 2009
New Revision: 881

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=881
Log:
merge 1.2.12+dfsg-8 changelog and remaining changes from old trunk:
r736
r737
r741


Modified:
    trunk/apr-util/changelog
    trunk/apr-util/control
    trunk/apr-util/rules

Modified: trunk/apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/changelog?rev=881&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Thu Feb 26 11:56:55 2009
@@ -29,14 +29,23 @@
 
 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 REAME.source
+    - 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
 
- -- Ryan Niebur <RyanRyan52 at gmail.com>  Fri, 27 Jun 2008 14:41:13 -0700
+  [ 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 at debian.org>  Wed, 20 Aug 2008 22:29:26 +0200
 
 apr-util (1.2.12+dfsg-7) unstable; urgency=medium
 

Modified: trunk/apr-util/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/control?rev=881&op=diff
==============================================================================
--- trunk/apr-util/control (original)
+++ trunk/apr-util/control Thu Feb 26 11:56:55 2009
@@ -11,7 +11,7 @@
 
 Package: libaprutil1
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libmysqlclient15off (>> 5.0.51a)
 Conflicts: libaprutil1.0, apache2.2-common (<< 2.2.8-1~)
 Description: The Apache Portable Runtime Utility Library
  APR is Apache's Portable Runtime Library, designed to be a support library 

Modified: trunk/apr-util/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/rules?rev=881&op=diff
==============================================================================
--- trunk/apr-util/rules (original)
+++ trunk/apr-util/rules Thu Feb 26 11:56:55 2009
@@ -35,8 +35,9 @@
   endif
 endif
 
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))
@@ -55,7 +56,7 @@
 
 SHELL=/bin/bash
 
-config.status: configure
+config.status: configure 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=db46 --with-sqlite3 --with-pgsql=/usr --without-gdbm --without-sqlite2 --with-berkeley-db --with-mysql=/usr --with-freetds=/usr --with-odbc=/usr