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

[sf at alioth.debian.org]

Author: sf
Date: Sun Feb  6 21:57:47 2011
New Revision: 1275

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1275
Log:
* Remove some old Conflicts and Breaks.
* Bump standards version to 3.9.1:
  - empty dependency_libs section in libapr-1.la

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=1275&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Sun Feb  6 21:57:47 2011
@@ -2,6 +2,9 @@
 
   * 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 libapr-1.la
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 06 Feb 2011 22:33:55 +0100
 

Modified: trunk/apr-util/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/control?rev=1275&op=diff
==============================================================================
--- trunk/apr-util/control (original)
+++ trunk/apr-util/control Sun Feb  6 21:57:47 2011
@@ -4,7 +4,7 @@
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen at debian.org>, Stefan Fritsch <sf at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Peter Samuelson <peter at p12n.org>
 Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb4.8-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
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 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/
@@ -12,8 +12,6 @@
 Package: libaprutil1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libaprutil1.0
-Breaks: apache2.2-common (<< 2.2.11-3)
 Description: The 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 
@@ -38,7 +36,6 @@
 Package: libaprutil1-dbd-mysql
 Architecture: any
 Depends: libaprutil1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: php5-mysql (<< 5.2.6-1~), php4-mysql (<< 6:4.4.4-10)
 Description: The 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 
@@ -105,7 +102,6 @@
 Architecture: any
 Section: libdevel
 Depends: libaprutil1 (= ${binary:Version}), libldap2-dev, libexpat1-dev, libdb4.8-dev, libpcre3-dev, libapr1-dev (>= 1.2.2-1), libsqlite3-dev, libpq-dev, libmysqlclient-dev, ${misc:Depends}
-Conflicts: libaprutil1.0-dev
 Description: The 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 
@@ -121,7 +117,6 @@
 Architecture: any
 Section: debug
 Depends: libaprutil1 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libaprutil1.0-dev
 Description: The 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 

Modified: trunk/apr-util/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/rules?rev=1275&op=diff
==============================================================================
--- trunk/apr-util/rules (original)
+++ trunk/apr-util/rules Sun Feb  6 21:57:47 2011
@@ -103,6 +103,7 @@
 	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