r13647 - in /trunk/libvorbis-perl: Makefile.PL Vorbis.xs debian/changelog debian/control debian/patches/ debian/patches/Makefile.PL_sanitize-INC-and-LIBS.patch debian/patches/bts389571_give-ov_open-duplicate-handle.patch debian/patches/series debian/rules

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Sat Jan 26 21:07:00 UTC 2008 

Author: dmn
Date: Sat Jan 26 21:06:59 2008
New Revision: 13647

URL: http://svn.debian.org/wsvn/?sc=1&rev=13647
Log:
* move changes to upstream tre to quilt
  + clean: re-generate Makefile before invoking distclean as Makefile.PL is
    modified by unpatch

Added:
    trunk/libvorbis-perl/debian/patches/
    trunk/libvorbis-perl/debian/patches/Makefile.PL_sanitize-INC-and-LIBS.patch
    trunk/libvorbis-perl/debian/patches/bts389571_give-ov_open-duplicate-handle.patch
    trunk/libvorbis-perl/debian/patches/series
Modified:
    trunk/libvorbis-perl/Makefile.PL
    trunk/libvorbis-perl/Vorbis.xs
    trunk/libvorbis-perl/debian/changelog
    trunk/libvorbis-perl/debian/control
    trunk/libvorbis-perl/debian/rules

Modified: trunk/libvorbis-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/Makefile.PL?rev=13647&op=diff
==============================================================================
--- trunk/libvorbis-perl/Makefile.PL (original)
+++ trunk/libvorbis-perl/Makefile.PL Sat Jan 26 21:06:59 2008
@@ -4,8 +4,8 @@
 WriteMakefile(
     'NAME'	=> 'Ogg::Vorbis',
     'VERSION_FROM' => 'Vorbis.pm',
-    'LIBS'	=> ['-lvorbisfile'],
+    'LIBS'	=> ['-logg -lvorbis -lvorbisfile'],
     'DEFINE'	=> '',
-    'INC'	=> '',
+    'INC'	=> '-I/usr/local/include/vorbis',
     'EXE_FILES' => ['pogg'],
 );

Modified: trunk/libvorbis-perl/Vorbis.xs
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/Vorbis.xs?rev=13647&op=diff
==============================================================================
--- trunk/libvorbis-perl/Vorbis.xs (original)
+++ trunk/libvorbis-perl/Vorbis.xs Sat Jan 26 21:06:59 2008
@@ -62,13 +62,8 @@
         char *initial
         long ibytes
         CODE:
-	FILE *dupfile;
-	/* dup the file so that ov_clear() can close it behind 
-	   Perl's back (Debian bug #389571) */ 
-	dupfile = fdopen(dup(fileno(file)), "r");
-
         /* we swapped file and self for an OO interface */
-        RETVAL = ov_open(dupfile, self, initial, ibytes);
+        RETVAL = ov_open(file, self, initial, ibytes);
         OUTPUT:
         RETVAL
 

Modified: trunk/libvorbis-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/debian/changelog?rev=13647&op=diff
==============================================================================
--- trunk/libvorbis-perl/debian/changelog (original)
+++ trunk/libvorbis-perl/debian/changelog Sat Jan 26 21:06:59 2008
@@ -30,6 +30,9 @@
       upstream version
     + added README.Debian-source
   * do not ship redundant README
+  * move changes to upstream tre to quilt
+    + clean: re-generate Makefile before invoking distclean as Makefile.PL is
+      modified by unpatch
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 26 Jan 2008 19:17:42 +0100
 

Modified: trunk/libvorbis-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/debian/control?rev=13647&op=diff
==============================================================================
--- trunk/libvorbis-perl/debian/control (original)
+++ trunk/libvorbis-perl/debian/control Sat Jan 26 21:06:59 2008
@@ -6,7 +6,7 @@
  Joachim Breitner <nomeata at debian.org>, Gunnar Wolf <gwolf at debian.org>,
   Niko Tyni <ntyni at iki.fi>, Joey Hess <joeyh at debian.org>,
   Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 6), perl, libvorbis-dev
