r29613 - in /trunk/libgetopt-euclid-perl/debian: changelog compat control copyright libgetopt-euclid-perl.examples patches/ patches/series patches/warnings_in_begin.patch rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Mon Jan 12 17:52:24 UTC 2009


Author: gregoa
Date: Mon Jan 12 17:52:18 2009
New Revision: 29613

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29613
Log:
* Add patch warnings_in_begin.patch to turn off an annoying warning; thanks
  to Antonio Terceiro for the bug report and the patch (closes: #511539).
  Add quilt framework and debian/README.source.
* Set Standards-Version to 3.8.0 (no further changes).
* debian/control: change my email address.
* Set debhelper compatibility level to 7; adapt
  debian/{control,compat,rules}.
* Add perl-modules (>= 5.10) as an alternative build dependency to
  libversion-perl, remove libmodule-build-perl since debhelper 7 prefers
  MakeMaker.
* debian/copyright: switch to new format.

Added:
    trunk/libgetopt-euclid-perl/debian/libgetopt-euclid-perl.examples
    trunk/libgetopt-euclid-perl/debian/patches/
    trunk/libgetopt-euclid-perl/debian/patches/series
    trunk/libgetopt-euclid-perl/debian/patches/warnings_in_begin.patch
Modified:
    trunk/libgetopt-euclid-perl/debian/changelog
    trunk/libgetopt-euclid-perl/debian/compat
    trunk/libgetopt-euclid-perl/debian/control
    trunk/libgetopt-euclid-perl/debian/copyright
    trunk/libgetopt-euclid-perl/debian/rules

Modified: trunk/libgetopt-euclid-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/changelog?rev=29613&op=diff
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/changelog (original)
+++ trunk/libgetopt-euclid-perl/debian/changelog Mon Jan 12 17:52:18 2009
@@ -2,6 +2,17 @@
 
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
+  * Add patch warnings_in_begin.patch to turn off an annoying warning; thanks
+    to Antonio Terceiro for the bug report and the patch (closes: #511539).
+    Add quilt framework and debian/README.source.
+  * Set Standards-Version to 3.8.0 (no further changes).
+  * debian/control: change my email address.
+  * Set debhelper compatibility level to 7; adapt
+    debian/{control,compat,rules}.
+  * Add perl-modules (>= 5.10) as an alternative build dependency to
+    libversion-perl, remove libmodule-build-perl since debhelper 7 prefers
+    MakeMaker.
+  * debian/copyright: switch to new format.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:43:13 +0100
 

Modified: trunk/libgetopt-euclid-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/compat?rev=29613&op=diff
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/compat (original)
+++ trunk/libgetopt-euclid-perl/debian/compat Mon Jan 12 17:52:18 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libgetopt-euclid-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/control?rev=29613&op=diff
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/control (original)
+++ trunk/libgetopt-euclid-perl/debian/control Mon Jan 12 17:52:18 2009
@@ -1,11 +1,14 @@
 Source: libgetopt-euclid-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5), libmodule-build-perl
-Build-Depends-Indep: perl (>= 5.8.0-7), libversion-perl, libtest-pod-perl, libtest-pod-coverage-perl, libsmart-comments-perl
+Build-Depends: debhelper (>= 7), quilt
+Build-Depends-Indep: perl (>= 5.8.0-7), perl-modules (>= 5.10) | libversion-perl,
+ libtest-pod-perl, libtest-pod-coverage-perl,
+ libsmart-comments-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Niko Tyni <ntyni at iki.fi>, gregor herrmann <gregor+debian at comodo.priv.at>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Niko Tyni <ntyni at iki.fi>, gregor herrmann <gregoa at debian.org>,
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Getopt-Euclid/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libgetopt-euclid-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libgetopt-euclid-perl/
@@ -13,7 +16,7 @@
 Package: libgetopt-euclid-perl
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libversion-perl
-Description:  Executable Uniform Command-Line Interface Descriptions
+Description: Executable Uniform Command-Line Interface Descriptions
  Getopt::Euclid uses your program's own documentation to create a command-line
  argument parser. This ensures that your program's documented interface and
  its actual interface always agree.

Modified: trunk/libgetopt-euclid-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/copyright?rev=29613&op=diff
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/copyright (original)
+++ trunk/libgetopt-euclid-perl/debian/copyright Mon Jan 12 17:52:18 2009
@@ -1,23 +1,29 @@
-This is the debian package for the Getopt-Euclid module.
-It was created by Niko Tyni <ntyni at iki.fi> using dh-make-perl on 
-Thu, 23 Feb 2006 21:41:26 +0200 .
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Damian Conway  <DCONWAY at cpan.org>
+Upstream-Source: http://search.cpan.org/dist/Getopt-Euclid/
+Upstream-Name: Getopt-Euclid
 
-It was downloaded from http://search.cpan.org/dist/Getopt-Euclid/
+Files: *
+Copyright: 2005, Damian Conway  <DCONWAY at cpan.org>
+License-Alias: Perl
+License: Artistic | GPL-1+
 
-Upstream author: Damian Conway <DCONWAY at cpan.org>
+Files: debian/*
+Copyright: 2006-2009, various members of the Debian Perl Group,
+ cf. debian/changelog
+License: Artistic | GPL-1+
 
-Copyright:
+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'
 
- Copyright (c) 2005, Damian Conway. All rights reserved.
-
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-
-Perl is distributed under either the Artistic licence or the GPL.
-
-The full text of the GPL is available on Debian systems in
-/usr/share/common-licenses/GPL .
-
-The full text of the Artistic Licence is available on Debian systems in
-/usr/share/common-licenses/Artistic .
-
+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/libgetopt-euclid-perl/debian/libgetopt-euclid-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/libgetopt-euclid-perl.examples?rev=29613&op=file
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/libgetopt-euclid-perl.examples (added)
+++ trunk/libgetopt-euclid-perl/debian/libgetopt-euclid-perl.examples Mon Jan 12 17:52:18 2009
@@ -1,0 +1,1 @@
+lib/Getopt/Euclid/HierDemo.pm

Added: trunk/libgetopt-euclid-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/patches/series?rev=29613&op=file
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/patches/series (added)
+++ trunk/libgetopt-euclid-perl/debian/patches/series Mon Jan 12 17:52:18 2009
@@ -1,0 +1,1 @@
+warnings_in_begin.patch

Added: trunk/libgetopt-euclid-perl/debian/patches/warnings_in_begin.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/patches/warnings_in_begin.patch?rev=29613&op=file
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/patches/warnings_in_begin.patch (added)
+++ trunk/libgetopt-euclid-perl/debian/patches/warnings_in_begin.patch Mon Jan 12 17:52:18 2009
@@ -1,0 +1,14 @@
+Author: Antonio Terceiro <terceiro at softwarelivre.org>
+Description: avoid warning in BEGIN {} sub
+Bugs: Debian: #511539, CPAN: #37182
+
+--- a/lib/Getopt/Euclid.pm
++++ b/lib/Getopt/Euclid.pm
+@@ -205,6 +205,7 @@
+ 
+     my %STD_CONSTRAINT_FOR;
+     BEGIN {
++        no warnings 'closure';
+         %STD_CONSTRAINT_FOR = (
+             'string'    => sub { 1 }, # Always okay (matcher ensures this)
+             'integer'   => sub { 1 }, # Always okay (matcher ensures this)

Modified: trunk/libgetopt-euclid-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-euclid-perl/debian/rules?rev=29613&op=diff
==============================================================================
--- trunk/libgetopt-euclid-perl/debian/rules (original)
+++ trunk/libgetopt-euclid-perl/debian/rules Mon Jan 12 17:52:18 2009
@@ -1,88 +1,34 @@
 #!/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.
-#
-# It was later modified by Jason Kohles <email at jasonkohles.com>
-# http://www.jasonkohles.com/ to support Module::Build installed modules
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-# 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
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+include /usr/share/quilt/quilt.make
 
 build: build-stamp
-build-stamp:
-	dh_testdir
+build-stamp: $(QUILT_STAMPFN)
+	dh build
+	touch $@
 
-	# Add commands to compile the package here
-	$(PERL) Build.PL installdirs=vendor
-	OPTIMIZE="-Wall -O2 -g" $(PERL) Build
+clean: unpatch
+	dh $@
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	# Add commands to clean up after the build process here
-	[ ! -f Build ] || $(PERL) Build distclean
-
-	dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	# Add commands to install the package into debian/$PACKAGE_NAME here
-	$(PERL) Build test
-	$(PERL) Build install destdir=$(TMP)
-
-	find $(TMP) -type f -name .packlist | xargs rm -f
+install: install-stamp
+install-stamp: build-stamp
+	dh install --until dh_auto_install
 	# don't install the demo module
-	$(RM) $(TMP)/usr/share/perl5/Getopt/Euclid/HierDemo.pm \
-	      $(TMP)/usr/share/man/man3/Getopt::Euclid::HierDemo.3pm
+	$(RM) -v $(TMP)/usr/share/perl5/Getopt/Euclid/HierDemo.pm \
+		$(TMP)/usr/share/man/man3/Getopt::Euclid::HierDemo.3pm
 	[ ! -d $(TMP)/usr/share/perl5/Getopt/Euclid ] \
 		|| rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5/Getopt/Euclid
-	[ ! -d $(TMP)/usr/lib/perl5/auto/Getopt/Euclid ] \
-		|| rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5/auto/Getopt/Euclid
-
-	touch install-stamp
+	dh install --remaining
+	touch $@
 
 binary-arch:
-# We have nothing to do by default.
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples lib/Getopt/Euclid/HierDemo.pm
-	dh_installdocs
-	dh_installchangelogs Changes
-	dh_perl
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep: install
+	dh $@
 
-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
+.PHONY: binary binary-arch binary-indep install clean build




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