r21656 - in /trunk/libogg-vorbis-header-pureperl-perl/debian: changelog patches/00list patches/10comment_tags.dpatch patches/10comment_tags.patch patches/20tracklength.dpatch patches/20tracklength.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun 15 17:16:24 2008
New Revision: 21656

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21656
Log:
Switch patch system from dpatch to quilt.

Added:
    trunk/libogg-vorbis-header-pureperl-perl/debian/patches/10comment_tags.patch
    trunk/libogg-vorbis-header-pureperl-perl/debian/patches/20tracklength.patch
    trunk/libogg-vorbis-header-pureperl-perl/debian/patches/series
Removed:
    trunk/libogg-vorbis-header-pureperl-perl/debian/patches/00list
    trunk/libogg-vorbis-header-pureperl-perl/debian/patches/10comment_tags.dpatch
    trunk/libogg-vorbis-header-pureperl-perl/debian/patches/20tracklength.dpatch
Modified:
    trunk/libogg-vorbis-header-pureperl-perl/debian/changelog
    trunk/libogg-vorbis-header-pureperl-perl/debian/rules

Modified: trunk/libogg-vorbis-header-pureperl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-header-pureperl-perl/debian/changelog?rev=21656&op=diff
==============================================================================
--- trunk/libogg-vorbis-header-pureperl-perl/debian/changelog (original)
+++ trunk/libogg-vorbis-header-pureperl-perl/debian/changelog Sun Jun 15 17:16:24 2008
@@ -9,6 +9,7 @@
     <florian at mookooh.org>); Florian Ragwitz <florian at mookooh.org> moved
     to Uploaders.
   * Add debian/watch.
+  * Switch patch system from dpatch to quilt.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 15 Jun 2008 16:41:48 +0200
 

Added: trunk/libogg-vorbis-header-pureperl-perl/debian/patches/10comment_tags.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-header-pureperl-perl/debian/patches/10comment_tags.patch?rev=21656&op=file
==============================================================================
--- trunk/libogg-vorbis-header-pureperl-perl/debian/patches/10comment_tags.patch (added)
+++ trunk/libogg-vorbis-header-pureperl-perl/debian/patches/10comment_tags.patch Sun Jun 15 17:16:24 2008
@@ -1,0 +1,23 @@
+Author: Florian Ragwitz <florian.ragwitz at s2004.tu-chemnitz.de>
+Description: Remove dupes from comment_tags.
+--- libogg-vorbis-header-pureperl-perl.orig/PurePerl.pm
++++ libogg-vorbis-header-pureperl-perl/PurePerl.pm
+@@ -380,6 +380,7 @@
+     $byteCount += 4;
+ 
+     $data->{'COMMENT_KEYS'} = [];
++	my %seen_comments;
+ 
+     # finally, read the comments
+     for (my $i = 0; $i < $user_comment_count; $i++)
+@@ -397,7 +398,9 @@
+ 	my ($value) = $buffer =~ /=(.*)$/;
+ 
+ 	push @{$comments{lc $key}}, $value;
+-	push @{$data->{'COMMENT_KEYS'}}, lc $key;
++	push @{$data->{'COMMENT_KEYS'}}, lc $key
++		unless $seen_comments{lc $key};
++	$seen_comments{lc $key} = 1;
+     }
+     
+     # read past the framing_bit

Added: trunk/libogg-vorbis-header-pureperl-perl/debian/patches/20tracklength.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-header-pureperl-perl/debian/patches/20tracklength.patch?rev=21656&op=file
==============================================================================
--- trunk/libogg-vorbis-header-pureperl-perl/debian/patches/20tracklength.patch (added)
+++ trunk/libogg-vorbis-header-pureperl-perl/debian/patches/20tracklength.patch Sun Jun 15 17:16:24 2008
@@ -1,0 +1,32 @@
+Author: Florian Ragwitz <florian.ragwitz at s2004.tu-chemnitz.de>
+Description: make calculating track length optional.
+--- libogg-vorbis-header-pureperl-perl.orig/PurePerl.pm
++++ libogg-vorbis-header-pureperl-perl/PurePerl.pm
+@@ -12,15 +12,16 @@
+ {
+     my $class = shift;
+     my $file = shift;
++	my $opts = shift;
+ 
+-    return load($class, $file);
++    return load($class, $file, $opts);
+ }
+ 
+ sub load 
+ {
+     my $class    = shift;
+     my $file     = shift;
+-    my $from_new = shift;
++    my $opts     = shift || {};
+     my %data;
+     my $self;
+ 
+@@ -59,7 +60,7 @@
+     _init(\%data);
+     _loadInfo(\%data);
+     _loadComments(\%data);
+-    _calculateTrackLength(\%data);
++    _calculateTrackLength(\%data) unless $opts->{notracklength};
+ 
+     close FILE;
+ 

Added: trunk/libogg-vorbis-header-pureperl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-header-pureperl-perl/debian/patches/series?rev=21656&op=file
==============================================================================
--- trunk/libogg-vorbis-header-pureperl-perl/debian/patches/series (added)
+++ trunk/libogg-vorbis-header-pureperl-perl/debian/patches/series Sun Jun 15 17:16:24 2008
@@ -1,0 +1,2 @@
+10comment_tags.patch
+20tracklength.patch

Modified: trunk/libogg-vorbis-header-pureperl-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-header-pureperl-perl/debian/rules?rev=21656&op=diff
==============================================================================
--- trunk/libogg-vorbis-header-pureperl-perl/debian/rules (original)
+++ trunk/libogg-vorbis-header-pureperl-perl/debian/rules Sun Jun 15 17:16:24 2008
@@ -5,7 +5,7 @@
 # the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
 # be used freely wherever it is useful.
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -16,7 +16,7 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor