[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 12:59:59 UTC 2012


The following commit has been merged in the master branch:
commit 34136d4c4782b7207c4fbb4769ab064a0eca7484
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 16 14:06:53 2012 +0200

    Refresh 03_version_information_in_swig.patch and
    04_wrong_handling_of_output_parameters.patch.

diff --git a/debian/patches/03_version_information_in_swig.patch b/debian/patches/03_version_information_in_swig.patch
index 4a1029d..c2108f8 100644
--- a/debian/patches/03_version_information_in_swig.patch
+++ b/debian/patches/03_version_information_in_swig.patch
@@ -6,21 +6,13 @@ Description: The conditional compilation based on the lib's version wasn't worki
  /* See <cdio/device.h> for more extensive documentation. */
  
  %include "device_const.swg"
-+%include <cdio/version.h>
++#include <cdio/version.h>
  
  /* 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/swig/perliso9660.swg
 +++ b/swig/perliso9660.swg
-@@ -18,6 +18,7 @@
- #include <time.h>
- #include <cdio/iso9660.h>
- #include <cdio/version.h>
-+%include <cdio/version.h>
- 
- /* Various libcdio constants and typedefs */
- %include "types.swg"
-@@ -42,7 +43,7 @@
+@@ -42,7 +42,7 @@
  %constant long int RECORD               = ISO_RECORD;
  
  /* When version 0.77 comes out, require it and fix this fix this. */
diff --git a/debian/patches/04_wrong_handling_of_output_parameters.patch b/debian/patches/04_wrong_handling_of_output_parameters.patch
index ab6e3c8..6aad2c5 100644
--- a/debian/patches/04_wrong_handling_of_output_parameters.patch
+++ b/debian/patches/04_wrong_handling_of_output_parameters.patch
@@ -57,7 +57,7 @@ behaviour. But it somehow passed the tests.
  }
 --- a/swig/perliso9660.swg
 +++ b/swig/perliso9660.swg
-@@ -98,12 +98,11 @@
+@@ -97,12 +97,11 @@
  
   PPCODE:
      /* Have perl compute the length of the string using strlen() */
@@ -75,7 +75,7 @@ behaviour. But it somehow passed the tests.
      free (p_statbuf);
   out: ;
  }
-@@ -112,30 +111,23 @@
+@@ -111,30 +110,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