r20820 - in /trunk/libcgi-xml-perl: ./ debian/ debian/patches/

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Jun 7 14:31:06 UTC 2008


Author: gregoa
Date: Sat Jun  7 14:31:05 2008
New Revision: 20820

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20820
Log:
* debian/watch: use dist-based URL.
* Split out the patch that fixed the module name in various places into
  fix_module_name.patch; add quilt framework.
* Set Standards-Version to 3.7.3 (no changes).
* Refresh debian/rules, no functional changes (except for the omission of
  README).
* Remove debian/libcgi-xml-perl.*, do the work from debian/rules.

Added:
    trunk/libcgi-xml-perl/debian/patches/
    trunk/libcgi-xml-perl/debian/patches/fix_module_name.patch
    trunk/libcgi-xml-perl/debian/patches/series
Removed:
    trunk/libcgi-xml-perl/debian/libcgi-xml-perl.docs
    trunk/libcgi-xml-perl/debian/libcgi-xml-perl.examples
    trunk/libcgi-xml-perl/debian/libcgi-xml-perl.install
Modified:
    trunk/libcgi-xml-perl/Changes
    trunk/libcgi-xml-perl/README
    trunk/libcgi-xml-perl/XML.pm
    trunk/libcgi-xml-perl/debian/changelog
    trunk/libcgi-xml-perl/debian/control
    trunk/libcgi-xml-perl/debian/rules
    trunk/libcgi-xml-perl/debian/watch
    trunk/libcgi-xml-perl/test.pl

Modified: trunk/libcgi-xml-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/Changes?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/Changes (original)
+++ trunk/libcgi-xml-perl/Changes Sat Jun  7 14:31:05 2008
@@ -1,4 +1,4 @@
-Revision history for Perl extension CGI::XML.
+Revision history for Perl extension XML::CGI.
 0.01  Sat Oct 17 13:14:46 1998
 	- original version; created by h2xs 1.18
 

Modified: trunk/libcgi-xml-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/README?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/README (original)
+++ trunk/libcgi-xml-perl/README Sat Jun  7 14:31:05 2008
@@ -3,10 +3,10 @@
 modify it under the same terms as Perl itself.
 
 NAME
-CGI::XML Version 0.1
+XML::CGI Version 0.1
 
 DESCRIPTION
-The CGI::XML module converts CGI.pm variables from/to XML.
+The XML::CGI module converts CGI.pm variables from/to XML.
 Feel free to contact me at eisen at pobox.com if you have 
 problems and/or suggestions.
 

Modified: trunk/libcgi-xml-perl/XML.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/XML.pm?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/XML.pm (original)
+++ trunk/libcgi-xml-perl/XML.pm Sat Jun  7 14:31:05 2008
@@ -67,12 +67,12 @@
 
 =head1 NAME
 
-CGI::XML - Perl extension for converting CGI.pm variables to/from XML
+XML::CGI - Perl extension for converting CGI.pm variables to/from XML
 
 =head1 SYNOPSIS
 
-  use CGI::XML;
-  $q = new CGI::XML;
+  use XML::CGI;
+  $q = new XML::CGI;
 
   # convert CGI.pm variables to XML
   $xml = $q->toXML;
@@ -83,19 +83,19 @@
 
 =head1 DESCRIPTION
 
-The CGI::XML module converts CGI.pm variables
+The XML::CGI module converts CGI.pm variables
 to XML and vice versa.
 
-B<CGI::XML> is a subclass of B<CGI.pm>, so it reads the CGI 
+B<XML::CGI> is a subclass of B<CGI.pm>, so it reads the CGI 
 variables just as CGI.pm would.
 
 =head1 METHODS
 
-=item $q = new CGI::XML
+=item $q = new XML::CGI
 
 =over 4
 
-creates a new instance of CGI::XML. You also have access
+creates a new instance of XML::CGI. You also have access
 to all of the methods in CGI.pm.
 
 =back
@@ -122,7 +122,7 @@
 
 =head1 NOTE
 
-B<CGI::XML> does not currently handle multiple selections
+B<XML::CGI> does not currently handle multiple selections
 passed from HTML forms. This will be added in a future release.
 
 =head1 AUTHOR

