[SCM] Debian packaging of libxml-libxslt-perl branch, master, updated. upstream/1.71-49-g47284de

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 3ee13d525fb9364369b7425a85b61f362b2e7961
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Thu Sep 29 19:39:31 2011 +0000

    don't link to libm / libz, they're not needed
    
    I wonder if this is really correct given the amount of fuzz in
    Makefile.PL about those libraries ("math support is important..."), but
    then I don't see how these libraries could matter given that their
    symbols are not used.

diff --git a/debian/changelog b/debian/changelog
index c58b7b7..0d073e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxml-libxslt-perl (1.71-1) UNRELEASED; urgency=low
   * Refresh debian/copyright.
   * Bump Standards-Version to 3.9.2 (no change).
   * Remove version from dependency on libxslt1-dev (satisfied in oldstable).
+  * Don't link to libm / libz, they're not needed.
 
   [ Ansgar Burchardt ]
   * debian/control: Convert Vcs-* fields to Git.
diff --git a/debian/control b/debian/control
index d093e01..894d752 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Homepage: http://search.cpan.org/dist/XML-LibXSLT/
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libxml-libxslt-perl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libxml-libxslt-perl.git
 Build-Depends: debhelper (>= 8), libxml-libxml-perl (>= 1.70),
- libxslt1-dev, perl, pkg-config,
- zlib1g-dev
+ libxslt1-dev, perl, pkg-config
 
 Package: libxml-libxslt-perl
 Architecture: any
diff --git a/debian/patches/trim_libs.patch b/debian/patches/trim_libs.patch
index fa6f0cf..d6b341f 100644
--- a/debian/patches/trim_libs.patch
+++ b/debian/patches/trim_libs.patch
@@ -3,7 +3,39 @@ Description: avoid linkage to all libs perl is linked
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -160,8 +160,6 @@
+@@ -103,31 +103,6 @@
+   }
+ }
+ 
+-if ($config{LIBS} !~ /\-lz(lib)?\b/ and !($is_win32 && $config{LIBS} !~ /\-lzlib\b/)) {
+-    # note if libxml2 has not -lz within its cflags, we should not use
+-    # it! We should trust libxml2 and assume libz is not available on the
+-    # current system (this is ofcourse not true with win32 systems.
+-    # $config{LIBS} .= $is_Win32 ? ' -lzlib' :' -lz';
+-    if ( $config{DEBUG} ) {
+-        warn "zlib was not configured\n";
+-        warn "set zlib\n" if $is_Win32;
+-    }
+-  if ($is_Win32) {
+-    if( $ENV{ACTIVEPERL_MINGW} ) {
+-      $config{LIBS} .= '';
+-    } else {
+-      $config{LIBS} .= ' -lzlib';
+-    }
+-  } else {
+-    $config{LIBS} .= ' -lz';
+-  }
+-}
+-
+-if ($config{LIBS} !~ /\-lm\b/) {
+-    # math support is important, but is not available separately in W32
+-    $config{LIBS} .= $is_Win32 ? '' :' -lm';
+-}
+-
+ if (!have_library($is_Win32 ? "libxslt" : "xslt")) {
+     print STDERR <<DEATH;
+ libxslt not found
+@@ -167,8 +142,6 @@
    $config{DEFINE} .= " -DHAVE_EXSLT"
  }
  

-- 
Debian packaging of libxml-libxslt-perl