r8427 - in /trunk/libdevice-cdio-perl/debian: changelog control patches/00list patches/06_module_build.dpatch

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Sun Oct 21 15:01:00 UTC 2007


Author: gregoa-guest
Date: Sun Oct 21 15:00:59 2007
New Revision: 8427

URL: http://svn.debian.org/wsvn/?sc=1&rev=8427
Log:
Add patch 06_module_build: Change Build.PL to work with newer
  Module::Build, which doesn't import %Config automatically anymore
  (closes: #447461).

Added:
    trunk/libdevice-cdio-perl/debian/patches/06_module_build.dpatch   (with props)
Modified:
    trunk/libdevice-cdio-perl/debian/changelog
    trunk/libdevice-cdio-perl/debian/control
    trunk/libdevice-cdio-perl/debian/patches/00list

Modified: trunk/libdevice-cdio-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdevice-cdio-perl/debian/changelog?rev=8427&op=diff
==============================================================================
--- trunk/libdevice-cdio-perl/debian/changelog (original)
+++ trunk/libdevice-cdio-perl/debian/changelog Sun Oct 21 15:00:59 2007
@@ -1,12 +1,15 @@
-libdevice-cdio-perl (0.2.4-3) UNRELEASED; urgency=low
+libdevice-cdio-perl (0.2.4-3) unstable; urgency=medium
 
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields; pseudo-field Homepage (Description).
   * Don't create .packlist file.
   * Remove empty /usr/share/perl5 directory.
+  * Add patch 06_module_build: Change Build.PL to work with newer
+    Module::Build, which doesn't import %Config automatically anymore
+    (closes: #447461).
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 21 Oct 2007 16:10:33 +0200
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 21 Oct 2007 16:58:50 +0200
 
 libdevice-cdio-perl (0.2.4-2) unstable; urgency=medium
 

Modified: trunk/libdevice-cdio-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libdevice-cdio-perl/debian/control?rev=8427&op=diff
==============================================================================
--- trunk/libdevice-cdio-perl/debian/control (original)
+++ trunk/libdevice-cdio-perl/debian/control Sun Oct 21 15:00:59 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 5.0.0), dpatch, swig, libmodule-build-perl, perl (>= 5.8.8-7), libversion-perl, libextutils-pkgconfig-perl, libcdio-dev, libiso9660-dev, libtest-pod-coverage-perl, libtest-pod-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Martín Ferrari <martin.ferrari at gmail.com>
+Uploaders: Martín Ferrari <martin.ferrari at gmail.com>, gregor herrmann <gregor+debian at comodo.priv.at>
 Standards-Version: 3.7.2
 Homepage: http://search.cpan.org/dist/Device-Cdio/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdevice-cdio-perl/

Modified: trunk/libdevice-cdio-perl/debian/patches/00list
URL: http://svn.debian.org/wsvn/trunk/libdevice-cdio-perl/debian/patches/00list?rev=8427&op=diff
==============================================================================
--- trunk/libdevice-cdio-perl/debian/patches/00list (original)
+++ trunk/libdevice-cdio-perl/debian/patches/00list Sun Oct 21 15:00:59 2007
@@ -3,3 +3,4 @@
 03_version_information_in_swig
 04_wrong_handling_of_output_parameters
 05_buffer_overflows_in_perliso9660
+06_module_build

Added: trunk/libdevice-cdio-perl/debian/patches/06_module_build.dpatch
URL: http://svn.debian.org/wsvn/trunk/libdevice-cdio-perl/debian/patches/06_module_build.dpatch?rev=8427&op=file
==============================================================================
--- trunk/libdevice-cdio-perl/debian/patches/06_module_build.dpatch (added)
+++ trunk/libdevice-cdio-perl/debian/patches/06_module_build.dpatch Sun Oct 21 15:00:59 2007
@@ -1,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_module_build.dpatch by  <gregor+debian at comodo.priv.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix Build.PL to work with newer Module::Build which doesn't use
+## DP: %Config automatically anymore.
+
+ at DPATCH@
+diff -urNad libdevice-cdio-perl~/Build.PL libdevice-cdio-perl/Build.PL
+--- libdevice-cdio-perl~/Build.PL	2007-10-21 16:55:13.000000000 +0200
++++ libdevice-cdio-perl/Build.PL	2007-10-21 16:55:23.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ 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 @@
+ # 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 @@
+ # 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 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 @@
+ 			   );
+ 
+ $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();

Propchange: trunk/libdevice-cdio-perl/debian/patches/06_module_build.dpatch
------------------------------------------------------------------------------
    svn:executable = *




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