r28218 - in /trunk/libogg-vorbis-decoder-perl: ./ debian/ debian/patches/ inc/Module/ inc/Module/Install/ t/
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Sat Dec 13 05:58:39 UTC 2008
Author: rmayorga-guest
Date: Sat Dec 13 05:58:34 2008
New Revision: 28218
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28218
Log:
* New upstream release
* debian/control
+ use debhelper version 7
+ remove quilt
+ add myself to uploaders
+ set standards-version to 3.8.0
+ mention module name at long description
* remove debian/patches - is not needed anymore
* remove README.source
* debian/rules - updated using dh-make-perl
* debian/copyright
+ using (new)format
+ updating copyright years from upstram
+ adding inc/Module/Install/* files
+ updating debian/* copyright stanza
Added:
trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.docs
trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.examples
Removed:
trunk/libogg-vorbis-decoder-perl/debian/README.source
trunk/libogg-vorbis-decoder-perl/debian/patches/
Modified:
trunk/libogg-vorbis-decoder-perl/Decoder.pm
trunk/libogg-vorbis-decoder-perl/META.yml
trunk/libogg-vorbis-decoder-perl/README
trunk/libogg-vorbis-decoder-perl/debian/changelog
trunk/libogg-vorbis-decoder-perl/debian/compat
trunk/libogg-vorbis-decoder-perl/debian/control
trunk/libogg-vorbis-decoder-perl/debian/copyright
trunk/libogg-vorbis-decoder-perl/debian/rules
trunk/libogg-vorbis-decoder-perl/inc/Module/Install.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/AutoInstall.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Base.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Can.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Compiler.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Fetch.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Include.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Makefile.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Metadata.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Win32.pm
trunk/libogg-vorbis-decoder-perl/inc/Module/Install/WriteAll.pm
trunk/libogg-vorbis-decoder-perl/t/pod-coverage.t
Modified: trunk/libogg-vorbis-decoder-perl/Decoder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/Decoder.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/Decoder.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/Decoder.pm Sat Dec 13 05:58:34 2008
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.7';
+$VERSION = '0.8';
BOOT_XS: {
# If I inherit DynaLoader then I inherit AutoLoader
@@ -178,7 +178,7 @@
=head1 COPYRIGHT
-Copyright (c) 2004-2007, Dan Sully. All Rights Reserved.
+Copyright (c) 2004-2008, Dan Sully. All Rights Reserved.
Copyright (c) 2003, Dan Pemstein. All Rights Reserved.
Modified: trunk/libogg-vorbis-decoder-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/META.yml?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/META.yml (original)
+++ trunk/libogg-vorbis-decoder-perl/META.yml Sat Dec 13 05:58:34 2008
@@ -1,13 +1,17 @@
+---
abstract: An object-oriented Ogg Vorbis to decoder
author: EMERITUS
distribution_type: module
-generated_by: Module::Install version 0.64
+generated_by: Module::Install version 0.67
license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
name: Ogg-Vorbis-Decoder
-no_index:
- directory:
+no_index:
+ directory:
- inc
- t
-requires:
+requires:
perl: 5.005
-version: 0.7
+version: 0.8
Modified: trunk/libogg-vorbis-decoder-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/README?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/README (original)
+++ trunk/libogg-vorbis-decoder-perl/README Sat Dec 13 05:58:34 2008
@@ -24,7 +24,7 @@
COPYRIGHT AND LICENCE
-Copyright (c) 2004-2007, Dan Sully. All Rights Reserved.
+Copyright (c) 2004-2008, Dan Sully. All Rights Reserved.
Copyright (c) 2003, Dan Pemstein. All Rights Reserved.
Modified: trunk/libogg-vorbis-decoder-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/changelog?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/changelog (original)
+++ trunk/libogg-vorbis-decoder-perl/debian/changelog Sat Dec 13 05:58:34 2008
@@ -1,11 +1,29 @@
-libogg-vorbis-decoder-perl (0.7-2) UNRELEASED; urgency=low
-
+libogg-vorbis-decoder-perl (0.8-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).
+
+ [ Rene Mayorga ]
+ * New upstream release
+ * debian/control
+ + use debhelper version 7
+ + remove quilt
+ + add myself to uploaders
+ + set standards-version to 3.8.0
+ + mention module name at long description
+ * remove debian/patches - is not needed anymore
+ * remove README.source
+ * debian/rules - updated using dh-make-perl
+ * debian/copyright
+ + using (new)format
+ + updating copyright years from upstram
+ + adding inc/Module/Install/* files
+ + updating debian/* copyright stanza
- -- gregor herrmann <gregoa at debian.org> Wed, 06 Aug 2008 21:34:02 -0300
+ -- Rene Mayorga <rmayorga at debian.org.sv> Fri, 12 Dec 2008 23:20:49 -0600
libogg-vorbis-decoder-perl (0.7-1) unstable; urgency=low
Modified: trunk/libogg-vorbis-decoder-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/compat?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/compat (original)
+++ trunk/libogg-vorbis-decoder-perl/debian/compat Sat Dec 13 05:58:34 2008
@@ -1,1 +1,1 @@
-6
+7
Modified: trunk/libogg-vorbis-decoder-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/control?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/control (original)
+++ trunk/libogg-vorbis-decoder-perl/debian/control Sat Dec 13 05:58:34 2008
@@ -1,11 +1,12 @@
Source: libogg-vorbis-decoder-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0-7), libvorbis-dev,
- libogg-dev, libtest-pod-coverage-perl, libtest-pod-perl, quilt
+Build-Depends: debhelper (>= 7),perl (>= 5.8.0-7), libvorbis-dev,
+ libogg-dev, libtest-pod-coverage-perl, libtest-pod-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: gregor herrmann <gregor+debian at comodo.priv.at>
-Standards-Version: 3.7.3
+Uploaders: gregor herrmann <gregor+debian at comodo.priv.at>,
+ Rene Mayorga <rmayorga at debian.org.sv>
+Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/Ogg-Vorbis-Decoder/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libogg-vorbis-decoder-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/
@@ -14,7 +15,9 @@
Architecture: any
Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Description: An object-oriented Ogg Vorbis decoder
- This module provides users with Decoder objects for Ogg Vorbis files.
+ Ogg::Vorbis::Decoder provides users with Decoder objects for Ogg
+ Vorbis files.
+ .
One can read data in PCM format from the stream, seek by raw bytes,
pcm samples, or time, and gather decoding-specific information not
provided by Ogg::Vorbis::Header. Currently, no support is provided for
Modified: trunk/libogg-vorbis-decoder-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/copyright?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/copyright (original)
+++ trunk/libogg-vorbis-decoder-perl/debian/copyright Sat Dec 13 05:58:34 2008
@@ -1,16 +1,27 @@
-This is the debian package for the Ogg-Vorbis-Decoder module.
-It was created by Ivan Kohler <ivan-debian at 420.am> using dh-make-perl and is
-now maintained by the Debian Perl Group.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Dan Sully
+Upstream-Source: http://search.cpan.org/dist/Ogg-Vorbis-Decoder/
+Upstream-Name: Ogg-Vorbis-Decoder
-Upstream source location: http://search.cpan.org/dist/Ogg-Vorbis-Decoder/
+Files: *
+Copyright: (C) 2004-2008 Dan Sully. All Rights Reserved.
+ (C) Dan Pemstein. All Rights Reserved.
+License: GPL-1+
-Copyright (c) 2004-2007, Dan Sully. All Rights Reserved.
-Copyright (c) 2003, Dan Pemstein. All Rights Reserved.
+Files: inc/Module/Install/*
+Copyright: Copyright 2002 - 2008 by Brian Ingerson, Audrey Tang and Adam Kennedy
+License: GPL-1+ | Artistic
-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.
+Files: debian/*
+Copyright: (c) 2004 Ivan Kohler <ivan-debian at 420.am>
+ (c) 2008 gregor herrmann <gregor+debian at comodo.priv.at>
+License: Artistic | GPL-1+
-The full text of the GPL is available on Debian systems in
-/usr/share/common-licenses/GPL
+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/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.docs?rev=28218&op=file
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.docs (added)
+++ trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.docs Sat Dec 13 05:58:34 2008
@@ -1,0 +1,1 @@
+TODO
Added: trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.examples?rev=28218&op=file
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.examples (added)
+++ trunk/libogg-vorbis-decoder-perl/debian/libogg-vorbis-decoder-perl.examples Sat Dec 13 05:58:34 2008
@@ -1,0 +1,1 @@
+examples/*
Modified: trunk/libogg-vorbis-decoder-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/debian/rules?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/debian/rules (original)
+++ trunk/libogg-vorbis-decoder-perl/debian/rules Sat Dec 13 05:58:34 2008
@@ -1,84 +1,23 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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
-
-include /usr/share/quilt/quilt.make
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimation 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 $@
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-arch: install
+ dh $@
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples examples/*
- dh_installchangelogs Changes
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep:
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary: binary-arch binary-indep
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: binary binary-arch binary-indep install clean build
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install.pm Sat Dec 13 05:58:34 2008
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.64';
+ $VERSION = '0.67';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/AutoInstall.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/AutoInstall.pm Sat Dec 13 05:58:34 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Base.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Base.pm Sat Dec 13 05:58:34 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.64';
+$VERSION = '0.67';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Can.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Can.pm Sat Dec 13 05:58:34 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Compiler.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Compiler.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Compiler.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Compiler.pm Sat Dec 13 05:58:34 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Fetch.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Fetch.pm Sat Dec 13 05:58:34 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Include.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Include.pm Sat Dec 13 05:58:34 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Makefile.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Makefile.pm Sat Dec 13 05:58:34 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -17,192 +17,221 @@
my %seen = ();
sub prompt {
- shift;
-
- # Infinite loop protection
- my @c = caller();
- if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
- die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
- }
-
- # In automated testing, always use defaults
- if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
- local $ENV{PERL_MM_USE_DEFAULT} = 1;
- goto &ExtUtils::MakeMaker::prompt;
- } else {
- goto &ExtUtils::MakeMaker::prompt;
- }
+ shift;
+
+ # Infinite loop protection
+ my @c = caller();
+ if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
+ die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
+ }
+
+ # In automated testing, always use defaults
+ if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+ local $ENV{PERL_MM_USE_DEFAULT} = 1;
+ goto &ExtUtils::MakeMaker::prompt;
+ } else {
+ goto &ExtUtils::MakeMaker::prompt;
+ }
}
sub makemaker_args {
- my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
+ my $self = shift;
+ my $args = ($self->{makemaker_args} ||= {});
+ %$args = ( %$args, @_ ) if @_;
+ $args;
}
# For mm args that take multiple space-seperated args,
# append an argument to the current list.
sub makemaker_append {
- my $self = shift;
- my $name = shift;
- my $args = $self->makemaker_args;
- $args->{name} = defined $args->{$name}
- ? join( ' ', $args->{name}, @_ )
- : join( ' ', @_ );
+ my $self = sShift;
+ my $name = shift;
+ my $args = $self->makemaker_args;
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
+ : join( ' ', @_ );
}
sub build_subdirs {
- my $self = shift;
- my $subdirs = $self->makemaker_args->{DIR} ||= [];
- for my $subdir (@_) {
- push @$subdirs, $subdir;
- }
+ my $self = shift;
+ my $subdirs = $self->makemaker_args->{DIR} ||= [];
+ for my $subdir (@_) {
+ push @$subdirs, $subdir;
+ }
}
sub clean_files {
- my $self = shift;
- my $clean = $self->makemaker_args->{clean} ||= {};
- %$clean = (
- %$clean,
- FILES => join(' ', grep length, $clean->{FILES}, @_),
- );
+ my $self = shift;
+ my $clean = $self->makemaker_args->{clean} ||= {};
+ %$clean = (
+ %$clean,
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
+ );
}
sub realclean_files {
- my $self = shift;
- my $realclean = $self->makemaker_args->{realclean} ||= {};
- %$realclean = (
- %$realclean,
- FILES => join(' ', grep length, $realclean->{FILES}, @_),
- );
+ my $self = shift;
+ my $realclean = $self->makemaker_args->{realclean} ||= {};
+ %$realclean = (
+ %$realclean,
+ FILES => join(' ', grep length, $realclean->{FILES}, @_),
+ );
}
sub libs {
- my $self = shift;
- my $libs = ref $_[0] ? shift : [ shift ];
- $self->makemaker_args( LIBS => $libs );
+ my $self = shift;
+ my $libs = ref $_[0] ? shift : [ shift ];
+ $self->makemaker_args( LIBS => $libs );
}
sub inc {
- my $self = shift;
- $self->makemaker_args( INC => shift );
+ my $self = shift;
+ $self->makemaker_args( INC => shift );
+}
+
+my %test_dir = ();
+
+sub _wanted_t {
+ /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1;
+}
+
+sub tests_recursive {
+ my $self = shift;
+ if ( $self->tests ) {
+ die "tests_recursive will not work if tests are already defined";
+ }
+ my $dir = shift || 't';
+ unless ( -d $dir ) {
+ die "tests_recursive dir '$dir' does not exist";
+ }
+ require File::Find;
+ %test_dir = ();
+ File::Find::find( \&_wanted_t, $dir );
+ $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
}
sub write {
- my $self = shift;
- die "&Makefile->write() takes no arguments\n" if @_;
-
- my $args = $self->makemaker_args;
- $args->{DISTNAME} = $self->name;
- $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
- $args->{VERSION} = $self->version || $self->determine_VERSION($args);
- $args->{NAME} =~ s/-/::/g;
- if ( $self->tests ) {
- $args->{test} = { TESTS => $self->tests };
- }
- if ($] >= 5.005) {
- $args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
- $args->{NO_META} = 1;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
- $args->{SIGN} = 1;
- }
- unless ( $self->is_admin ) {
- delete $args->{SIGN};
- }
-
- # merge both kinds of requires into prereq_pm
- my $prereq = ($args->{PREREQ_PM} ||= {});
- %$prereq = ( %$prereq, map { @$_ } map { @$_ } grep $_,
- ($self->build_requires, $self->requires) );
-
- # merge both kinds of requires into prereq_pm
- my $subdirs = ($args->{DIR} ||= []);
- if ($self->bundles) {
- foreach my $bundle (@{ $self->bundles }) {
- my ($file, $dir) = @$bundle;
- push @$subdirs, $dir if -d $dir;
- delete $prereq->{$file};
- }
- }
-
- if ( my $perl_version = $self->perl_version ) {
- eval "use $perl_version; 1"
- or die "ERROR: perl: Version $] is installed, "
- . "but we need version >= $perl_version";
- }
-
- my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
- if ($self->admin->preop) {
- $args{dist} = $self->admin->preop;
- }
-
- my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
- $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
+ my $self = shift;
+ die "&Makefile->write() takes no arguments\n" if @_;
+
+ my $args = $self->makemaker_args;
+ $args->{DISTNAME} = $self->name;
+ $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
+ $args->{VERSION} = $self->version || $self->determine_VERSION($args);
+ $args->{NAME} =~ s/-/::/g;
+ if ( $self->tests ) {
+ $args->{test} = { TESTS => $self->tests };
+ }
+ if ($] >= 5.005) {
+ $args->{ABSTRACT} = $self->abstract;
+ $args->{AUTHOR} = $self->author;
+ }
+ if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
+ $args->{NO_META} = 1;
+ }
+ if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
+ $args->{SIGN} = 1;
+ }
+ unless ( $self->is_admin ) {
+ delete $args->{SIGN};
+ }
+
+ # merge both kinds of requires into prereq_pm
+ my $prereq = ($args->{PREREQ_PM} ||= {});
+ %$prereq = ( %$prereq,
+ map { @$_ }
+ map { @$_ }
+ grep $_,
+ ($self->build_requires, $self->requires)
+ );
+
+ # merge both kinds of requires into prereq_pm
+ my $subdirs = ($args->{DIR} ||= []);
+ if ($self->bundles) {
+ foreach my $bundle (@{ $self->bundles }) {
+ my ($file, $dir) = @$bundle;
+ push @$subdirs, $dir if -d $dir;
+ delete $prereq->{$file};
+ }
+ }
+
+ if ( my $perl_version = $self->perl_version ) {
+ eval "use $perl_version; 1"
+ or die "ERROR: perl: Version $] is installed, "
+ . "but we need version >= $perl_version";
+ }
+
+ $args->{INSTALLDIRS} = $self->installdirs;
+
+ my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
+
+ my $user_preop = delete $args{dist}->{PREOP};
+ if (my $preop = $self->admin->preop($user_preop)) {
+ $args{dist} = $preop;
+ }
+
+ my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
+ $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
}
sub fix_up_makefile {
- my $self = shift;
- my $makefile_name = shift;
- my $top_class = ref($self->_top) || '';
- my $top_version = $self->_top->VERSION || '';
-
- my $preamble = $self->preamble
- ? "# Preamble by $top_class $top_version\n"
- . $self->preamble
- : '';
- my $postamble = "# Postamble by $top_class $top_version\n"
- . ($self->postamble || '');
-
- local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
-
- $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
- $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
- $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
- $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
- $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
- # Module::Install will never be used to build the Core Perl
- # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
- # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
- $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
- #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
- # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
- $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
-
- # XXX - This is currently unused; not sure if it breaks other MM-users
- # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- print MAKEFILE "$preamble$makefile$postamble" or die $!;
- close MAKEFILE or die $!;
-
- 1;
+ my $self = shift;
+ my $makefile_name = shift;
+ my $top_class = ref($self->_top) || '';
+ my $top_version = $self->_top->VERSION || '';
+
+ my $preamble = $self->preamble
+ ? "# Preamble by $top_class $top_version\n"
+ . $self->preamble
+ : '';
+ my $postamble = "# Postamble by $top_class $top_version\n"
+ . ($self->postamble || '');
+
+ local *MAKEFILE;
+ open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ my $makefile = do { local $/; <MAKEFILE> };
+ close MAKEFILE or die $!;
+
+ $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
+ $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
+ $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
+ $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
+ $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+
+ # Module::Install will never be used to build the Core Perl
+ # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+ # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+ $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+ #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+ # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+ $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
+
+ # XXX - This is currently unused; not sure if it breaks other MM-users
+ # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
+
+ open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ print MAKEFILE "$preamble$makefile$postamble" or die $!;
+ close MAKEFILE or die $!;
+
+ 1;
}
sub preamble {
- my ($self, $text) = @_;
- $self->{preamble} = $text . $self->{preamble} if defined $text;
- $self->{preamble};
+ my ($self, $text) = @_;
+ $self->{preamble} = $text . $self->{preamble} if defined $text;
+ $self->{preamble};
}
sub postamble {
- my ($self, $text) = @_;
- $self->{postamble} ||= $self->admin->postamble;
- $self->{postamble} .= $text if defined $text;
- $self->{postamble}
+ my ($self, $text) = @_;
+ $self->{postamble} ||= $self->admin->postamble;
+ $self->{postamble} .= $text if defined $text;
+ $self->{postamble}
}
1;
__END__
-#line 334
+#line 363
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Metadata.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Metadata.pm Sat Dec 13 05:58:34 2008
@@ -6,14 +6,14 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
my @scalar_keys = qw{
name module_name abstract author version license
- distribution_type perl_version tests
+ distribution_type perl_version tests installdirs
};
my @tuple_keys = qw{
@@ -56,9 +56,23 @@
};
}
+# configure_requires is currently a null-op
+sub configure_requires { 1 }
+
+# Aliases for build_requires that will have alternative
+# meanings in some future version of META.yml.
+sub test_requires { shift->build_requires(@_) }
+sub install_requires { shift->build_requires(@_) }
+
+# Aliases for installdirs options
+sub install_as_core { $_[0]->installdirs('perl') }
+sub install_as_cpan { $_[0]->installdirs('site') }
+sub install_as_site { $_[0]->installdirs('site') }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
sub sign {
my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and !@_;
+ return $self->{'values'}{'sign'} if defined wantarray and ! @_;
$self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
return $self;
}
@@ -279,9 +293,11 @@
if (
$self->_slurp($file) =~ m/
- =head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
- (.*?)
+ (
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyright|legal)\b
+ .*?
+ )
(=head\\d.*|=cut.*|)
\z
/ixms
@@ -289,19 +305,24 @@
{
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as perl itself' => 'perl',
- 'GNU public license' => 'gpl',
- 'GNU lesser public license' => 'gpl',
- 'BSD license' => 'bsd',
- 'Artistic license' => 'artistic',
- 'GPL' => 'gpl',
- 'LGPL' => 'lgpl',
- 'BSD' => 'bsd',
- 'Artistic' => 'artistic',
+ 'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser public license' => 'gpl', 1,
+ 'BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'proprietary' => 'proprietary', 0,
);
- while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
+ while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
+ if ( $osi and $license_text =~ /All rights reserved/i ) {
+ warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ }
$self->license($license);
return 1;
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Win32.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/Win32.pm Sat Dec 13 05:58:34 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/inc/Module/Install/WriteAll.pm?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libogg-vorbis-decoder-perl/inc/Module/Install/WriteAll.pm Sat Dec 13 05:58:34 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libogg-vorbis-decoder-perl/t/pod-coverage.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogg-vorbis-decoder-perl/t/pod-coverage.t?rev=28218&op=diff
==============================================================================
--- trunk/libogg-vorbis-decoder-perl/t/pod-coverage.t (original)
+++ trunk/libogg-vorbis-decoder-perl/t/pod-coverage.t Sat Dec 13 05:58:34 2008
@@ -1,3 +1,13 @@
-use Test::Pod::Coverage tests => 1;
+#!/usr/bin/perl
-pod_coverage_ok("Ogg::Vorbis::Decoder", "Ogg::Vorbis::Decoder is covered" );
+use Test::More;
+eval "use Test::Pod::Coverage";
+plan skip_all => "Test::Pod::Coverage required for testing pod coverage" if $@;
+
+plan tests => 1;
+
+pod_coverage_ok(
+ "Ogg::Vorbis::Decoder",
+ { also_private => ['dl_load_flags'] },
+ "Ogg::Vorbis::Decoder is covered"
+);
More information about the Pkg-perl-cvs-commits
mailing list