[SCM] Debian packaging of libdevice-cdio-perl branch, master, updated. upstream/0.3.0-59-geeb08a1
gregor herrmann
gregoa at debian.org
Tue Jan 17 18:17:36 UTC 2012
The following commit has been merged in the master branch:
commit eeb08a17703bbdf304685bc8f0ae5d090faacd7b
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Jan 17 18:51:41 2012 +0100
refresh patches with nicer .quiltrc settings
Git-Dch: Ignore
diff --git a/debian/patches/02_wrong_function_name.patch b/debian/patches/02_wrong_function_name.patch
index f7f9067..46a6bba 100644
--- a/debian/patches/02_wrong_function_name.patch
+++ b/debian/patches/02_wrong_function_name.patch
@@ -1,10 +1,8 @@
Author: Martín Ferrari <martin.ferrari at gmail.com>
Description: This is surely a mistake in libcdio, as the name in not coherent with
the rest of the API. Nevertheless, this wasn't working as it was.
-Index: libdevice-cdio-perl/swig/perliso9660.swg
-===================================================================
---- libdevice-cdio-perl.orig/swig/perliso9660.swg 2012-01-17 07:54:17.381797203 +0000
-+++ libdevice-cdio-perl/swig/perliso9660.swg 2012-01-17 08:01:05.828038287 +0000
+--- a/swig/perliso9660.swg
++++ b/swig/perliso9660.swg
@@ -546,8 +546,8 @@
Returns stat_t of entry if we found lsn, or NULL otherwise.
diff --git a/debian/patches/03_version_information_in_swig.patch b/debian/patches/03_version_information_in_swig.patch
index 5885ef9..4a1029d 100644
--- a/debian/patches/03_version_information_in_swig.patch
+++ b/debian/patches/03_version_information_in_swig.patch
@@ -1,9 +1,7 @@
Author: Martín Ferrari <martin.ferrari at gmail.com>
Description: The conditional compilation based on the lib's version wasn't working.
-Index: libdevice-cdio-perl/swig/device.swg
-===================================================================
---- libdevice-cdio-perl.orig/swig/device.swg 2012-01-17 07:54:17.241801950 +0000
-+++ libdevice-cdio-perl/swig/device.swg 2012-01-17 08:02:32.897106445 +0000
+--- a/swig/device.swg
++++ b/swig/device.swg
@@ -17,6 +17,7 @@
/* See <cdio/device.h> for more extensive documentation. */
@@ -12,10 +10,8 @@ Index: libdevice-cdio-perl/swig/device.swg
/* Set up to allow functions to return device lists of type "char
*". We'll use a typedef so we can make sure to isolate this. I
-Index: libdevice-cdio-perl/swig/perliso9660.swg
-===================================================================
---- libdevice-cdio-perl.orig/swig/perliso9660.swg 2012-01-17 08:02:16.929644144 +0000
-+++ libdevice-cdio-perl/swig/perliso9660.swg 2012-01-17 08:02:32.897106445 +0000
+--- a/swig/perliso9660.swg
++++ b/swig/perliso9660.swg
@@ -18,6 +18,7 @@
#include <time.h>
#include <cdio/iso9660.h>
diff --git a/debian/patches/04_wrong_handling_of_output_parameters.patch b/debian/patches/04_wrong_handling_of_output_parameters.patch
index f7765d2..ab6e3c8 100644
--- a/debian/patches/04_wrong_handling_of_output_parameters.patch
+++ b/debian/patches/04_wrong_handling_of_output_parameters.patch
@@ -1,10 +1,8 @@
Author: Martín Ferrari <martin.ferrari at gmail.com>
Description: The return parameters handling was incorrect and resulted in weird
behaviour. But it somehow passed the tests.
-Index: libdevice-cdio-perl/lib/Device/Cdio/ISO9660/FS.pm
-===================================================================
---- libdevice-cdio-perl.orig/lib/Device/Cdio/ISO9660/FS.pm 2012-01-17 07:54:17.001810090 +0000
-+++ libdevice-cdio-perl/lib/Device/Cdio/ISO9660/FS.pm 2012-01-17 08:02:39.564881907 +0000
+--- a/lib/Device/Cdio/ISO9660/FS.pm
++++ b/lib/Device/Cdio/ISO9660/FS.pm
@@ -116,9 +116,6 @@
my @values = perliso9660::fs_find_lsn($self->{cd}, $lsn);
@@ -35,10 +33,8 @@ Index: libdevice-cdio-perl/lib/Device/Cdio/ISO9660/FS.pm
return undef if !@values;
return Device::Cdio::ISO9660::stat_array_to_href(@values);
}
-Index: libdevice-cdio-perl/lib/Device/Cdio/ISO9660/IFS.pm
-===================================================================
---- libdevice-cdio-perl.orig/lib/Device/Cdio/ISO9660/IFS.pm 2012-01-17 07:54:16.973811039 +0000
-+++ libdevice-cdio-perl/lib/Device/Cdio/ISO9660/IFS.pm 2012-01-17 08:02:39.568881772 +0000
+--- a/lib/Device/Cdio/ISO9660/IFS.pm
++++ b/lib/Device/Cdio/ISO9660/IFS.pm
@@ -476,9 +476,6 @@
my @values = perliso9660::ifs_readdir($self->{iso9660}, $dirname);
@@ -59,10 +55,8 @@ Index: libdevice-cdio-perl/lib/Device/Cdio/ISO9660/IFS.pm
return undef if !@values;
return Device::Cdio::ISO9660::stat_array_to_href(@values);
}
-Index: libdevice-cdio-perl/swig/perliso9660.swg
-===================================================================
---- libdevice-cdio-perl.orig/swig/perliso9660.swg 2012-01-17 08:02:32.897106445 +0000
-+++ libdevice-cdio-perl/swig/perliso9660.swg 2012-01-17 08:02:39.568881772 +0000
+--- a/swig/perliso9660.swg
++++ b/swig/perliso9660.swg
@@ -98,12 +98,11 @@
PPCODE:
--
Debian packaging of libdevice-cdio-perl
More information about the Pkg-perl-cvs-commits
mailing list