r27057 - in /trunk/libaudio-flac-header-perl: Changes Header.pm Header.xs META.yml README debian/README.source debian/changelog debian/compat debian/control debian/copyright debian/libaudio-flac-header-perl.docs debian/patches/ debian/rules

rmayorga-guest at users.alioth.debian.org rmayorga-guest at users.alioth.debian.org
Sat Nov 22 07:47:54 UTC 2008


Author: rmayorga-guest
Date: Sat Nov 22 07:47:51 2008
New Revision: 27057

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27057
Log:
* New upstream release
* debian/control
  + set debhelper version to 7
  + raise standards-versions to 3.8.0
  + add myself to uploaders
  + remove quilt from B-D
* debian/rules
  + use dh7 whit the help from dh-make-perl -R --dh7
* patches/uninitialized_comment; removed, included by upstream
* remove README.source

Added:
    trunk/libaudio-flac-header-perl/debian/libaudio-flac-header-perl.docs
Removed:
    trunk/libaudio-flac-header-perl/debian/README.source
    trunk/libaudio-flac-header-perl/debian/patches/
Modified:
    trunk/libaudio-flac-header-perl/Changes
    trunk/libaudio-flac-header-perl/Header.pm
    trunk/libaudio-flac-header-perl/Header.xs
    trunk/libaudio-flac-header-perl/META.yml
    trunk/libaudio-flac-header-perl/README
    trunk/libaudio-flac-header-perl/debian/changelog
    trunk/libaudio-flac-header-perl/debian/compat
    trunk/libaudio-flac-header-perl/debian/control
    trunk/libaudio-flac-header-perl/debian/copyright
    trunk/libaudio-flac-header-perl/debian/rules

Modified: trunk/libaudio-flac-header-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/Changes?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/Changes (original)
+++ trunk/libaudio-flac-header-perl/Changes Sat Nov 22 07:47:51 2008
@@ -1,4 +1,7 @@
 Revision history for Perl extension Audio::FLAC.
+
+2.3  Sat Nov  8 15:36:38 PST 2008
+	- Patch from Nick Hall to fix allpictures XS & Debian crash.
 
 2.2  Sat May 17 00:42:06 PDT 2008
 	- Patches from Nick Hall to allow allpictures XS partity & multiple ID3 tag fixes

Modified: trunk/libaudio-flac-header-perl/Header.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/Header.pm?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/Header.pm (original)
+++ trunk/libaudio-flac-header-perl/Header.pm Sat Nov 22 07:47:51 2008
@@ -1,11 +1,11 @@
 package Audio::FLAC::Header;
 
-# $Id: Header.pm 25 2008-05-31 20:00:44Z dsully $
+# $Id: Header.pm 26 2008-11-08 23:37:45Z dsully $
 
 use strict;
 use File::Basename;
 
-our $VERSION = '2.2';
+our $VERSION = '2.3';
 our $HAVE_XS = 0;
 
 # First four bytes of stream are always fLaC
@@ -171,8 +171,14 @@
 		return $self->{'allpictures'} if exists($self->{'allpictures'});
 	}
 
+	# Also look for other types of images
+	# http://flac.sourceforge.net/format.html#metadata_block_picture
+	my @types = ($type, 4, 0, 5..20);
+
 	# if the picture block exists, return it's content
-	return $self->{'picture'}->{$type} if exists($self->{'picture'}->{$type});
+	for (@types) {
+		return $self->{'picture'}->{$_} if exists $self->{'picture'}->{$_};
+	}
 
 	# otherwise, return nothing
 	return undef;

Modified: trunk/libaudio-flac-header-perl/Header.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/Header.xs?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/Header.xs (original)
+++ trunk/libaudio-flac-header-perl/Header.xs Sat Nov 22 07:47:51 2008
@@ -56,11 +56,10 @@
 void _read_metadata(HV *self, char *path, FLAC__StreamMetadata *block, unsigned block_number) {
 
 	unsigned i;
-	int j;
 	int storePicture = 0;
 
 	HV *pictureContainer = newHV();
-	AV *allpicturesContainer = newAV();
+	AV *allpicturesContainer = NULL;
 
 	switch (block->type) {
 
@@ -193,15 +192,13 @@
 					if (hv_exists(self, "separator", 9)) {
 						separator = hv_fetch(self, "separator", 9, 0);
 						sv_catsv(*tag, *separator);
-					}
-					else {
+					} else {
 						sv_catpv(*tag, "/");
 					}
 
 					/* concatenate with the new entry */
 					sv_catpv(*tag, half + 1);
-				}
-				else {
+				} else {
 					hv_store(tags, entry, half - entry, newSVpv(half + 1, 0), 0);
 				}
 			}