+Build-Depends: debhelper (>= 6), perl, libvorbis-dev, quilt
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/libvorbis-perl/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libvorbis-perl/

Added: trunk/libvorbis-perl/debian/patches/Makefile.PL_sanitize-INC-and-LIBS.patch
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/debian/patches/Makefile.PL_sanitize-INC-and-LIBS.patch?rev=13647&op=file
==============================================================================
--- trunk/libvorbis-perl/debian/patches/Makefile.PL_sanitize-INC-and-LIBS.patch (added)
+++ trunk/libvorbis-perl/debian/patches/Makefile.PL_sanitize-INC-and-LIBS.patch Sat Jan 26 21:06:59 2008
@@ -1,0 +1,13 @@
+--- libvorbis-perl-0.05.ds1.orig/Makefile.PL
++++ libvorbis-perl-0.05.ds1/Makefile.PL
+@@ -4,8 +4,8 @@
+ WriteMakefile(
+     'NAME'	=> 'Ogg::Vorbis',
+     'VERSION_FROM' => 'Vorbis.pm',
+-    'LIBS'	=> ['-logg -lvorbis -lvorbisfile'],
++    'LIBS'	=> ['-lvorbisfile'],
+     'DEFINE'	=> '',
+-    'INC'	=> '-I/usr/local/include/vorbis',
++    'INC'	=> '',
+     'EXE_FILES' => ['pogg'],
+ );

Added: trunk/libvorbis-perl/debian/patches/bts389571_give-ov_open-duplicate-handle.patch
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/debian/patches/bts389571_give-ov_open-duplicate-handle.patch?rev=13647&op=file
==============================================================================
--- trunk/libvorbis-perl/debian/patches/bts389571_give-ov_open-duplicate-handle.patch (added)
+++ trunk/libvorbis-perl/debian/patches/bts389571_give-ov_open-duplicate-handle.patch Sat Jan 26 21:06:59 2008
@@ -1,0 +1,17 @@
+--- libvorbis-perl-0.05.ds1.orig/Vorbis.xs
++++ libvorbis-perl-0.05.ds1/Vorbis.xs
+@@ -62,8 +62,13 @@
+         char *initial
+         long ibytes
+         CODE:
++	FILE *dupfile;
++	/* dup the file so that ov_clear() can close it behind 
++	   Perl's back (Debian bug #389571) */ 
++	dupfile = fdopen(dup(fileno(file)), "r");
++
+         /* we swapped file and self for an OO interface */
+-        RETVAL = ov_open(file, self, initial, ibytes);
++        RETVAL = ov_open(dupfile, self, initial, ibytes);
+         OUTPUT:
+         RETVAL
+ 

Added: trunk/libvorbis-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/debian/patches/series?rev=13647&op=file
==============================================================================
--- trunk/libvorbis-perl/debian/patches/series (added)
+++ trunk/libvorbis-perl/debian/patches/series Sat Jan 26 21:06:59 2008
@@ -1,0 +1,2 @@
+bts389571_give-ov_open-duplicate-handle.patch
+Makefile.PL_sanitize-INC-and-LIBS.patch

Modified: trunk/libvorbis-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libvorbis-perl/debian/rules?rev=13647&op=diff
==============================================================================
--- trunk/libvorbis-perl/debian/rules (original)
+++ trunk/libvorbis-perl/debian/rules Sat Jan 26 21:06:59 2008
@@ -5,6 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
+PERL ?= /usr/bin/perl
 PACKAGE=$(shell dh_listpackages)
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
@@ -18,19 +21,20 @@
 endif
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE=$(CFLAGS)
+	$(PERL) Makefile.PL INSTALLDIRS=vendor OPTIMIZE=$(CFLAGS)
 	$(MAKE) 
 	$(MAKE) test
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp Makefile.old
 	dh_clean
-	[ ! -f Makefile ] || $(MAKE) distclean
+	# re-generate Makefile as Makefile.PL is unpatched
+	[ ! -f Makefile ] || ( $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) distclean )
 
 install: install-stamp
 install-stamp: build-stamp

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