[libfilesys-smbclient-perl] 01/03: Update 10_Makefile.PL.patch: use pkg-config

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libfilesys-smbclient-perl.

commit c2a381d72541fef617c54a5e6d0a78f8c382e401
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Nov 3 20:15:57 2013 +0100

    Update 10_Makefile.PL.patch: use pkg-config
    
    to find libdir and includedir.
    
    Build depend on pkg-config.
    
    Closes: #728646
---
 debian/control                      |    1 +
 debian/patches/10_Makefile.PL.patch |   14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 2f688bd..bfab9fd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Section: perl
 Priority: extra
 Build-Depends: debhelper (>= 9.20120312),
                libsmbclient-dev,
+               pkg-config,
                perl
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libfilesys-smbclient-perl.git
diff --git a/debian/patches/10_Makefile.PL.patch b/debian/patches/10_Makefile.PL.patch
index 0366bee..1a4793e 100644
--- a/debian/patches/10_Makefile.PL.patch
+++ b/debian/patches/10_Makefile.PL.patch
@@ -1,8 +1,10 @@
-Description: Remove prompts in Makefile
-Author: Damyan Ivanov <dmn at debian.org>
+Description: Remove prompts in Makefile;
+ find libdir and includedir with pkg-config
 Forwarded: no
+Author: Damyan Ivanov <dmn at debian.org>
 Reviewed-By: Xavier Guimard <x.guimard at free.fr>
-Last-update: 2012-12-07
+ gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-11-03
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
@@ -16,7 +18,7 @@ Last-update: 2012-12-07
 +#my $include = try_to_find("libsmbclient.h");
 +#$include = prompt("Where can I find libsmbclient.h ?", $include);
 +#warn_user("$include/libsmbclient.h") if (!-r "$include/libsmbclient.h");
-+my $include = '/usr/include';
++my $include = qx/pkg-config --variable=includedir smbclient/;
  
  # path libsmbclient.so
 -my $lib = try_to_find("libsmbclient.so");
@@ -25,7 +27,7 @@ Last-update: 2012-12-07
 +#my $lib = try_to_find("libsmbclient.so");
 +#$lib = prompt("Where can I find libsmbclient.so ?",$lib);
 +#warn_user("libsmbclient.so") if (!-r "$lib/libsmbclient.so");
-+my $lib = '/usr/lib';
++my $lib = qx/pkg-config --variable=libdir smbclient/;
  
  # tests demande ?
 -my $ans = 
@@ -41,7 +43,7 @@ Last-update: 2012-12-07
  if ($ans =~ /^y(es)?$/i) 
    {
      my $server = prompt("Server ?","localhost");
-@@ -33,7 +37,8 @@ if ($ans =~ /^y(es)?$/i) 
+@@ -33,7 +37,8 @@ if ($ans =~ /^y(es)?$/i)
    }
  
  # Trace for debug

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