[SCM] Debian packaging of libtest-compile-perl branch, master, updated. debian/0.16-1-8-gae12a6d

Fabrizio Regalli fabreg at fabreg.it
Fri Feb 24 15:55:48 UTC 2012


The following commit has been merged in the master branch:
commit 83b830a28a2a069b6ef2489b05608bbbed508493
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Fri Feb 24 16:47:09 2012 +0100

    Removed lib.patch patch: it's now included in the source code

diff --git a/debian/changelog b/debian/changelog
index be42f75..2326d05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libtest-compile-perl (0.17-1) UNRELEASED; urgency=low
   * Imported Upstream version 0.17
   * Bump Standards-Version to 3.9.3
   * Update format url using copyright-format 1.0
+  * Removed lib.patch patch: it's now included in the source code
 
  -- Fabrizio Regalli <fabreg at fabreg.it>  Fri, 24 Feb 2012 16:28:34 +0100
 
diff --git a/debian/patches/lib.patch b/debian/patches/lib.patch
deleted file mode 100644
index b0ae7bb..0000000
--- a/debian/patches/lib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Subject: need to provide path to libraries of distribution
- Imagine you have a distrubution consisting of a script and at least
- one module. You want to test that the script compiles using this
- module. However older versions of your module are already installed.
- It is important that we pull in the current version of the modules
- not the already released versions. The upstream code does not
- take care of this at all. This patch also provides a test.
-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/11.lib.t
-@@ -0,0 +1,7 @@
-+#!perl -w
-+use strict;
-+use warnings;
-+use Test::More tests => 1;
-+use Test::Compile;
-+pl_file_ok('t/scripts/lib.pl', 'lib.pl compiles');
-+
diff --git a/debian/patches/series b/debian/patches/series
index b1d9a42..3a8423f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 taint.patch
-lib.patch
 man.patch
 clean_build.patch
diff --git a/debian/patches/taint.patch b/debian/patches/taint.patch
index c95b4b0..4289af6 100644
--- a/debian/patches/taint.patch
+++ b/debian/patches/taint.patch
@@ -23,25 +23,3 @@ Bug: https://rt.cpan.org/Public/Bug/Display.html?id=55837
 +use Test::Compile;
 +pl_file_ok('t/scripts/taint.pl', 'taint.pl compiles');
 +
---- a/lib/Test/Compile.pm
-+++ b/lib/Test/Compile.pm
-@@ -192,6 +192,19 @@ sub _pl_starting_points {
-     return 'script' if -e 'script';
-     return 'bin'    if -e 'bin';
- }
-+
-+sub _is_in_taint_mode {
-+    my $file = shift;
-+    open(FILE, $file) or die "could not open $file";
-+    my $shebang = <FILE>;
-+    my $taint = "";
-+    if ($shebang =~ /^#![\/\w]+\s+\-w?([tT])/) {
-+        $taint = $1;
-+    }
-+    close FILE;
-+    return $taint;
-+}
-+
- 1;
- __END__
- 
diff --git a/lib/Test/Compile.pm.rej b/lib/Test/Compile.pm.rej
new file mode 100644
index 0000000..1c74053
--- /dev/null
+++ b/lib/Test/Compile.pm.rej
@@ -0,0 +1,22 @@
+--- lib/Test/Compile.pm
++++ lib/Test/Compile.pm
+@@ -192,6 +192,19 @@
+     return 'script' if -e 'script';
+     return 'bin'    if -e 'bin';
+ }
++
++sub _is_in_taint_mode {
++    my $file = shift;
++    open(FILE, $file) or die "could not open $file";
++    my $shebang = <FILE>;
++    my $taint = "";
++    if ($shebang =~ /^#![\/\w]+\s+\-w?([tT])/) {
++        $taint = $1;
++    }
++    close FILE;
++    return $taint;
++}
++
+ 1;
+ __END__
+ 

-- 
Debian packaging of libtest-compile-perl



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