r72404 - in /trunk/libapache2-mod-perl2/debian: changelog patches/avoid-db-linkage.patch patches/series

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sat Apr  9 13:02:11 2011
New Revision: 72404

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72404
Log:
add avoid-db-linkage.patch: avoids needless linking with libdb, which
entangles us in libdb transitions. Closes: #621415

Added:
    trunk/libapache2-mod-perl2/debian/patches/avoid-db-linkage.patch
Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/series

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=72404&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Sat Apr  9 13:02:11 2011
@@ -1,5 +1,6 @@
 libapache2-mod-perl2 (2.0.5-1) UNRELEASED; urgency=low
 
+  [ Nicholas Bamber ]
   TODO:
   - DEB_BUILD_OPTIONS does not seem to work
   - Still checking broken links in dwww
@@ -25,6 +26,10 @@
   * Added patch to remove generated files
   * Email change: Andres Salomon -> dilinger at debian.org
   * Refreshed copyright
+
+  [ Damyan Ivanov ]
+  * add avoid-db-linkage.patch: avoids needless linking with libdb, which
+    entangles us in libdb transitions. Closes: #621415
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Tue, 22 Mar 2011 14:19:58 +0000
 

Added: trunk/libapache2-mod-perl2/debian/patches/avoid-db-linkage.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/avoid-db-linkage.patch?rev=72404&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/avoid-db-linkage.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/avoid-db-linkage.patch Sat Apr  9 13:02:11 2011
@@ -1,0 +1,11 @@
+--- a/lib/Apache2/Build.pm
++++ b/lib/Apache2/Build.pm
+@@ -1123,6 +1123,8 @@ sub apru_link_flags {
+     # resolve the symbols right during linking
+     for ($self->apu_config_path, $self->apr_config_path) {
+         my $flags = '--link-ld --libs';
++        # we don't use dbm
++        $flags =~ s/--libs/--avoid-dbm --libs/ if $_ eq $self->apu_config_path;
+         $flags .= ' --ldflags' unless (WIN32);
+         if (my $link = $_ && -x $_ && qx{$_ $flags}) {
+             chomp $link;

Modified: trunk/libapache2-mod-perl2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/series?rev=72404&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/series (original)
+++ trunk/libapache2-mod-perl2/debian/patches/series Sat Apr  9 13:02:11 2011
@@ -1,3 +1,4 @@
+avoid-db-linkage.patch
 099-fix-url-on-index_top.patch
 001-gtop2.patch
 004-bugs-to-debian-bts.patch