@@ -315,10 +312,19 @@
 				newRV_noinc((SV*) picture)
 			);
 
+			storePicture = 1;
+
 			/* update allpictures */
+			if (hv_exists(self, "allpictures", 11)) {
+				allpicturesContainer = (AV *) SvRV(*my_hv_fetch(self, "allpictures")); 
+			} else {
+				allpicturesContainer = newAV();
+
+				/* store the 'allpictures' array */
+				my_hv_store(self, "allpictures", newRV_noinc((SV*) allpicturesContainer));
+                        }
+
 			av_push(allpicturesContainer, (SV*) newRV((SV*) picture));
-
-			storePicture = 1;
 
 			break;
 		}
@@ -330,9 +336,6 @@
 	}
 
 	if (storePicture) {
-		/* store the 'allpictures' array */
-		my_hv_store(self, "allpictures", newRV_noinc((SV*) allpicturesContainer));
-
 		/* store the 'picture' hash */
 		if (hv_scalar(pictureContainer)) {
 			my_hv_store(self, "picture", newRV_noinc((SV*) pictureContainer));
@@ -635,7 +638,7 @@
 		FLAC__ASSERT(FLAC__metadata_iterator_get_block(iterator) == block);
 	}
 
-	FLAC__StreamMetadata_VorbisComment_Entry entry;
+	FLAC__StreamMetadata_VorbisComment_Entry entry = { 0 };
 	FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true);
 
 	if (hv_iterinit(tags)) {

Modified: trunk/libaudio-flac-header-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/META.yml?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/META.yml (original)
+++ trunk/libaudio-flac-header-perl/META.yml Sat Nov 22 07:47:51 2008
@@ -14,4 +14,4 @@
     - t
 requires: 
   perl: 5.005
-version: 2.2
+version: 2.3

Modified: trunk/libaudio-flac-header-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/README?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/README (original)
+++ trunk/libaudio-flac-header-perl/README Sat Nov 22 07:47:51 2008
@@ -1,4 +1,4 @@
-Audio::FLAC version 2.2
+Audio::FLAC version 2.3
 =======================
 
 The README is used to introduce the module and provide instructions on

Modified: trunk/libaudio-flac-header-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/debian/changelog?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/changelog (original)
+++ trunk/libaudio-flac-header-perl/debian/changelog Sat Nov 22 07:47:51 2008
@@ -1,11 +1,24 @@
-libaudio-flac-header-perl (2.2-3) UNRELEASED; urgency=low
-
+libaudio-flac-header-perl (2.3-1) unstable; urgency=low
+  
+  [ gregor herrmann ]
   * Add debian/README.source to document quilt usage, as required by
     Debian Policy since 3.8.0.
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
 
- -- gregor herrmann <gregoa at debian.org>  Wed, 06 Aug 2008 21:33:21 -0300
+  [ Rene Mayorga ]
+  * New upstream release
+  * debian/control
+    + set debhelper version to 7
+    + raise standards-versions to 3.8.0
+    + add myself to uploaders
+    + remove quilt from B-D
+  * debian/rules
+    + use dh7 whit the help from dh-make-perl -R --dh7
+  * patches/uninitialized_comment; removed, included by upstream
+  * remove README.source
+
+ -- Rene Mayorga <rmayorga at debian.org.sv>  Sat, 22 Nov 2008 01:25:46 -0600
 
 libaudio-flac-header-perl (2.2-2) unstable; urgency=low
 

Modified: trunk/libaudio-flac-header-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/debian/compat?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/compat (original)
+++ trunk/libaudio-flac-header-perl/debian/compat Sat Nov 22 07:47:51 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libaudio-flac-header-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/debian/control?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/control (original)
+++ trunk/libaudio-flac-header-perl/debian/control Sat Nov 22 07:47:51 2008
@@ -1,12 +1,12 @@
 Source: libaudio-flac-header-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5), perl (>= 5.8.4), libflac-dev (>= 1.1.2),
- libtest-pod-coverage-perl, libtest-pod-perl, quilt (>= 0.40)
+Build-Depends: debhelper (>= 7), perl (>= 5.8.4), libflac-dev (>= 1.1.2),
+ libtest-pod-coverage-perl, libtest-pod-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Niko Tyni <ntyni at debian.org>, Martín Ferrari <tincho at debian.org>,
- gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.7.3
+ gregor herrmann <gregoa at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
+Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Audio-FLAC-Header/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libaudio-flac-header-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libaudio-flac-header-perl/

