[libbssolv-perl] 05/06: Drop avoid-useless-dependency.patch, applied upstream

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository libbssolv-perl.

commit ac2d887f9ad85a36200783075755b1182eb8cddb
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Apr 18 22:22:58 2016 +0200

    Drop avoid-useless-dependency.patch, applied upstream
---
 .../2001_libsolv-dev-installs-to-multiarch-dest.patch     |  2 +-
 debian/patches/avoid-useless-dependency.patch             | 15 ---------------
 debian/patches/series                                     |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/patches/2001_libsolv-dev-installs-to-multiarch-dest.patch b/debian/patches/2001_libsolv-dev-installs-to-multiarch-dest.patch
index cad03eb..f71eefc 100644
--- a/debian/patches/2001_libsolv-dev-installs-to-multiarch-dest.patch
+++ b/debian/patches/2001_libsolv-dev-installs-to-multiarch-dest.patch
@@ -8,6 +8,6 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
 -my $inc = "-I$solvprefix/include/solv";
 +my $inc = "-I$solvprefix/include/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/solv";
- my $lib = '';
+ my $lib;
  
  if (grep {$_ eq '--bundled-libsolv'} @ARGV) {
diff --git a/debian/patches/avoid-useless-dependency.patch b/debian/patches/avoid-useless-dependency.patch
deleted file mode 100644
index a90e9b2..0000000
--- a/debian/patches/avoid-useless-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: avoid useless library dependencies (as discovered by dpkg-shlibdeps)
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: https://github.com/openSUSE/perl-BSSolv/issues/4
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -11,7 +11,7 @@
-   $lib = "-L$builddir/src -L$builddir/ext";
- }
- 
--$lib = ($lib ? "$lib " : '') . '-lsolvext -lsolv -lz -llzma';
-+$lib = ($lib ? "$lib " : '') . '-lsolvext -lsolv';
- 
- WriteMakefile(
-     NAME         => 'BSSolv',
diff --git a/debian/patches/series b/debian/patches/series
index 606c00d..676d496 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-avoid-useless-dependency.patch
 2001_libsolv-dev-installs-to-multiarch-dest.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libbssolv-perl.git