[SCM] Debian packaging of libcgi-application-extra-plugin-bundle-perl branch, master, updated. 0.4-1-g4505a63

Nicholas Bamber nicholas at periapt.co.uk
Mon Nov 7 21:38:07 UTC 2011


The following commit has been merged in the master branch:
commit 4505a63ec36e14a3eae9b9a06c9d3053ce7e6d5b
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Mon Nov 7 09:30:13 2011 +0000

    * Split out modules into separate packages
    * Raised debhelper version and compat level to 8

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index acb1697..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,49 +0,0 @@
-This package is a bundle of several upstream distributions, so it cannot
-be updated in the usual manner (using uscan, uupdate, svn-upgrade, etc.)
-
-Instead, you must check which versions have been updated using:
-  cd tarballs
-  ./check-upstream-versions
- (you must be in the tarballs directory to read packages.cfg)
-
-When new versions are detected, download them into the appropriate tarball
-directories using an appropriate tool, such as wget. Directory numbers
-refer to the build sequence, so modules in 01 arebuilt first, then 02, and
-so forth). Remove the old version (using svn rm) and add the new version
-(using svn add). Adding new packages is similar, except there is obviously
-no removal of old versions.
-
-Lastly, you must update the control metadata files. If adding new modules,
-you must corresponding data to packages.cfg or the tarball will not be
-recognized. The format of the file should be self-explanatory and should
-be updated when copyright information changes, when the upstream package
-URL changes, or when the short description should be different.
-
-By running the command:
-  cd tarballs
-  ./check-upstream-versions control
-the debian/control and debian/copyright files will be updated as needed.
-
-This means any new packages will have their names and descriptions added
-to debian/control, and the filenames and/or copyright data in d/copyright
-will be updated accordingly.
-
-==========================================================================
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored as diffs in debian/patches inside the source
-package and applied during the build.
-
-In order to patch a specific upstream distribution, the directory
-debian/patches/$(Module-Name) has to exist.
-Then run
-  export QUILT_PATCHES=patches
-  make -f debian/rules patch
-and change to the module directory in build-area/$(xx)/$(Module-Name).
-The symlink "patches" there should point to a directory in debian/patches.
-You can now use quilt as usual.
-
-Run
-  make -f debian/rules unpatch
-to remove all applied patches.
-
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 6544718..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,16 +0,0 @@
-Maybe add the following plugins? :
-
-    
-CGI-Application-Plugin-Apache 
-
-CGI-Application-Plugin-HTMLPrototype 
-
-CGI-Application-Plugin-HtmlTidy 
-   
-CGI-Application-Plugin-Phrasebook
-    
-CGI-Application-Plugin-FormValidator-Simple
-
-CGI-Application-FastCGI 
-
-
diff --git a/debian/changelog b/debian/changelog
index e062245..3ee7e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcgi-application-extra-plugin-bundle-perl (0.5) UNRELEASED; urgency=low
+
+  * Split out modules into separate packages
+  * Raised debhelper version and compat level to 8
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Sun, 06 Nov 2011 20:26:13 +0000
+
 libcgi-application-extra-plugin-bundle-perl (0.4) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index ba587f6..056be52 100644
--- a/debian/control
+++ b/debian/control
@@ -4,53 +4,13 @@ Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jaldhar H. Vyas <jaldhar at debian.org>,
  Nicholas Bamber <nicholas at periapt.co.uk>
-Build-Depends-Indep: perl, libcgi-application-perl, libtest-www-mechanize-perl,
- libcgi-application-basic-plugin-bundle-perl, libclass-inspector-perl,
- libgd-securityimage-perl, libconfig-simple-perl, libio-stringy-perl,
- libdata-javascript-perl, libtime-hires-perl, libgd-graph-perl,
- libsvg-tt-graph-perl, libhtml-template-perl, libjson-any-perl (>= 1.14),
- liburi-perl, libdigest-hmac-perl, libdigest-md5-perl, libdata-random-perl,
- libclass-accessor-perl (>= 0.25), libclass-isa-perl | perl-modules (<< 5.12),
- libtest-exception-perl, libtest-pod-perl, libtest-pod-coverage-perl,
- libdbd-sqlite3-perl
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 8)
 Standards-Version: 3.9.2
 
 Package: libcgi-application-extra-plugin-bundle-perl
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libcgi-application-perl,
- libcgi-application-basic-plugin-bundle-perl, libgd-securityimage-perl,
- libconfig-simple-perl, libio-stringy-perl, libdata-javascript-perl,
- libtime-hires-perl, libjson-any-perl (>= 1.14), liburi-perl,
- libdigest-hmac-perl, libdigest-md5-perl, libclass-inspector-perl,
- libtest-www-mechanize-perl, libdata-random-perl, libtest-exception-perl
-Recommends: libgd-graph-perl, libsvg-tt-graph-perl,
- libcgi-application-plugin-tt-perl
-Enhances: libcgi-application-perl
-Breaks: libcgi-application-plugins-perl (<= 0.10)
-Conflicts: libcgi-application-plugin-actiondispatch-perl,
- libcgi-application-plugin-captcha-perl,
- libcgi-application-plugin-config-simple-perl,
- libcgi-application-plugin-dbiprofile-perl,
- libcgi-application-plugin-json-perl,
- libcgi-application-plugin-linkintegrity-perl,
- libcgi-application-plugin-ratelimit-perl,
- libcgi-application-plugin-requiressl-perl,
- libcgi-application-plugin-formstate-perl,
- libcgi-application-plugin-protectcrsf-perl,
- libcgi-application-plugin-messagestack-perl
-Replaces: libcgi-application-plugin-actiondispatch-perl,
- libcgi-application-plugin-captcha-perl,
- libcgi-application-plugin-config-simple-perl,
- libcgi-application-plugin-dbiprofile-perl,
- libcgi-application-plugin-json-perl,
- libcgi-application-plugin-linkintegrity-perl,
- libcgi-application-plugin-ratelimit-perl,
- libcgi-application-plugin-requiressl-perl,
- libcgi-application-plugin-formstate-perl,
- libcgi-application-plugin-protectcrsf-perl,
- libcgi-application-plugin-messagestack-perl
-Provides: libcgi-application-plugin-actiondispatch-perl,
+Depends: ${misc:Depends},
+ libcgi-application-plugin-actiondispatch-perl,
  libcgi-application-plugin-captcha-perl,
  libcgi-application-plugin-config-simple-perl,
  libcgi-application-plugin-dbiprofile-perl,
