r20845 - in /trunk/libconfigreader-perl: Makefile.PL Values.pm debian/changelog debian/control debian/patches/ debian/patches/Makefile.PL.patch debian/patches/fix-pod.patch debian/patches/series debian/rules debian/watch

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Jun 7 20:20:30 UTC 2008


Author: gregoa
Date: Sat Jun  7 20:20:30 2008
New Revision: 20845

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20845
Log:
* debian/watch: use dist-based URL.
* Move patches to upstream code into debian/patches and add quilt framework.
  Add clean-patched-stamp target to debian/rules that handle the moving
  around of the module files before unpatching happens.
* Fix two more POD warnings.
* debian/rules: minor cleanup.
* Set Standards-Version to 3.7.3 (no changes).

Added:
    trunk/libconfigreader-perl/debian/patches/
    trunk/libconfigreader-perl/debian/patches/Makefile.PL.patch
    trunk/libconfigreader-perl/debian/patches/fix-pod.patch
    trunk/libconfigreader-perl/debian/patches/series
Removed:
    trunk/libconfigreader-perl/Makefile.PL
Modified:
    trunk/libconfigreader-perl/Values.pm
    trunk/libconfigreader-perl/debian/changelog
    trunk/libconfigreader-perl/debian/control
    trunk/libconfigreader-perl/debian/rules
    trunk/libconfigreader-perl/debian/watch

Modified: trunk/libconfigreader-perl/Values.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/Values.pm?rev=20845&op=diff
==============================================================================
--- trunk/libconfigreader-perl/Values.pm (original)
+++ trunk/libconfigreader-perl/Values.pm Sat Jun  7 20:20:30 2008
@@ -40,7 +40,7 @@
 
 =head1 USER METHODS
 
-=head2 C<directive($directive, [$parser, [$default, [$whence]]])>
+=head2 C<directive($directive, [$parser, [$default, [$whence]]])
 
 Defines a directive named $directive for the configuration file.  You
 may optionally specify a parsing function or method for the directive,
@@ -77,7 +77,7 @@
 }
 
 
-=head2 C<required($directive, [$parser, [$whence]])>
+=head2 C<required($directive, [$parser, [$whence]])
 
 Defines a directive which must be specified in the configuration file.
 

Modified: trunk/libconfigreader-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/changelog?rev=20845&op=diff
==============================================================================
--- trunk/libconfigreader-perl/debian/changelog (original)
+++ trunk/libconfigreader-perl/debian/changelog Sat Jun  7 20:20:30 2008
@@ -14,6 +14,15 @@
 
   [ Joachim Breitner ]
   * Removed myself from uploaders.
+
+  [ gregor herrmann ]
+  * debian/watch: use dist-based URL.
+  * Move patches to upstream code into debian/patches and add quilt framework.
+    Add clean-patched-stamp target to debian/rules that handle the moving
+    around of the module files before unpatching happens.
+  * Fix two more POD warnings.
+  * debian/rules: minor cleanup.
+  * Set Standards-Version to 3.7.3 (no changes).
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Feb 2008 20:27:11 +0000
 

Modified: trunk/libconfigreader-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/control?rev=20845&op=diff
==============================================================================
--- trunk/libconfigreader-perl/debian/control (original)
+++ trunk/libconfigreader-perl/debian/control Sat Jun  7 20:20:30 2008
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Marc Brockschmidt <marc at dch-faq.de> 
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
 Build-Depends-Indep: perl (>= 5.6.0-16)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/ConfigReader/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconfigreader-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/

Added: trunk/libconfigreader-perl/debian/patches/Makefile.PL.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/patches/Makefile.PL.patch?rev=20845&op=file
==============================================================================
--- trunk/libconfigreader-perl/debian/patches/Makefile.PL.patch (added)
+++ trunk/libconfigreader-perl/debian/patches/Makefile.PL.patch Sat Jun  7 20:20:30 2008
@@ -1,0 +1,5 @@
+--- libconfigreader-perl-0.5.orig/Makefile.PL
++++ libconfigreader-perl-0.5/Makefile.PL
+@@ -0,0 +1,2 @@
++use ExtUtils::MakeMaker;
++WriteMakefile(NAME => 'ConfigReader');