Modified: trunk/libaudio-flac-header-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/debian/copyright?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/copyright (original)
+++ trunk/libaudio-flac-header-perl/debian/copyright Sat Nov 22 07:47:51 2008
@@ -1,63 +1,34 @@
-This is the Debian package for the Audio-FLAC-Header Perl module
-originally created by Ivo Marino <eim at mentors.debian.net>.
-
-Upstream source location:
-
- http://search.cpan.org/dist/Audio-FLAC-Header/
-
-The upstream authors are:
-
-  Erik Reckase <cerebusjam at hotmail.com>
-  with lots of help from Dan Sully <daniel at cpan.org> for XS code.
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Dan Sully, <daniel at cpan.org>
+Upstream-Source: http://search.cpan.org/dist/Audio-FLAC-Header/
+Upstream-Name: Audio-FLAC-Header
+Disclaimer: This copyright info was automatically extracted 
+    from the perl module. It may not be accurate, so you better 
+    check the module sources in order to ensure the module for its 
+    inclusion in Debian or for general legal information. Please, 
+    if licensing information is incorrectly generated, file a bug 
+    on dh-make-perl.
 
 Files: *
-Copyright: Pure perl code Copyright (c) 2003-2004, Erik Reckase.
-           Pure perl code Copyright (c) 2003-2007, Dan Sully & Slim Devices.
-           Pure perl code Copyright (c) 2008, Dan Sully
-           XS code Copyright (c) 2004-2007, Dan Sully & Slim Devices.
-           XS code Copyright (c) 2008, Dan Sully
+Copyright: Dan Sully, <daniel at cpan.org>
+License-Alias: Perl
 License: Artistic | GPL-1+
-  This library is free software; you can redistribute it and/or modify
-  it under the same terms as Perl itself, either Perl version 5.8.2 or,
-  at your option, any later version of Perl 5 you may have available.
-
-Files: Header.xs
-Copyright: XS code Copyright (c) 2004-2007, Dan Sully & Slim Devices.
-           XS code Copyright (c) 2008, Dan Sully
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- Chunks of this code have been borrowed and influenced from the FLAC source.
-
-Files: inc/*
-Copyright: Copyright 2002, 2003, 2004, 2005, 2006 by
-    Audrey Tang <autrijus at autrijus.org>
-    Brian Ingerson <ingy at cpan.org>
-    Adam Kennedy <adamk at cpan.org>
-License: Artistic | GPL-1+
- All rights reserved.  You can redistribute and/or modify
- this bundle under the same terms as Perl itself.
- .
- [These files are from the Module::Install module; although they lack
-  explicit copyright and license notices, it is assumed that the license
-  and copyright of that package applies to them.]
 
 Files: debian/*
-Copyright: (c) 2004-2005 Ivo Marino <eim at mentors.debian.net>
-           (c) 2008      Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-           (c) 2008      Niko Tyni <ntyni at debian.org>
-License: other
- It is assumed that all the Debian package maintainers have chosen a license compatible 
- with upstream's license.
+Copyright: 2008, Rene Mayorga <rmayorga at debian.org.sv>
+License: Artistic | GPL-1+
 
-Perl, including version 5.8.2, is distributed under your choice of the
-GNU General Public License or the Artistic License.  On Debian GNU/Linux
-systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL' and the Artistic Licence in
-`/usr/share/common-licenses/Artistic'.
+License: Artistic
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in /usr/share/common-licenses/Artistic
 
-The license of Perl itself can be found in /usr/share/doc/perl/copyright.
-
+License: GPL-1+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by 
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'

Added: trunk/libaudio-flac-header-perl/debian/libaudio-flac-header-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/debian/libaudio-flac-header-perl.docs?rev=27057&op=file
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/libaudio-flac-header-perl.docs (added)
+++ trunk/libaudio-flac-header-perl/debian/libaudio-flac-header-perl.docs Sat Nov 22 07:47:51 2008
@@ -1,0 +1,1 @@
+TODO

Modified: trunk/libaudio-flac-header-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libaudio-flac-header-perl/debian/rules?rev=27057&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/rules (original)
+++ trunk/libaudio-flac-header-perl/debian/rules Sat Nov 22 07:47:51 2008
@@ -1,70 +1,23 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# use quilt to manage patches
-include /usr/share/quilt/quilt.make
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PERL   ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP     = $(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimisation by setting noopt in
-# $DEB_BUILD_OPTIONS
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-	$(MAKE) test
+build-stamp:
+	dh build
 	touch $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) realclean
+clean:
+	dh $@
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	[ ! -d $(TMP)/usr/share/perl5 ] || \
-		rmdir --ignore-fail-on-non-empty --parents --verbose \
-		$(TMP)/usr/share/perl5
+	dh install
 	touch $@
 
-binary-indep: build install
-# We have nothing to do here for an architecture-dependent package
+binary-arch: install
+	dh $@
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs TODO
-	dh_installchangelogs Changes
-	dh_shlibdeps
-	dh_strip
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep:
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build




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