@@ -63,39 +23,8 @@ Provides: libcgi-application-plugin-actiondispatch-perl,
  libcgi-application-plugin-messagestack-perl
 Suggests: libcgi-application-plugin-anytemplate-perl, libhtml-template-perl,
  libcgi-application-plugin-authorization-perl
-Description: Extra Plugins for CGI::Application
- This package includes some extra plugin modules to enhance CGI::Application.
- Currently the following modules are included:
- .
- CGI::Application::Plugin::ActionDispatch
- attribute based support for parsing the PATH_INFO of the incoming request
- .
- CGI::Application::Plugin::CAPTCHA
- Easily create, use, and verify CAPTCHAs.
- .
- CGI::Application::Plugin::Config::Simple
- Add Config::Simple support
- .
- CGI::Application::Plugin::DBIProfile
- Display DBI profiling information
- .
- CGI::Application::Plugin::JSON
- Easy manipulation of JSON headers
- .
- CGI::Application::Plugin::LinkIntegrity
- Make tamper-resisistent links
- .
- CGI::Application::Plugin::RateLimit
- limits runmode call rate per user
- .
- CGI::Application::Plugin::RequireSSL
- Force SSL in specified pages or modules
- .
- CGI::Application::Plugin::FormState
- Store Form State without Hidden Fields
- .
- CGI::Application::Plugin::ProtectCSRF
- Protects against Cross Site request forgery
- .
- CGI::Application::Plugin::MessageStack
- A Message Stack
+Description: bundle of extra CGI::Application plugins
+ This empty package exists for transition purposes and will be removed
+ once no more packages depend on it. The packages pulled in by this metapackage
+ are for historical reasons the CGI::Application Perl modules not used by
+ Titanium apart from the largest four.
diff --git a/debian/copyright b/debian/copyright
index db5fcf3..5214ec7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,132 +6,21 @@ Name: CGI Application Extra Modules Bundle
 Files: debian/*,
 Copyright:
  2006-2008, Jaldhar H. Vyas <jaldhar at debian.org>
- 2010, Nicholas Bamber <nicholas at periapt.co.uk>
+ 2010-2011, Nicholas Bamber <nicholas at periapt.co.uk>
 License: Artistic or GPL-1+
 
-Files: tarball/package.cfg, tarball/check-upstream-versions, debian/make-modules.sh, debian/rules
- 2005-2006, Florian Ragwitz <rafl at debian.org>
- 2006-2008, Jaldhar H. Vyas <jaldhar at debian.org>
- 2010, Nicholas Bamber <nicholas at periapt.co.uk>
-License: Artistic or GPL-1+
-
-Files: debian/fixcsrf.pl
- 2009-2010, Nicholas Bamber <nicholas at periapt.co.uk>
-License: Artistic or GPL-1+
-
-* CGI::Application::Plugin::ActionDispatch
-
-Author:
-	Jason Yates, <jaywhy at gmail.com>
-	Copyright (C) 2006-8 by Jason Yates
-	
-	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.7 or,
-	at your option, any later version of Perl 5 you may have available.
-
-* CGI::Application::Plugin::CAPTCHA
-
-Author:
-	Jason A Crome <cromedome at cpan.org>
-	Copyright 2005 Jason A. Crome, all rights reserved.
-	
-	This program is free software; you can redistribute it and/or modify it
-	under the same terms as Perl itself.
-
-* CGI::Application::Plugin::Config::Simple
-
-Author:
-	Michael Peters <mpeters at plusthree.com>
-	2005, Michael Peters <mpeters at plusthree.com>
-	This library is free software; you can redistribute it and/or modify it
-	under the same terms as Perl itself.
-
-* CGI::Application::Plugin::DBIProfile
-
-Author:
-	Sam Tregar <sam at tregar.com>, Joshua I Miller, <unrtst at cpan.org>
-	Copyright 2007 Joshua Miller, all rights reserved.
-	This program is free software; you can redistribute it and/or modify it
-	under the same terms as Perl itself.
-
-* CGI::Application::Plugin::JSON
-
-Author:
-	Michael Peters <mpeters at plusthree.com>
-
- Copyright 2006 Michael Peters, All Rights Reserved.
-
- This program is free software, you can redistribute it and/or modify it under
- the same terms as Perl itself.
-
-* CGI::Application::Plugin::LinkIntegrity
-
-Author:
-	Michael Graham, "<mag-perl at occamstoothbrush.com>"
-
- Copyright 2005 Michael Graham, All Rights Reserved.
-
- This program is free software, you can redistribute it and/or modify it under
- the same terms as Perl itself.
-
-* CGI::Application::Plugin::RateLimit
-
-Author:
-	Sam Tregar <sam at tregar.com>
-	2006, Sam Tregar <sam at tregar.com>
-	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.6 or,
-	at your option, any later version of Perl 5 you may have available.
-
-* CGI::Application::Plugin::RequireSSL
-
-Author:
-	Dan Horne <dan.horne at redbone.co.nz>
-	Copyright 2007, Dan Horne, all rights reserved.
-	
-	This program is free software; you can redistribute it and/or modify it
-	under the same terms as Perl itself.
-
-* CGI::Application::Plugin::FormState
-
-Author:
-	Michael Graham, <mag-perl at occamstoothbrush.com>
-
- Copyright 2005 Michael Graham, All Rights Reserved.
-
- This program is free software, you can redistribute it and/or modify it under
- the same terms as Perl itself.
-
-* CGI::Application::Plugin::ProtectCSRF
-
-Author:
-	^Akira Horimoto <kurt0027 at gmail.com>
-
- Copyright (C) 2006 - 2008 Akira Horimoto
-
- This program is free software, you can redistribute it and/or modify it under
- the same terms as Perl itself.
-
-* CGI::Application::Plugin::MessageStack
-
-Author:
-	Jason Purdy <Jason at Purdy.INFO>
-
- Copyright 2005, Jason Purdy, all rights reserved.
-
- This program is free software, you can redistribute it and/or modify it under
- the same terms as Perl itself.
-
------------------------------------------------------------------------------
-Perl is distributed under licenses:
-        
-        a) the GNU General Public License as published by the Free Software 
-           Foundation; either version 1, or (at your option) any later
-           version, or
-        
-        b) the "Artistic License" which comes with Perl.
-                              
-On Debian systems, the complete text of the GNU General Public 
-License can be found in /usr/share/common-licenses/GPL-1 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 systems, the complete text of the Artistic License can be
+ found 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 systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
diff --git a/debian/fixcsrf.pl b/debian/fixcsrf.pl
deleted file mode 100644
index d41b13b..0000000
--- a/debian/fixcsrf.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-use Carp;
-use File::Copy;
-
-# The ProtectCSRF plugin has an bug in its upstream packaging
-# which means that originally it did not build correctly.
-# This script moves things around to rectify that.
-
-my $dir = glob 'build-area/02/CGI-Application-Plugin-ProtectCSRF-*';
-mkdir "$dir/lib" or croak "could not create lib dir";
-move("$dir/CGI", "$dir/lib/CGI") or croak "could not move CGI dir";
-
-modify_file("$dir/Makefile.PL", q{FROM\s+=>\s+'CGI/}, q{FROM => 'lib/CGI/});
-modify_file("$dir/t/perlcritic.t", q{"CGI/}, q{"lib/CGI/});
-modify_file("$dir/t/pod.t", q{"CGI/}, q{"lib/CGI/});
-
-sub modify_file {
-    my ($file, $from_str, $to_str) = @_;
-    use autodie qw(close open);
-    open my $fh, "<", $file;
-    my @lines = <$fh>;
-    close $fh;
-    foreach my $line (@lines) {
-        $line =~ s{$from_str}{$to_str}xms;
-    }
-    chmod 0644, $file or croak "could not make $file writeable";
-    open $fh, ">", $file;
-    print {$fh} @lines;
-    close $fh;
-}
-
-# Copyright 2010, Nicholas Bamber <nicholas at periapt.co.uk>
-
diff --git a/debian/make-module.sh b/debian/make-module.sh
deleted file mode 100755
index f884565..0000000
--- a/debian/make-module.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PERL5LIB="$DESTDIR/usr/share/perl5/"
-ROOT=$PWD
-
-export PERL5LIB
-
-echo "=========================================================================="
-echo "Make $1"
-echo "PERL5LIB = $PERL5LIB"
-echo "DESTDIR = $DESTDIR"
-echo "=========================================================================="
-
-#--- unpacking tar.gz in proper folders
-if [ "$1" = "unpack" ]; then
-	test -d build-area || mkdir build-area
-	
-	cd tarballs
-	for dir in *
-	do
-		if [ -d $dir ]; then
-			cd $dir
-			for file in *.tar.gz
-			do
-				test -d ../../build-area/$dir || mkdir ../../build-area/$dir
-				tar -C ../../build-area/$dir -xzf $file
-			done
-			cd ..
-		fi
-	done
-	cd ..
-
-        # special hack for broken CSRF
-        # See #593102
-        perl debian/fixcsrf.pl
-fi
-
-if [ "$1" = patch -o "$1" = unpatch ]; then
-	if [ "$1" = patch ]; then
-		action=push
-	else
-		action=pop
-	fi
-	
-	for dir in build-area/*
-	do
-		[ -d $dir ] || continue
-		cd $dir
-		for module in *
-		do
-			name=$(echo $module | sed 's,-[^-]*$,,')
-			[ -d $ROOT/debian/patches/$name ] || continue
-			echo "Applying patches for $name:"
-			cd $module
-			[ -h patches ] || ln -s ../../../debian/patches/$name patches
-			QUILT_PATCHES=patches quilt --quiltrc /dev/null $action -a || test $? = 2
-			cd ..
-		done
-		cd ../..
-	done
-fi
-
-if [ "$1" = "build" ]; then
-	
-	cd build-area
-	for dir in *
-	do
-		if [ -d $dir ]; then
-			cd $dir
-			for module in *
-			do
-				cd ../..
-				set -e
-				d=build-area/$dir/$module
-				dh_auto_configure -D $d
-				dh_auto_build -D $d
-				http_proxy= dh_auto_test -D $d
-				dh_auto_install -D $d
-				set +e
-				cd build-area/$dir
-			done
-			cd ..
-		fi
-	done
-	cd ..
-fi
diff --git a/debian/patches/CGI-Application-Plugin-DBIProfile/pod.patch b/debian/patches/CGI-Application-Plugin-DBIProfile/pod.patch
deleted file mode 100644
index 6e7faed..0000000
--- a/debian/patches/CGI-Application-Plugin-DBIProfile/pod.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Last-Update: 2010-08-31
-Subject: One spelling mistake and one pod largely missing
---- CGI-Application-Plugin-DBIProfile-0.07.orig/lib/CGI/Application/Plugin/DBIProfile/Driver.pm
-+++ CGI-Application-Plugin-DBIProfile-0.07/lib/CGI/Application/Plugin/DBIProfile/Driver.pm
-@@ -2,7 +2,9 @@
- use strict;
- use IO::Scalar;
- 
--=head1 TODO: POD
-+=head1 NAME
-+
-+CGI::Application::Plugin::DBIProfile::Driver - Various utility methods
- 
- =cut
- 
---- CGI-Application-Plugin-DBIProfile-0.07.orig/lib/CGI/Application/Plugin/DBIProfile/Graph/HTML.pm
-+++ CGI-Application-Plugin-DBIProfile-0.07/lib/CGI/Application/Plugin/DBIProfile/Graph/HTML.pm
-@@ -147,7 +147,7 @@
- 
- =item mode_param
- 
--$self->mode_param - the runmode variable used to determine runmode (usefull for creating links back to ourselves).
-+$self->mode_param - the runmode variable used to determine runmode (useful for creating links back to ourselves).
- 
- =item title
- 
diff --git a/debian/patches/CGI-Application-Plugin-DBIProfile/series b/debian/patches/CGI-Application-Plugin-DBIProfile/series
deleted file mode 100644
index c9352c4..0000000
--- a/debian/patches/CGI-Application-Plugin-DBIProfile/series
+++ /dev/null
@@ -1 +0,0 @@
-pod.patch
diff --git a/debian/patches/CGI-Application-Plugin-LinkIntegrity/digest-sha.patch b/debian/patches/CGI-Application-Plugin-LinkIntegrity/digest-sha.patch
deleted file mode 100644
index 201679c..0000000
--- a/debian/patches/CGI-Application-Plugin-LinkIntegrity/digest-sha.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: use Digest::SHA instead of SHA1
- cf. http://wiki.debian.org/Teams/DebianPerlGroup/OpenTasks/Transitions/DigestSHA1ToDigestSHA
-Origin: vendor
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-08-14
-
---- a/README
-+++ b/README
-@@ -227,7 +227,7 @@
- 
-     digest_module
-         Which digest module to use to create the checksum. Typically, this
--        will be either "Digest::MD5" or "Digest::SHA1". However any module
-+        will be either "Digest::MD5" or "Digest::SHA". However any module
-         supported by "Digest::HMAC" will work.
- 
-         The default "digest_module" is "Digest::MD5".
---- a/lib/CGI/Application/Plugin/LinkIntegrity.pm
-+++ b/lib/CGI/Application/Plugin/LinkIntegrity.pm
-@@ -276,7 +276,7 @@
- =item digest_module
- 
- Which digest module to use to create the checksum.  Typically, this will
--be either C<Digest::MD5> or C<Digest::SHA1>.  However any module
-+be either C<Digest::MD5> or C<Digest::SHA>.  However any module
- supported by C<Digest::HMAC> will work.
- 
- The default C<digest_module> is C<Digest::MD5>.
---- a/t/04-hmac.t
-+++ b/t/04-hmac.t
-@@ -165,23 +165,23 @@
-         # Same test but with SHA1 (if available)
-         SKIP: {
-             eval {
--                require Digest::SHA1;
-+                require Digest::SHA;
-             };
- 
--            skip 'Digest::SHA1 not installed', 3 if $@;
-+            skip 'Digest::SHA not installed', 3 if $@;
- 
-             $secret = 'even secreter';
- 
-             $self->link_integrity_config(
-                 'secret'          => $secret,
--                'digest_module'   => 'Digest::SHA1',
-+                'digest_module'   => 'Digest::SHA',
-                 'additional_data' => 'abcde',
-             );
- 
-             $uri = '/foo/bar/baz?one=foo&two=boom';
-             $link = $self->link($uri);
- 
--            $hmac = Digest::HMAC->new($secret, 'Digest::SHA1');
-+            $hmac = Digest::HMAC->new($secret, 'Digest::SHA');
- 
-             $u = URI->new($uri, 'http');
-             $hmac->add($u->scheme     || '');
diff --git a/debian/patches/CGI-Application-Plugin-LinkIntegrity/pod.patch b/debian/patches/CGI-Application-Plugin-LinkIntegrity/pod.patch
deleted file mode 100644
index dfbf11c..0000000
--- a/debian/patches/CGI-Application-Plugin-LinkIntegrity/pod.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Subject: Spelling mistake
-Last-Update: 2010-08-31
-Bug: http://rt.cpan.org/Ticket/Display.html?id=60920
---- CGI-Application-Plugin-LinkIntegrity-0.06.orig/lib/CGI/Application/Plugin/LinkIntegrity.pm
-+++ CGI-Application-Plugin-LinkIntegrity-0.06/lib/CGI/Application/Plugin/LinkIntegrity.pm
-@@ -93,7 +93,7 @@
- Note that in the parameters of the call to << link >>, items enclosed in
- quotes are treated as literal parameters and barewords are treated as
- template params.  So C<'email'> is the literal string, and C<email> is
--the template paramter named email (in this case 'gordon at example.com').
-+the template parameter named email (in this case 'gordon at example.com').
- 
- =head1 DESCRIPTION
- 
diff --git a/debian/patches/CGI-Application-Plugin-LinkIntegrity/series b/debian/patches/CGI-Application-Plugin-LinkIntegrity/series
deleted file mode 100644
index 4a3ab2c..0000000
--- a/debian/patches/CGI-Application-Plugin-LinkIntegrity/series
+++ /dev/null
@@ -1,2 +0,0 @@
-pod.patch
-digest-sha.patch
diff --git a/debian/patches/CGI-Application-Plugin-ProtectCSRF/digest-sha.patch b/debian/patches/CGI-Application-Plugin-ProtectCSRF/digest-sha.patch
deleted file mode 100644
index e9f0233..0000000
--- a/debian/patches/CGI-Application-Plugin-ProtectCSRF/digest-sha.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: use Digest::SHA instead of SHA1
- cf. http://wiki.debian.org/Teams/DebianPerlGroup/OpenTasks/Transitions/DigestSHA1ToDigestSHA
-Origin: vendor
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-08-14
-
---- a/Build.PL
-+++ b/Build.PL
-@@ -11,7 +11,7 @@
-         "Attribute::Handlers"               => 0.78,
-         "CGI::Application"                  => 4.04,
-         "CGI::Application::Plugin::Session" => 1.01,
--        "Digest::SHA1"                      => 2.07,
-+        "Digest::SHA"                       => 0,
-     },
-     add_to_cleanup      => [ 'CGI-Application-Plugin-ProtectCSRF-*' ],
- );
---- a/META.yml
-+++ b/META.yml
-@@ -9,7 +9,7 @@
-   Attribute::Handlers: 0.78
-   CGI::Application: 4.04
-   CGI::Application::Plugin::Session: 1.01
--  Digest::SHA1: 2.07
-+  Digest::SHA: 0
- generated_by: Module::Build version 0.2808
- meta-spec:
-   url: http://module-build.sourceforge.net/META-spec-v1.2.html
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -12,7 +12,7 @@
-         "Attribute::Handlers"               => 0.78,
-         "CGI::Application"                  => 4.04,
-         "CGI::Application::Plugin::Session" => 1.01,
--        "Digest::SHA1"                      => 2.07,
-+        "Digest::SHA"                       => 0,
-     },
-     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
-     clean               => { FILES => 'CGI-Application-Plugin-ProtectCSRF-*' },
---- a/README
-+++ b/README
-@@ -157,7 +157,7 @@
- 
- SEE ALSO
-     Attribute::Handlers Carp CGI::Application
--    CGI::Application::Plugin::Session Digest::SHA1 Exporter HTML::TokeParser
-+    CGI::Application::Plugin::Session Digest::SHA Exporter HTML::TokeParser
- 
- AUTHOR
-     Akira Horimoto <kurt0027 at gmail.com>
---- a/lib/CGI/Application/Plugin/ProtectCSRF.pm
-+++ b/lib/CGI/Application/Plugin/ProtectCSRF.pm
-@@ -40,7 +40,7 @@
- use base qw(Exporter);
- use Carp;
- use HTML::TokeParser;
--use Digest::SHA1 qw(sha1_hex);
-+use Digest::SHA qw(sha1_hex);
- use Attribute::Handlers;
- 
- our(
-@@ -419,7 +419,7 @@
- 
- =head1 SEE ALSO
- 
--L<Attribute::Handlers> L<Carp> L<CGI::Application> L<CGI::Application::Plugin::Session> L<Digest::SHA1> L<Exporter> L<HTML::TokeParser> 
-+L<Attribute::Handlers> L<Carp> L<CGI::Application> L<CGI::Application::Plugin::Session> L<Digest::SHA> L<Exporter> L<HTML::TokeParser>
- 
- =head1 AUTHOR
- 
diff --git a/debian/patches/CGI-Application-Plugin-ProtectCSRF/series b/debian/patches/CGI-Application-Plugin-ProtectCSRF/series
deleted file mode 100644
index ba2b602..0000000
--- a/debian/patches/CGI-Application-Plugin-ProtectCSRF/series
+++ /dev/null
@@ -1 +0,0 @@
-digest-sha.patch
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 496dbaa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# This series file is just to keep lintian happy.
-# To actually manage quilt patches you need to be 
-# in the appropriate build-area subdirectory with the
-# correct options
diff --git a/debian/rules b/debian/rules
index 90fddb2..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,4 @@
 #!/usr/bin/make -f
 
-DH_VERBOSE=1
-PACKAGE = $(shell dh_listpackages)
-TMP     = $(CURDIR)/debian/$(PACKAGE)
-PERL5LIB= $(TMP)/usr/share/perl5
-
 %:
-	dh $@ --with quilt
-
-override_dh_clean:
-	dh_clean
-	rm -rf build-area
-
-override_dh_auto_configure: configure-stamp
-configure-stamp:
-	DESTDIR=$(TMP) debian/make-module.sh unpack
-	touch configure-stamp
-
-override_dh_auto_install: patch-stamp
-	DESTDIR=$(TMP) TEST_POD=1 debian/make-module.sh build
-
-patch: patch-stamp
-patch-stamp: configure-stamp
-	DESTDIR=$(TMP) debian/make-module.sh patch
-	touch patch-stamp
-
-unpatch:
-	DESTDIR=$(TMP) debian/make-module.sh unpatch
-	$(RM) patch-stamp
-
-override_dh_quilt_unpatch: unpatch
-override_dh_quilt_patch:   patch-stamp
-
-
+	dh $@
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..2a7b4ff
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# Debian Perl Group policy is that the copyright format be kept at
+# this version until the standard is finalized.
+libcgi-application-extra-plugin-bundle-perl source: out-of-date-copyright-format-uri http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
diff --git a/tarballs/01/CGI-Application-Plugin-ActionDispatch-0.98.tar.gz b/tarballs/01/CGI-Application-Plugin-ActionDispatch-0.98.tar.gz
deleted file mode 100644
index e55e99d..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-ActionDispatch-0.98.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-CAPTCHA-0.01.tar.gz b/tarballs/01/CGI-Application-Plugin-CAPTCHA-0.01.tar.gz
deleted file mode 100644
index cd6ff76..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-CAPTCHA-0.01.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-Config-Simple-1.01.tar.gz b/tarballs/01/CGI-Application-Plugin-Config-Simple-1.01.tar.gz
deleted file mode 100644
index 432ea71..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-Config-Simple-1.01.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-DBIProfile-0.07.tar.gz b/tarballs/01/CGI-Application-Plugin-DBIProfile-0.07.tar.gz
deleted file mode 100644
index b466214..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-DBIProfile-0.07.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-JSON-1.02.tar.gz b/tarballs/01/CGI-Application-Plugin-JSON-1.02.tar.gz
deleted file mode 100644
index 9a3f070..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-JSON-1.02.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-LinkIntegrity-0.06.tar.gz b/tarballs/01/CGI-Application-Plugin-LinkIntegrity-0.06.tar.gz
deleted file mode 100644
index 3bd6d36..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-LinkIntegrity-0.06.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-RateLimit-1.0.tar.gz b/tarballs/01/CGI-Application-Plugin-RateLimit-1.0.tar.gz
deleted file mode 100644
index 6594e75..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-RateLimit-1.0.tar.gz and /dev/null differ
diff --git a/tarballs/01/CGI-Application-Plugin-RequireSSL-0.04.tar.gz b/tarballs/01/CGI-Application-Plugin-RequireSSL-0.04.tar.gz
deleted file mode 100644
index 0113ed1..0000000
Binary files a/tarballs/01/CGI-Application-Plugin-RequireSSL-0.04.tar.gz and /dev/null differ
diff --git a/tarballs/02/CGI-Application-Plugin-FormState-0.12.tar.gz b/tarballs/02/CGI-Application-Plugin-FormState-0.12.tar.gz
deleted file mode 100644
index c8c6256..0000000
Binary files a/tarballs/02/CGI-Application-Plugin-FormState-0.12.tar.gz and /dev/null differ
diff --git a/tarballs/02/CGI-Application-Plugin-ProtectCSRF-1.01.tar.gz b/tarballs/02/CGI-Application-Plugin-ProtectCSRF-1.01.tar.gz
deleted file mode 100644
index 82899f6..0000000
Binary files a/tarballs/02/CGI-Application-Plugin-ProtectCSRF-1.01.tar.gz and /dev/null differ
diff --git a/tarballs/03/CGI-Application-Plugin-MessageStack-0.34.tar.gz b/tarballs/03/CGI-Application-Plugin-MessageStack-0.34.tar.gz
deleted file mode 100644
index 13e3cb1..0000000
Binary files a/tarballs/03/CGI-Application-Plugin-MessageStack-0.34.tar.gz and /dev/null differ
diff --git a/tarballs/check-upstream-versions b/tarballs/check-upstream-versions
deleted file mode 100755
index 276ca08..0000000
--- a/tarballs/check-upstream-versions
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Glob qw/:glob/;
-use File::Basename;
-use File::Copy;
-use Data::Dump qw/pp dump/;
-use LWP::Simple; 
-use List::Util qw/maxstr max/;
-use Config::General;
-use Text::SimpleTable;
-use Text::Wrap;
-
-$Text::Wrap::columns = 78;
-$Text::Wrap::separator = "\n ";
-my %indexes  = ();
-
-my %cfg = Config::General->new( -ConfigFile => 'packages.cfg' )->getall;
-
-#--- switch off buffering
-$|++;
-
-#----------------------------------------------------------------------------
-# add/update packages & numbers to debian/control file
-#----------------------------------------------------------------------------
-sub control($$) {    
-    my ($files, $config) = @_;
-    my $control = '../debian/control';
-    my $output = '';
-    my $copyright  = '../debian/copyright';
-    my $coutput = $config->{'debcopystart'}."\n";
-        
-    open( FD, '<', $control ) or die "Cannot open $control\n";
-    my @lines = <FD>;
-    close( FD );
-                        
-    for my $line (@lines) {	
-        $output .= $line;
-        if ($line =~ /Currently the following modules are included/) {
-
-            for my $file (@$files) {
-                my ($dir, $base, $version, $suffix) = 
-                    $file =~ m!(\d+)/(.+)\-([\d\.]+)(\.tar\.gz)!;
-                my $key = $base;
-                $base =~ s/\-/::/g;
-                $output .= qq{ .\n $base\n };
-                                
-                #--- get data from config file and prepare output
-                if (defined $config->{$key}->{'description'}) {
-                    $output .= 
-                        wrap("","",$config->{$key}->{'description'})."\n";
-                }
-                else {
-                    print "$key not exist in config file or has not defined 'description' section\n";					
-                    exit(1);
-                }
-                if (defined $config->{$key}->{'author'}) {
-                    $coutput .= qq{\n* $base\n};
-                    if (ref($config->{$key}->{'author'}) eq 'ARRAY') {
-                        $coutput .= qq{\nAuthors:\n};
-                        foreach  my $author (@{$config->{$key}->{'author'}}) {
-                            $coutput .= qq{\t$author\n};
-                        }
-                    }
-                    else {
-                        $coutput .= 
-                            qq{\nAuthor:\n\t$config->{$key}->{'author'}\n};
-                    }
-                }
-                else {
-                    print "$key not exist in config file or has not defined 'author' section\n";					
-                    exit(1);
-                }
-                if (defined $config->{$key}->{'copyright'}) {
-                    if (ref($config->{$key}->{'copyright'}) eq 'ARRAY') {
-                        foreach  my $copyright (@{$config->{$key}->{'copyright'}}) {
-                            $coutput .= qq{\t$copyright\n};
-                        }
-                    }
-                    else {
-                        $coutput .= "\n ".wrap("", "", $config->{$key}->{'copyright'})."\n";
-                        $coutput .= "\n ".wrap("", "", $config->{'debcopyinfo'})."\n";
-                    }
-                }
-            }
-            last;
-        }				
-    }
-    $coutput .= "\n".$config->{'debcopyright'};
-    open( FD, '>', $control.".new" ) or die "Cannot open $control.new\n";
-    print FD $output;
-    close( FD );
-    move($control.".new", $control);
-
-    open( FD, '>', $copyright ) or die "Cannot open $copyright\n";
-    print FD $coutput;
-    close( FD );
-}
-
-#----------------------------------------------------------------------------
-# check upstream versions
-#----------------------------------------------------------------------------
-sub check($$) {
-    my ($files, $config) = @_;
-    my @urls = ();
-    my %seen;
-
-    my $table = Text::SimpleTable->new([3, 'Dir'], [50, 'Module'], [10, 'Debian'], [10, 'Upstream'], [20, 'Comment']);
-
-    for my $file (@$files) {
-        my $current_version = 0;
-        my $upstream_version = 'missing';
-        my $upstream_link = "";		
-        
-        #--- check package's current version 
-        my ($dir, $base, $version, $suffix) = $file =~ m!(\d+)/(.+)\-([\d\.]+)(\.tar\.gz)!;		
-                
-        $current_version = $version;
-        #--- check if watch exist, read url	
-        if (defined $config->{$base}->{'watch'}) {
-            my $url = $config->{$base}->{'watch'};
-                        
-            #--- get "directory" part & "file" part
-            my ($u_dir, $u_file) = $url =~ m!(.+/)(.+)$!;
-                        
-            #--- now take index file with directories
-            unless (defined($indexes{$u_dir})) {
-                #--- cache result
-                print "Getting $u_dir...";
-                $indexes{$u_dir} = get($u_dir);
-                print "Done\n";
-            }
-
-            my @found = $indexes{$u_dir} =~ m!$u_file!g;
-            $upstream_version = maxstr(@found);
-            $upstream_link = qq{$u_dir/$base-$upstream_version.tar.gz}; 
-        }
-        else {
-            print "$file not exist in config file or has not defined 'watch' section\n";
-            exit(1);
-        }
-                
-        my $comment;
-        $comment = "up to date" if ($current_version == $upstream_version);
-        $comment = "newer than upstream version!" if ($current_version > $upstream_version);
-        if ($current_version < $upstream_version) {
-            $comment =  "new upstream version!";
-            push @urls,	qq{$dir $upstream_link};
-        }
-        $table->row($dir, $base, $current_version, $upstream_version, $comment);
-        $seen{$base}++;
-    }	
-
-    print $table->draw;
-    if (scalar at urls) {
-        for my $url (@urls) {
-            print $url."\n";
-        }
-    }
-    foreach my $key (keys %seen) {
-        if ($seen{$key} > 1) {
-            print qq{$key is more than once in directory!\n}; 
-        }
-    }
-}
-
-if (defined($ARGV[0])) {
-    if ($ARGV[0] eq 'control') {
-        #--- add/update packages & numbers to debian/control file
-        my @f = bsd_glob('??/*.tar.gz');
-        control( \@f, \%cfg );
-    }	
-}
-else {
-    #--- check upstream versions
-    my @f = bsd_glob('??/*.tar.gz');
-    check( \@f, \%cfg );
-}
diff --git a/tarballs/packages.cfg b/tarballs/packages.cfg
deleted file mode 100644
index 1160b5c..0000000
--- a/tarballs/packages.cfg
+++ /dev/null
@@ -1,137 +0,0 @@
-debcopystart <<EOF
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Jaldhar H. Vyas <jaldhar at debian.org>
-Source: http://svn.debian.org/viewsvn/pkg-perl/trunk/libcgi-application-extra-bundle-perl/
-Name: CGI Application Extra Modules Bundle
-
-Files: debian/*,
-Copyright:
- 2006-2008, Jaldhar H. Vyas <jaldhar at debian.org>
- 2010, Nicholas Bamber <nicholas at periapt.co.uk>
-License: Artistic or GPL-1+
-
-Files: tarball/package.cfg, tarball/check-upstream-versions, debian/make-modules.sh, debian/rules
- 2005-2006, Florian Ragwitz <rafl at debian.org>
- 2006-2008, Jaldhar H. Vyas <jaldhar at debian.org>
- 2010, Nicholas Bamber <nicholas at periapt.co.uk>
-License: Artistic or GPL-1+
-
-Files: debian/fixcsrf.pl
- 2009-2010, Nicholas Bamber <nicholas at periapt.co.uk>
-License: Artistic or GPL-1+
-EOF
-
-debcopyright <<EOF
------------------------------------------------------------------------------
-Perl is distributed under licenses:
-        
-        a) the GNU General Public License as published by the Free Software 
-           Foundation; either version 1, or (at your option) any later
-           version, or
-        
-        b) the "Artistic License" which comes with Perl.
-                              
-On Debian GNU/Linux systems, the complete text of the GNU General Public 
-License can be found in /usr/share/common-licenses/GPL-1 and the Artistic 
-Licence in /usr/share/common-licenses/Artistic.
-
-EOF
-
-debcopyinfo <<EOF
-This program is free software, you can redistribute it and/or modify it under the same terms as Perl itself.
-EOF
-
-<CGI-Application-Plugin-ActionDispatch>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-ActionDispatch-([\d\.]+)\.tar\.gz
-description attribute based support for parsing the PATH_INFO of the incoming request
-author Jason Yates, <jaywhy at gmail.com>
-copyright Copyright (C) 2006-8 by Jason Yates
-copyright 
-copyright This library is free software; you can redistribute it and/or modify 
-copyright it under the same terms as Perl itself, either Perl version 5.8.7 or,
-copyright at your option, any later version of Perl 5 you may have available.
-</CGI-Application-Plugin-ActionDispatch>
-
-<CGI-Application-Plugin-CAPTCHA>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-CAPTCHA-([\d\.]+)\.tar\.gz
-description Easily create, use, and verify CAPTCHAs.
-author Jason A Crome <cromedome at cpan.org>
-copyright Copyright 2005 Jason A. Crome, all rights reserved.
-copyright
-copyright This program is free software; you can redistribute it and/or modify it
-copyright under the same terms as Perl itself.
-</CGI-Application-Plugin-CAPTCHA>
-
-<CGI-Application-Plugin-Config-Simple>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-Config-Simple-([\d\.]+)\.tar\.gz
-description Add Config::Simple support
-author Michael Peters <mpeters at plusthree.com>
-copyright 2005, Michael Peters <mpeters at plusthree.com>
-copyright This library is free software; you can redistribute it and/or modify it
-copyright under the same terms as Perl itself.            
-</CGI-Application-Plugin-Config-Simple>
-
-<CGI-Application-Plugin-DBIProfile>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-DBIProfile-([\d\.]+)\.tar\.gz
-description Display DBI profiling information
-author Sam Tregar <sam at tregar.com>, Joshua I Miller, <unrtst at cpan.org>
-copyright Copyright 2007 Joshua Miller, all rights reserved.
-copyright This program is free software; you can redistribute it and/or modify it
-copyright under the same terms as Perl itself.
-</CGI-Application-Plugin-DBIProfile>
-        
-<CGI-Application-Plugin-JSON>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-JSON-([\d\.]+)\.tar\.gz
-description Easy manipulation of JSON headers
-author Michael Peters <mpeters at plusthree.com>
-copyright Copyright 2006 Michael Peters, All Rights Reserved.
-</CGI-Application-Plugin-JSON>
-
-<CGI-Application-Plugin-LinkIntegrity>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-LinkIntegrity-([\d\.]+)\.tar\.gz
-description Make tamper-resisistent links
-author Michael Graham, "<mag-perl at occamstoothbrush.com>"
-copyright Copyright 2005 Michael Graham, All Rights Reserved.
-</CGI-Application-Plugin-LinkIntegrity>
-
-<CGI-Application-Plugin-RateLimit>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-RateLimit-([\d\.]+)\.tar\.gz
-description limits runmode call rate per user 
-author Sam Tregar <sam at tregar.com>
-copyright 2006, Sam Tregar <sam at tregar.com>
-copyright This library is free software; you can redistribute it and/or modify
-copyright it under the same terms as Perl itself, either Perl version 5.8.6 or,
-copyright at your option, any later version of Perl 5 you may have available.
-</CGI-Application-Plugin-RateLimit>
-
-<CGI-Application-Plugin-RequireSSL>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-RequireSSL-([\d\.]+)\.tar\.gz
-description Force SSL in specified pages or modules
-author Dan Horne <dan.horne at redbone.co.nz>
-copyright Copyright 2007, Dan Horne, all rights reserved.
-copyright
-copyright This program is free software; you can redistribute it and/or modify it
-copyright under the same terms as Perl itself.
-</CGI-Application-Plugin-RequireSSL>
-
-<CGI-Application-Plugin-FormState>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-FormState-([\d\.]+)\.tar\.gz
-description Store Form State without Hidden Fields 
-author Michael Graham, <mag-perl at occamstoothbrush.com>
-copyright Copyright 2005 Michael Graham, All Rights Reserved.
-</CGI-Application-Plugin-FormState>            
-
-<CGI-Application-Plugin-ProtectCSRF>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-ProtectCSRF-([\d\.]+)\.tar\.gz
-description Protects against Cross Site request forgery
-author ^Akira Horimoto <kurt0027 at gmail.com>
-copyright Copyright (C) 2006 - 2008 Akira Horimoto
-</CGI-Application-Plugin-MessageStack>
-
-<CGI-Application-Plugin-MessageStack>
-watch http://search.cpan.org/CPAN/modules/by-module/CGI/CGI-Application-Plugin-MessageStack-([\d\.]+)\.tar\.gz
-description A Message Stack
-author Jason Purdy <Jason at Purdy.INFO>
-copyright Copyright 2005, Jason Purdy, all rights reserved.
-</CGI-Application-Plugin-MessageStack>
-

-- 
Debian packaging of libcgi-application-extra-plugin-bundle-perl



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