Added: trunk/libconfigreader-perl/debian/patches/fix-pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/patches/fix-pod.patch?rev=20845&op=file
==============================================================================
--- trunk/libconfigreader-perl/debian/patches/fix-pod.patch (added)
+++ trunk/libconfigreader-perl/debian/patches/fix-pod.patch Sat Jun  7 20:20:30 2008
@@ -1,0 +1,42 @@
+--- libconfigreader-perl.orig/Values.pm
++++ libconfigreader-perl/Values.pm
+@@ -40,7 +40,7 @@
+ 
+ =head1 USER METHODS
+ 
+-=head2 C<directive($directive, [$parser, [$default, [$whence]]])
++=head2 C<directive($directive, [$parser, [$default, [$whence]]])>
+ 
+ Defines a directive named $directive for the configuration file.  You
+ may optionally specify a parsing function or method for the directive,
+@@ -77,7 +77,7 @@
+ }
+ 
+ 
+-=head2 C<required($directive, [$parser, [$whence]])
++=head2 C<required($directive, [$parser, [$whence]])>
+ 
+ Defines a directive which must be specified in the configuration file.
+ 
+--- libconfigreader-perl.orig/DirectiveStyle.pm
++++ libconfigreader-perl/DirectiveStyle.pm
+@@ -30,7 +30,7 @@
+ 
+ =head1 NAME
+ 
+-ConfigReader::DirectiveStyle
++ConfigReader::DirectiveStyle - read configuration file
+ 
+ Reads a configuration file of directives and values.
+ 
+--- libconfigreader-perl.orig/Spec.pm
++++ libconfigreader-perl/Spec.pm
+@@ -28,7 +28,7 @@
+ 
+ =head1 NAME
+ 
+-ConfigReader::Spec
++ConfigReader::Spec - stores specifications of configuration directives
+ 
+ =head1 DESCRIPTION
+ 

Added: trunk/libconfigreader-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/patches/series?rev=20845&op=file
==============================================================================
--- trunk/libconfigreader-perl/debian/patches/series (added)
+++ trunk/libconfigreader-perl/debian/patches/series Sat Jun  7 20:20:30 2008
@@ -1,0 +1,2 @@
+Makefile.PL.patch
+fix-pod.patch

Modified: trunk/libconfigreader-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/rules?rev=20845&op=diff
==============================================================================
--- trunk/libconfigreader-perl/debian/rules (original)
+++ trunk/libconfigreader-perl/debian/rules Sat Jun  7 20:20:30 2008
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -9,24 +11,31 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	-mkdir $(CURDIR)/ConfigReader
 	-mv $(CURDIR)/*.pm $(CURDIR)/ConfigReader
-	
+
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 
 	touch build-stamp
 
-clean:
+clean: clean-patched-stamp unpatch
 	dh_testdir
 	dh_testroot
+
+	dh_clean build-stamp install-stamp clean-patched-stamp
+	[ ! -f Makefile ] || ( touch Makefile && $(MAKE) distclean )
+
+clean-patched-stamp:
+	dh_testdir
+
 	-mv $(CURDIR)/ConfigReader/*.pm $(CURDIR)
 	-rmdir $(CURDIR)/ConfigReader
-	[ ! -f makefile ] || $(MAKE) distclean
-	dh_clean build-stamp install-stamp
+
+	touch clean-patched-stamp
 
 install: install-stamp
 install-stamp: build-stamp
@@ -35,9 +44,9 @@
 	dh_clean -k
 
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	
+
 	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-	
+
 	touch install-stamp
 
 binary-arch: build install
@@ -58,8 +67,5 @@
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/libconfigreader-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfigreader-perl/debian/watch?rev=20845&op=diff
==============================================================================
--- trunk/libconfigreader-perl/debian/watch (original)
+++ trunk/libconfigreader-perl/debian/watch Sat Jun  7 20:20:30 2008
@@ -1,3 +1,3 @@
 # format version number, currently 3; this line is compulsory!
 version=3
-http://www.cpan.org/modules/by-module/ConfigReader/ConfigReader-([\d\.]+)\.tar\.gz
+http://search.cpan.org/dist/ConfigReader/   .*/ConfigReader-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)




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