Modified: trunk/libcgi-xml-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/debian/changelog?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/debian/changelog (original)
+++ trunk/libcgi-xml-perl/debian/changelog Sat Jun  7 14:31:05 2008
@@ -3,6 +3,13 @@
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
+  * debian/watch: use dist-based URL.
+  * Split out the patch that fixed the module name in various places into
+    fix_module_name.patch; add quilt framework.
+  * Set Standards-Version to 3.7.3 (no changes).
+  * Refresh debian/rules, no functional changes (except for the omission of
+    README).
+  * Remove debian/libcgi-xml-perl.*, do the work from debian/rules.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:27:54 +0200
 

Modified: trunk/libcgi-xml-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/debian/control?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/debian/control (original)
+++ trunk/libcgi-xml-perl/debian/control Sat Jun  7 14:31:05 2008
@@ -3,12 +3,12 @@
 Priority: optional
 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.2
+Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/CGI-XML/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcgi-xml-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/
 Build-Depends-Indep:  perl, perl-modules | libcgi-perl | libcgi-pm-perl, libxml-parser-perl
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
 
 Package: libcgi-xml-perl
 Section: perl

Added: trunk/libcgi-xml-perl/debian/patches/fix_module_name.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/debian/patches/fix_module_name.patch?rev=20820&op=file
==============================================================================
--- trunk/libcgi-xml-perl/debian/patches/fix_module_name.patch (added)
+++ trunk/libcgi-xml-perl/debian/patches/fix_module_name.patch Sat Jun  7 14:31:05 2008
@@ -1,0 +1,88 @@
+Author: Ardo van Rangelrooij <ardo at debian.org>
+Description: fixes the module name in several places
+
+--- libcgi-xml-perl-0.1.orig/Changes
++++ libcgi-xml-perl-0.1/Changes
+@@ -1,4 +1,4 @@
+-Revision history for Perl extension XML::CGI.
++Revision history for Perl extension CGI::XML.
+ 0.01  Sat Oct 17 13:14:46 1998
+ 	- original version; created by h2xs 1.18
+ 
+--- libcgi-xml-perl-0.1.orig/README
++++ libcgi-xml-perl-0.1/README
+@@ -3,10 +3,10 @@
+ modify it under the same terms as Perl itself.
+ 
+ NAME
+-XML::CGI Version 0.1
++CGI::XML Version 0.1
+ 
+ DESCRIPTION
+-The XML::CGI module converts CGI.pm variables from/to XML.
++The CGI::XML module converts CGI.pm variables from/to XML.
+ Feel free to contact me at eisen at pobox.com if you have 
+ problems and/or suggestions.
+ 
+--- libcgi-xml-perl-0.1.orig/XML.pm
++++ libcgi-xml-perl-0.1/XML.pm
+@@ -67,12 +67,12 @@
+ 
+ =head1 NAME
+ 
+-XML::CGI - Perl extension for converting CGI.pm variables to/from XML
++CGI::XML - Perl extension for converting CGI.pm variables to/from XML
+ 
+ =head1 SYNOPSIS
+ 
+-  use XML::CGI;
+-  $q = new XML::CGI;
++  use CGI::XML;
++  $q = new CGI::XML;
+ 
+   # convert CGI.pm variables to XML
+   $xml = $q->toXML;
+@@ -83,19 +83,19 @@
+ 
+ =head1 DESCRIPTION
+ 
+-The XML::CGI module converts CGI.pm variables
++The CGI::XML module converts CGI.pm variables
+ to XML and vice versa.
+ 
+-B<XML::CGI> is a subclass of B<CGI.pm>, so it reads the CGI 
++B<CGI::XML> is a subclass of B<CGI.pm>, so it reads the CGI 
+ variables just as CGI.pm would.
+ 
+ =head1 METHODS
+ 
+-=item $q = new XML::CGI
++=item $q = new CGI::XML
+ 
+ =over 4
+ 
+-creates a new instance of XML::CGI. You also have access
++creates a new instance of CGI::XML. You also have access
+ to all of the methods in CGI.pm.
+ 
+ =back
+@@ -122,7 +122,7 @@
+ 
+ =head1 NOTE
+ 
+-B<XML::CGI> does not currently handle multiple selections
++B<CGI::XML> does not currently handle multiple selections
+ passed from HTML forms. This will be added in a future release.
+ 
+ =head1 AUTHOR
+--- libcgi-xml-perl-0.1.orig/test.pl
++++ libcgi-xml-perl-0.1/test.pl
+@@ -3,7 +3,7 @@
+ 
+ BEGIN { $| = 1; print "1..1\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+-use XML::CGI;
++use CGI::XML;
+ $loaded = 1;
+ print "ok 1\n";
+ 

Added: trunk/libcgi-xml-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/debian/patches/series?rev=20820&op=file
==============================================================================
--- trunk/libcgi-xml-perl/debian/patches/series (added)
+++ trunk/libcgi-xml-perl/debian/patches/series Sat Jun  7 14:31:05 2008
@@ -1,0 +1,1 @@
+fix_module_name.patch

Modified: trunk/libcgi-xml-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/debian/rules?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/debian/rules (original)
+++ trunk/libcgi-xml-perl/debian/rules Sat Jun  7 14:31:05 2008
@@ -1,61 +1,63 @@
 #!/usr/bin/make -f
-## ----------------------------------------------------------------------
-## debian/rules : package script for libcgi-xml-perl
-## ----------------------------------------------------------------------
+# 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
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-## ----------------------------------------------------------------------
-TMP_DIR		= debian/tmp
+# 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
 
-## ----------------------------------------------------------------------
-## targets
+include /usr/share/quilt/quilt.make
 
-clean:
-		dh_testdir
-		dh_testroot
-		[ ! -f Makefile ] || $(MAKE) realclean
-		dh_clean
-		rm -f build-stamp install-stamp
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-build:		build-stamp
-build-stamp:
-		dh_testdir
-		perl Makefile.PL INSTALLDIRS=vendor
-		$(MAKE) OPTIMIZE="-O2 -g -Wall"
-		$(MAKE) test
-		touch build-stamp
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+	dh_testdir
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
+	touch $@
 
-install:	install-stamp
-install-stamp:	build
-		dh_testdir
-		dh_testroot
-		dh_clean -k
-		dh_installdirs
-		$(MAKE) install PREFIX=$(CURDIR)/$(TMP_DIR)/usr
-		touch install-stamp
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp install-stamp
+	[ ! -f Makefile ] || $(MAKE) realclean
 
-binary-indep:	build install
-		dh_testdir
-		dh_testroot
-		dh_install --sourcedir=$(TMP_DIR)
-		dh_installdocs
-		dh_installexamples
-		dh_installchangelogs Changes
-		dh_compress
-		dh_fixperms
-		dh_installdeb
-		dh_perl
-		dh_gencontrol
-		dh_md5sums
-		dh_builddeb
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	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 $@
 
 binary-arch:
+# We have nothing to do here for an architecture-independent package
 
-binary:		binary-indep binary-arch
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installexamples examples/*
+	dh_installdocs
+	dh_installchangelogs Changes
+	dh_perl
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
-.PHONY:		clean build install binary-indep binary-arch binary
-
-## ----------------------------------------------------------------------
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/libcgi-xml-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/debian/watch?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/debian/watch (original)
+++ trunk/libcgi-xml-perl/debian/watch Sat Jun  7 14:31:05 2008
@@ -1,2 +1,2 @@
 version=3
-http://www.cpan.org/modules/by-module/CGI/CGI-XML-([\d\.]+)\.tar\.gz
+http://search.cpan.org/dist/CGI-XML/   .*/CGI-XML-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)

Modified: trunk/libcgi-xml-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-xml-perl/test.pl?rev=20820&op=diff
==============================================================================
--- trunk/libcgi-xml-perl/test.pl (original)
+++ trunk/libcgi-xml-perl/test.pl Sat Jun  7 14:31:05 2008
@@ -3,7 +3,7 @@
 
 BEGIN { $| = 1; print "1..1\n"; }
 END {print "not ok 1\n" unless $loaded;}
-use CGI::XML;
+use XML::CGI;
 $loaded = 1;
 print "ok 1\n";
 




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