[libpkgconfig-perl] 03/08: Update 0001-Adjust-path-to-ppkg-config-in-test-scripts.patch.

gregor herrmann gregoa at debian.org
Mon Nov 20 21:08:49 UTC 2017


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

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

commit df5abdbe509506b98217540393bae1ca22528c7d
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Nov 20 21:40:11 2017 +0100

    Update 0001-Adjust-path-to-ppkg-config-in-test-scripts.patch.
---
 ...djust-path-to-ppkg-config-in-test-scripts.patch | 31 +++++++++-------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/debian/patches/0001-Adjust-path-to-ppkg-config-in-test-scripts.patch b/debian/patches/0001-Adjust-path-to-ppkg-config-in-test-scripts.patch
index f8932b0..02c3f77 100644
--- a/debian/patches/0001-Adjust-path-to-ppkg-config-in-test-scripts.patch
+++ b/debian/patches/0001-Adjust-path-to-ppkg-config-in-test-scripts.patch
@@ -1,24 +1,19 @@
 Description: Adjust path to ppkg-config in test scripts
-Forwarded: no
+Forwarded: not-needed
 Author: Wolfgang Fütterer <debian at wlf-online.de> 
-Last-Update: 2016-05-12
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2017-11-20
 
-diff --git a/t/PkgConfigTest.pm b/t/PkgConfigTest.pm
-index 5bbc6ba..c9e7d3d 100644
 --- a/t/PkgConfigTest.pm
 +++ b/t/PkgConfigTest.pm
-@@ -40,7 +40,13 @@ $ENV{PKG_CONFIG_PATH} = join($Config{path_sep}, @PC_PATHS);
- our $RV;
- our $S;
+@@ -47,6 +47,10 @@ my $SCRIPT = "$FindBin::Bin/../script/pp
+ $SCRIPT = $FindBin::Bin . "/../lib/PkgConfig.pm"
+     if $^O eq 'MSWin32' && -d '.git';
  
--my $SCRIPT = $FindBin::Bin . "/../script/ppkg-config";
-+my $SCRIPT;
-+if  ($ENV{ADTTMP}){
-+    $SCRIPT="/usr/bin/ppkg-config";
-+}
-+else{
-+    $SCRIPT = $FindBin::Bin . "/../script/ppkg-config";
-+}
- 
- # Work around git on windows' lamentable lack of symbolic
- # link support
++# autopkgtest
++$SCRIPT="/usr/bin/ppkg-config"
++    if $ENV{ADTTMP};
++
+ sub run_common {
+     my @args = @_;
+     (my $ret = qx($^X $SCRIPT --env-only @args))

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



More information about the Pkg-perl-cvs-commits mailing list