[SCM] Debian packaging of libdevice-cdio-perl branch, master, updated. upstream/0.3.0-69-gb8d3859
gregor herrmann
gregoa at debian.org
Sat Jun 16 13:00:00 UTC 2012
The following commit has been merged in the master branch:
commit 126886a67e99e432a6b954882595aef002712b26
Author: gregor herrmann <gregoa at debian.org>
Date: Sat Jun 16 14:07:23 2012 +0200
Drop obsolete patches 06_module_build.patch and 07_pod-coverage.patch.
diff --git a/debian/patches/06_module_build.patch b/debian/patches/06_module_build.patch
deleted file mode 100644
index cad222f..0000000
--- a/debian/patches/06_module_build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Author: <gregor+debian at comodo.priv.at>
-Description: Fix Build.PL to work with newer Module::Build which doesn't use
-%Config automatically anymore.
---- a/Build.PL
-+++ b/Build.PL
-@@ -40,7 +40,7 @@ sub process_swig_files {
-
- sub process_swig {
- my ($self, $main_swig_file, $deps_ref) = @_;
-- my ($cf, $p) = ($self->{config}, $self->{properties}); # For convenience
-+ my ($cf, $p) = ($self->{config}->{values}, $self->{properties}); # For convenience
-
- # File name. e.g, perlcdio.swg -> perlcdio_wrap.c
- (my $file_base = $main_swig_file) =~ s/\.[^.]+$//;
-@@ -82,7 +82,7 @@ sub process_swig {
- # Invoke swig with -perl -outdir and other options.
- sub compile_swig {
- my ($self, $file, $c_file) = @_;
-- my ($cf, $p) = ($self->{config}, $self->{properties}); # For convenience
-+ my ($cf, $p) = ($self->{config}->{values}, $self->{properties}); # For convenience
-
- # File name, minus the suffix
- (my $file_base = $file) =~ s/\.[^.]+$//;
-@@ -124,7 +124,7 @@ sub compile_swig {
- # Also we modified the die to report the full file name.
- sub link_c {
- my ($self, $to, $file_base, $obj_file) = @_;
-- my ($cf, $p) = ($self->{config}, $self->{properties}); # For convenience
-+ my ($cf, $p) = ($self->{config}->{values}, $self->{properties}); # For convenience
-
- my $lib_file = File::Spec->catfile($to, File::Basename::basename("$file_base.$cf->{dlext}"));
-
-@@ -149,7 +149,7 @@ sub link_c {
-
- sub compile_c {
- my ($self, $file) = @_;
-- my ($cf, $p) = ($self->{config}, $self->{properties}); # For convenience
-+ my ($cf, $p) = ($self->{config}->{values}, $self->{properties}); # For convenience
-
- # File name, minus the suffix
- (my $file_base = $file) =~ s/\.[^.]+$//;
-@@ -356,4 +356,19 @@ my $builder = $class->new(
- );
-
- $builder->add_build_element('swig');
-+my @confvars = (
-+ "dlext",
-+ "lddlflags",
-+ "shrpenv",
-+ "ld",
-+ "obj_ext",
-+ "installarchlib",
-+ "cccdlflags",
-+ "ccflags",
-+ "optimize",
-+ "cc",
-+);
-+foreach my $confvar(@confvars) {
-+ $builder->config($confvar, $Config{$confvar});
-+}
- $builder->create_build_script();
diff --git a/debian/patches/07_pod-coverage.patch b/debian/patches/07_pod-coverage.patch
deleted file mode 100644
index cff3101..0000000
--- a/debian/patches/07_pod-coverage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: <gregor+debian at comodo.priv.at>
-Description: Only test pod coverage for modules in lib/Device.
-Seems to have been the author's intention, and closes #456845
---- a/t/01.pod-coverage.t
-+++ b/t/01.pod-coverage.t
-@@ -11,7 +11,7 @@ use Test::More;
- eval "use Test::Pod::Coverage 1.04";
- plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@;
-
--all_pod_coverage_ok();
-+# all_pod_coverage_ok();
-
- # Don't know how to get this from perlcdio ignored.
- #all_pod_coverage_ok(
-@@ -19,3 +19,9 @@ all_pod_coverage_ok();
- # { also_private => [ qr/this$/ ] },
- # "perlcdio, 'this' routine"
- # );
-+
-+my @modules = all_modules('blib/lib/Device');
-+plan tests => $#modules + 1;
-+foreach (@modules) {
-+ pod_coverage_ok($_);
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 8244770..50a9fea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
02_wrong_function_name.patch
03_version_information_in_swig.patch
04_wrong_handling_of_output_parameters.patch
-#06_module_build.patch
-#07_pod-coverage.patch
--
Debian packaging of libdevice-cdio-perl
More information about the Pkg-perl-cvs-commits
mailing list