[SCM] Debian packaging of libtest-compile-perl branch, master, updated. upstream/0.16-60-gea3f260

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 2c97c740af36f32a0188364f101c061e9d5e8f85
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Mon Feb 20 23:16:13 2012 +0100

    Refreshed taint.patch, lib.patch and man.patch patches

diff --git a/debian/changelog b/debian/changelog
index 542a2ff..7d6d3de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libtest-compile-perl (0.16-1) UNRELEASED; urgency=low
   * Added myself to Uploaders and Copyright
   * Updated d/copyright to latest DEP5 (.174 revision) format
   * Updated copyright year
+  * Refreshed taint.patch, lib.patch and man.patch patches
+
 
  -- Fabrizio Regalli <fabreg at fabreg.it>  Mon, 20 Feb 2012 22:55:12 +0100
 
diff --git a/debian/patches/lib.patch b/debian/patches/lib.patch
index aa774ca..b0ae7bb 100644
--- a/debian/patches/lib.patch
+++ b/debian/patches/lib.patch
@@ -10,22 +10,6 @@ Bug: http://rt.cpan.org/Ticket/Display.html?id=72557
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649332
 Last-Update: 2012-02-18
 --- /dev/null
-+++ b/t/scripts/lib.pl
-@@ -0,0 +1,13 @@
-+#!/usr/bin/perl
-+
-+BEGIN {
-+    require strict;
-+    require warnings;
-+    require Test::Builder;
-+    require File::Spec;
-+    require UNIVERSAL::require;
-+    @INC = grep { $_ eq 'blib/lib' } @INC;
-+}
-+use Test::Compile;
-+
-+sleep 1;
---- /dev/null
 +++ b/t/11.lib.t
 @@ -0,0 +1,7 @@
 +#!perl -w
@@ -35,30 +19,3 @@ Last-Update: 2012-02-18
 +use Test::Compile;
 +pl_file_ok('t/scripts/lib.pl', 'lib.pl compiles');
 +
---- a/lib/Test/Compile.pm
-+++ b/lib/Test/Compile.pm
-@@ -139,6 +139,7 @@
-         } else {
-             my @perl5lib = split(':', ($ENV{PERL5LIB}||""));
-             my $taint = _is_in_taint_mode($file);
-+	    unshift @perl5lib, 'blib/lib';
-             system($^X, (map { "-I$_" } @perl5lib), "-c$taint", $file);
-             return ($? ? 0 : 1);
-         }
---- a/t/10-find-files.t
-+++ b/t/10-find-files.t
-@@ -13,10 +13,11 @@
-   my @files = sort (all_pl_files('t/scripts'));
- 
-   # THEN
--  is(scalar @files,3,"Found correct number of scripts");
-+  is(scalar @files,4,"Found correct number of scripts");
-   like($files[0],qr/failure.pl/,"Found the failure script");
--  like($files[1],qr/success.pl/,"Found the success script");
--  like($files[2],qr/taint.pl/,"Found the tainted script");
-+  like($files[1],qr/lib.pl/,"Found the lib script");
-+  like($files[2],qr/success.pl/,"Found the success script");
-+  like($files[3],qr/taint.pl/,"Found the tainted script");
- }
- 
- sub test_all_pm_files {
diff --git a/debian/patches/man.patch b/debian/patches/man.patch
index 32ec8c8..aea7531 100644
--- a/debian/patches/man.patch
+++ b/debian/patches/man.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 Last-Update: 2012-02-19
 --- a/lib/Test/Compile.pm
 +++ b/lib/Test/Compile.pm
-@@ -354,6 +354,12 @@
+@@ -367,6 +367,12 @@ sorted, you'll have to sort them yoursel
  
  =back
  
diff --git a/debian/patches/taint.patch b/debian/patches/taint.patch
index 2e33426..c95b4b0 100644
--- a/debian/patches/taint.patch
+++ b/debian/patches/taint.patch
@@ -25,17 +25,7 @@ Bug: https://rt.cpan.org/Public/Bug/Display.html?id=55837
 +
 --- a/lib/Test/Compile.pm
 +++ b/lib/Test/Compile.pm
-@@ -138,7 +138,8 @@
-             return ($@ ? 0 : 1);
-         } else {
-             my @perl5lib = split(':', ($ENV{PERL5LIB}||""));
--            system($^X, (map { "-I$_" } @perl5lib), '-c', $file);
-+            my $taint = _is_in_taint_mode($file);
-+            system($^X, (map { "-I$_" } @perl5lib), "-c$taint", $file);
-             return ($? ? 0 : 1);
-         }
-     }
-@@ -177,6 +178,19 @@
+@@ -192,6 +192,19 @@ sub _pl_starting_points {
      return 'script' if -e 'script';
      return 'bin'    if -e 'bin';
  }
diff --git a/lib/Test/Compile.pm.rej b/lib/Test/Compile.pm.rej
new file mode 100644
index 0000000..1b67c88
--- /dev/null
+++ b/lib/Test/Compile.pm.rej
@@ -0,0 +1,10 @@
+--- lib/Test/Compile.pm
++++ lib/Test/Compile.pm
+@@ -139,6 +139,7 @@
+         } else {
+             my @perl5lib = split(':', ($ENV{PERL5LIB}||""));
+             my $taint = _is_in_taint_mode($file);
++	    unshift @perl5lib, 'blib/lib';
+             system($^X, (map { "-I$_" } @perl5lib), "-c$taint", $file);
+             return ($? ? 0 : 1);
+         }
diff --git a/t/10-find-files.t.rej b/t/10-find-files.t.rej
new file mode 100644
index 0000000..03aedf1
--- /dev/null
+++ b/t/10-find-files.t.rej
@@ -0,0 +1,17 @@
+--- t/10-find-files.t
++++ t/10-find-files.t
+@@ -13,10 +13,11 @@
+   my @files = sort (all_pl_files('t/scripts'));
+ 
+   # THEN
+-  is(scalar @files,3,"Found correct number of scripts");
++  is(scalar @files,4,"Found correct number of scripts");
+   like($files[0],qr/failure.pl/,"Found the failure script");
+-  like($files[1],qr/success.pl/,"Found the success script");
+-  like($files[2],qr/taint.pl/,"Found the tainted script");
++  like($files[1],qr/lib.pl/,"Found the lib script");
++  like($files[2],qr/success.pl/,"Found the success script");
++  like($files[3],qr/taint.pl/,"Found the tainted script");
+ }
+ 
+ sub test_all_pm_files {

-- 
Debian packaging of libtest-compile-perl