[SCM] Debian packaging of libdevice-cdio-perl branch, master, updated. upstream/0.3.0-58-g3409049
Martín Ferrari
tincho at debian.org
Tue Jan 17 17:22:50 UTC 2012
The following commit has been merged in the master branch:
commit 822db320cad17ce2e925a8cf8bdbe2bce8ba61c5
Author: Martín Ferrari <tincho at debian.org>
Date: Tue Jan 17 08:06:00 2012 +0000
debian/patches: refreshed still-applying patches (and remove some not-relevant anymore lines in 03_version_information_in_swig.patch).
diff --git a/debian/changelog b/debian/changelog
index 93551b0..5bc8927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ libdevice-cdio-perl (0.3.0-1) UNRELEASED; urgency=low
[ Martín Ferrari ]
* debian/patches: removed a couple of patches applied upstream.
+ * debian/patches: refreshed still-applying patches (and remove some
+ not-relevant anymore lines in 03_version_information_in_swig.patch).
-- gregor herrmann <gregoa at debian.org> Fri, 21 Oct 2011 16:32:35 +0200
diff --git a/debian/patches/02_wrong_function_name.patch b/debian/patches/02_wrong_function_name.patch
index 3f172e8..f7f9067 100644
--- a/debian/patches/02_wrong_function_name.patch
+++ b/debian/patches/02_wrong_function_name.patch
@@ -1,9 +1,11 @@
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.
---- a/perliso9660.swg
-+++ b/perliso9660.swg
-@@ -564,8 +564,8 @@ IsoStat_t *iso9660_find_fs_lsn(CdIo_t *p
+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
+@@ -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 041b446..5885ef9 100644
--- a/debian/patches/03_version_information_in_swig.patch
+++ b/debian/patches/03_version_information_in_swig.patch
@@ -1,8 +1,10 @@
Author: Martín Ferrari <martin.ferrari at gmail.com>
Description: The conditional compilation based on the lib's version wasn't working.
---- a/device.swg
-+++ b/device.swg
-@@ -20,6 +20,7 @@
+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
+@@ -17,6 +17,7 @@
/* See <cdio/device.h> for more extensive documentation. */
%include "device_const.swg"
@@ -10,9 +12,11 @@ Description: The conditional compilation based on the lib's version wasn't worki
/* 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
---- a/perliso9660.swg
-+++ b/perliso9660.swg
-@@ -35,6 +35,7 @@ equivalant standard is called ECMA-119."
+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
+@@ -18,6 +18,7 @@
#include <time.h>
#include <cdio/iso9660.h>
#include <cdio/version.h>
@@ -20,7 +24,7 @@ Description: The conditional compilation based on the lib's version wasn't worki
/* Various libcdio constants and typedefs */
%include "types.swg"
-@@ -60,7 +61,7 @@ typedef uint8_t iso_extension_mask_t;
+@@ -42,7 +43,7 @@
%constant long int RECORD = ISO_RECORD;
/* When version 0.77 comes out, require it and fix this fix this. */
@@ -29,27 +33,3 @@ Description: The conditional compilation based on the lib's version wasn't worki
%constant long int PROTECTION = ISO_PROTECTION;
#else
%constant long int PROTECTION = 16;
---- a/Build.PL
-+++ b/Build.PL
-@@ -98,11 +98,12 @@ sub compile_swig {
- } else {
- @swig_flags = ();
- }
-+ my @include_dirs = map {"-I$_"} (@{$p->{include_dirs}});
-
- my $blib_lib = File::Spec->catfile($self->blib, 'lib');
-
- # print "+++swig -o $c_file -outdir $blib_lib -perl $file\n";
-- $self->do_system(@swig, '-o', $c_file, '-outdir', $blib_lib,
-+ $self->do_system(@swig, @include_dirs, '-o', $c_file, '-outdir', $blib_lib,
- '-perl', @swig_flags, $file)
- or die "error building $c_file file from '$file'";
-
-@@ -335,6 +336,7 @@ my $builder = $class->new(
- extra_linker_flags => $ldflags,
- extra_compiler_flags=> $ccflags,
- swig_flags => $swig_flags,
-+ include_dirs => [ '/usr/include' ],
- swig_installed => $swig_installed,
- license => 'gpl',
- requires => {
diff --git a/debian/patches/04_wrong_handling_of_output_parameters.patch b/debian/patches/04_wrong_handling_of_output_parameters.patch
index 709ca4b..f7765d2 100644
--- a/debian/patches/04_wrong_handling_of_output_parameters.patch
+++ b/debian/patches/04_wrong_handling_of_output_parameters.patch
@@ -1,9 +1,11 @@
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.
---- a/lib/Device/Cdio/ISO9660/FS.pm
-+++ b/lib/Device/Cdio/ISO9660/FS.pm
-@@ -132,9 +132,6 @@ sub find_lsn {
+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
+@@ -116,9 +116,6 @@
my @values = perliso9660::fs_find_lsn($self->{cd}, $lsn);
@@ -13,7 +15,7 @@ behaviour. But it somehow passed the tests.
return Device::Cdio::ISO9660::stat_array_to_href(@values);
}
-@@ -195,9 +192,6 @@ sub readdir {
+@@ -179,9 +176,6 @@
my @values = perliso9660::fs_readdir($self->{cd}, $dirname);
@@ -23,7 +25,7 @@ behaviour. But it somehow passed the tests.
my @result = ();
while (@values) {
push @result, Device::Cdio::ISO9660::stat_array_to_href(@values);
-@@ -310,9 +304,6 @@ sub stat {
+@@ -294,9 +288,6 @@
@values = perliso9660::fs_stat($self->{cd}, $path);
}
@@ -33,9 +35,11 @@ behaviour. But it somehow passed the tests.
return undef if !@values;
return Device::Cdio::ISO9660::stat_array_to_href(@values);
}
---- a/lib/Device/Cdio/ISO9660/IFS.pm
-+++ b/lib/Device/Cdio/ISO9660/IFS.pm
-@@ -489,9 +489,6 @@ sub readdir {
+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
+@@ -476,9 +476,6 @@
my @values = perliso9660::ifs_readdir($self->{iso9660}, $dirname);
@@ -45,7 +49,7 @@ behaviour. But it somehow passed the tests.
my @result = ();
while (@values) {
push @result, Device::Cdio::ISO9660::stat_array_to_href(@values);
-@@ -625,9 +622,6 @@ sub stat {
+@@ -612,9 +609,6 @@
@values = perliso9660::ifs_stat($self->{iso9660}, $path);
}
@@ -55,9 +59,11 @@ behaviour. But it somehow passed the tests.
return undef if !@values;
return Device::Cdio::ISO9660::stat_array_to_href(@values);
}
---- a/perliso9660.swg
-+++ b/perliso9660.swg
-@@ -116,12 +116,11 @@ typedef iso9660_stat_t IsoStat_t;
+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
+@@ -98,12 +98,11 @@
PPCODE:
/* Have perl compute the length of the string using strlen() */
@@ -75,7 +81,7 @@ behaviour. But it somehow passed the tests.
free (p_statbuf);
out: ;
}
-@@ -130,30 +129,23 @@ typedef iso9660_stat_t IsoStat_t;
+@@ -112,30 +111,23 @@
// $1 is of type IsoStatList_t
CdioList_t *p_entlist = result;
CdioListNode_t *p_entnode;
--
Debian packaging of libdevice-cdio-perl
More information about the Pkg-perl-cvs-commits
mailing list