r58208 - in /trunk/libapache-session-wrapper-perl: Changes META.yml debian/changelog debian/compat debian/control debian/copyright debian/lintian-overrides debian/rules debian/source/ debian/source/format lib/Apache/Session/Wrapper.pm

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Fri May 21 19:31:24 UTC 2010


Author: ansgar-guest
Date: Fri May 21 19:31:14 2010
New Revision: 58208

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58208
Log:
* New upstream release.
* Refresh rules for debhelper 7.
* Add myself to Uploaders.
* Convert debian/copyright to proposed machine-readable format.
* Make build-dep on perl unversioned.
* Add perl (>= 5.10) as a preferred alternative to libmodule-build-perl.
* Use source format 3.0 (quilt).
* Bump Standards-Version to 3.8.4.

Added:
    trunk/libapache-session-wrapper-perl/debian/source/
    trunk/libapache-session-wrapper-perl/debian/source/format
Removed:
    trunk/libapache-session-wrapper-perl/debian/lintian-overrides
Modified:
    trunk/libapache-session-wrapper-perl/Changes
    trunk/libapache-session-wrapper-perl/META.yml
    trunk/libapache-session-wrapper-perl/debian/changelog
    trunk/libapache-session-wrapper-perl/debian/compat
    trunk/libapache-session-wrapper-perl/debian/control
    trunk/libapache-session-wrapper-perl/debian/copyright
    trunk/libapache-session-wrapper-perl/debian/rules
    trunk/libapache-session-wrapper-perl/lib/Apache/Session/Wrapper.pm

Modified: trunk/libapache-session-wrapper-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/Changes?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/Changes (original)
+++ trunk/libapache-session-wrapper-perl/Changes Fri May 21 19:31:14 2010
@@ -1,3 +1,14 @@
+0.34    2010-05-20
+
+- Rerelease 0.33_01 as 0.34
+
+0.33_01   2009-12-31
+
+- Fix user defined options handling and fix default of optional options.
+  See http://rt.cpan.org/Public/Bug/Display.html?id=49561.
+- Trap possibly clobbered $@.
+- New maintainer.
+
 0.33   2006-09-26
 
 - When setting up tests with Apache::Test, if the user has apache2 we

Modified: trunk/libapache-session-wrapper-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/META.yml?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/META.yml (original)
+++ trunk/libapache-session-wrapper-perl/META.yml Fri May 21 19:31:14 2010
@@ -1,27 +1,28 @@
----
-name: Apache-Session-Wrapper
-version: 0.33
-author:
-  - 'Dave Rolsky, <autarch at urth.org>'
-abstract: A simple wrapper around Apache::Session
-license: perl
-resources:
-  license: http://dev.perl.org/licenses/
+--- #YAML:1.0
+name:               Apache-Session-Wrapper
+version:            0.34
+abstract:           ~
+author:  []
+license:            unknown
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+build_requires:
+    ExtUtils::MakeMaker:  0
 requires:
-  Apache::Session: 1.81
-  Class::Container: 0
-  Exception::Class: 0
-  Params::Validate: 0.7
-  Scalar::Util: 0
-build_requires:
-  File::Spec: 0
-  File::Temp: 0
-  Module::Build: 0
-provides:
-  Apache::Session::Wrapper:
-    file: lib/Apache/Session/Wrapper.pm
-    version: 0.33
-generated_by: Module::Build version 0.2801
+    Apache::Session:   1.81
+    Class::Container:  0
+    Exception::Class:  0
+    File::Spec:        0
+    File::Temp:        0
+    Module::Build:     0
+    Params::Validate:  0.7
+    Scalar::Util:      0
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.55_02
 meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.2.html
-  version: 1.2
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: trunk/libapache-session-wrapper-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/debian/changelog?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/debian/changelog (original)
+++ trunk/libapache-session-wrapper-perl/debian/changelog Fri May 21 19:31:14 2010
@@ -1,28 +1,28 @@
-libapache-session-wrapper-perl (0.33-2) UNRELEASED; urgency=low
+libapache-session-wrapper-perl (0.34-1) unstable; urgency=low
 
   [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
-  * debian/rules: remove directory _build only if it exists.
   * debian/watch: use dist-based URL.
-  * Refresh debian/rules, no functional changes, minor improvements: don't
-    install a .packlist file, don't ignore errors of make clean.
   * Remove debian/source.lintian-overrides, not needed.
-  * Add a lintian override for a manpage warning about a long line, caused by
-    a long URL.
-  * debian/copyright: use version-independent upstream URL; copy actual
-    copyright statement from the module.
-  * Set Standards-Version to 3.8.0 (no changes).
   * debian/control: change my email address.
-  * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
-    (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:27:15 +0200
+  [ Ansgar Burchardt ]
+  * New upstream release.
+  * Refresh rules for debhelper 7.
+  * Add myself to Uploaders.
+  * Convert debian/copyright to proposed machine-readable format.
+  * Make build-dep on perl unversioned.
+  * Add perl (>= 5.10) as a preferred alternative to libmodule-build-perl.
+  * Use source format 3.0 (quilt).
+  * Bump Standards-Version to 3.8.4.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Sat, 22 May 2010 04:30:47 +0900
 
 libapache-session-wrapper-perl (0.33-1) unstable; urgency=low
 

Modified: trunk/libapache-session-wrapper-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/debian/compat?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/debian/compat (original)
+++ trunk/libapache-session-wrapper-perl/debian/compat Fri May 21 19:31:14 2010
@@ -1,1 +1,1 @@
-4
+7

Modified: trunk/libapache-session-wrapper-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/debian/control?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/debian/control (original)
+++ trunk/libapache-session-wrapper-perl/debian/control Fri May 21 19:31:14 2010
@@ -1,11 +1,13 @@
 Source: libapache-session-wrapper-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.2), libmodule-build-perl
-Build-Depends-Indep: perl (>= 5.8.0-7), libapache-session-perl (>= 1.81), libclass-container-perl, libexception-class-perl, libtest-pod-perl
+Build-Depends: debhelper (>= 7.3.7~), perl (>= 5.10) | libmodule-build-perl
+Build-Depends-Indep: perl, libapache-session-perl (>= 1.81), libclass-container-perl, libexception-class-perl, libtest-pod-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.8.0
+Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
+ gregor herrmann <gregoa at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.8.4
 Homepage: http://search.cpan.org/dist/Apache-Session-Wrapper/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libapache-session-wrapper-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libapache-session-wrapper-perl/

Modified: trunk/libapache-session-wrapper-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/debian/copyright?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/debian/copyright (original)
+++ trunk/libapache-session-wrapper-perl/debian/copyright Fri May 21 19:31:14 2010
@@ -1,24 +1,28 @@
-This is the debian package for the Apache-Session-Wrapper module.
-It was created by Krzysztof Krzyzaniak (eloy) <eloy at debian.org> on
-Sat,  4 Sep 2004 22:57:07 +0200
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Yves <yves at cpan.org>
+Source: http://search.cpan.org/dist/Apache-Session-Wrapper/
+Name: Apache-Session-Wrapper
 
-Upstream source location: http://search.cpan.org/dist/Apache-Session-Wrapper/
+Copyright: © 2003-2006, David Rolsky <autarch at urth.org>
+License: Artistic or GPL-1+
 
-Upstream author is: Dave Rolsky, <autarch at urth.org>.
+Files: debian/*
+Copyright:
+ © 2004-2006, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+ © 2006, gregor herrmann <gregoa at debian.org>
+ © 2010, Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic or GPL-1+
 
-Copyright (c) 2003-2006 David Rolsky.  All rights reserved.
-       
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
+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'
 
-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.
-  
+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' and
-    the Artistic Licence in /usr/share/common-licenses/Artistic'.
+    Public License can be found in `/usr/share/common-licenses/GPL'

Modified: trunk/libapache-session-wrapper-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/debian/rules?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/debian/rules (original)
+++ trunk/libapache-session-wrapper-perl/debian/rules Fri May 21 19:31:14 2010
@@ -1,64 +1,4 @@
 #!/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
-
-# 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
-
-PERL   ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP     = $(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(PERL) Build.PL installdirs=vendor
-	$(PERL) Build
-	$(PERL) Build test
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
-	[ ! -d _build ] || rmdir --ignore-fail-on-non-empty _build
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(PERL) Build install destdir=$(TMP) create_packlist=0
-	# lintian override for a long line with a URL.
-	dh_installdirs /usr/share/lintian/overrides/
-	install -m 644 $(CURDIR)/debian/lintian-overrides $(TMP)/usr/share/lintian/overrides/$(PACKAGE)
-	touch $@
-
-binary-arch:
-# We have nothing to do here for an architecture-independent package
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs Changes
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --buildsystem=perl_build $@

Added: trunk/libapache-session-wrapper-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/debian/source/format?rev=58208&op=file
==============================================================================
--- trunk/libapache-session-wrapper-perl/debian/source/format (added)
+++ trunk/libapache-session-wrapper-perl/debian/source/format Fri May 21 19:31:14 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: trunk/libapache-session-wrapper-perl/lib/Apache/Session/Wrapper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-session-wrapper-perl/lib/Apache/Session/Wrapper.pm?rev=58208&op=diff
==============================================================================
--- trunk/libapache-session-wrapper-perl/lib/Apache/Session/Wrapper.pm (original)
+++ trunk/libapache-session-wrapper-perl/lib/Apache/Session/Wrapper.pm Fri May 21 19:31:14 2010
@@ -4,7 +4,8 @@
 
 use vars qw($VERSION);
 
-$VERSION = '0.33';
+$VERSION = '0.34';
+$VERSION = eval $VERSION;
 
 use base qw(Class::Container);
 
@@ -311,7 +312,22 @@
     {
         for my $p ( map { @$_ } map { @$_ } values %$hash )
         {
-            $extra{$p} = { optional => 1 };
+            my $h;
+            if ( ref $p ) {
+                # we assume its a hash of names/parameter specifications
+                $h = $p;
+            } elsif (!$params{$p}) {
+                # its a new parameter defined by a scalar, default to SCALAR value
+                $h = { $p => { optional => 1, type => SCALAR } };
+            } else {
+                # its a scalar option we already know.
+                next;
+            }
+            # now expand the options
+            foreach my $name (keys %$h) {
+                next if $params{$name};
+                $extra{$p} = $h->{$name};
+            }
         }
     }
 
@@ -350,7 +366,7 @@
     my $class = shift;
     my %p = validate( @_, { name => { type => SCALAR },
                             required => { type => SCALAR | ARRAYREF, default => [ [ ] ] },
-                            optional => { type => SCALAR | ARRAYREF, default => [ [ ] ] },
+                            optional => { type => SCALAR | ARRAYREF, default => [ ] },
                           },
                     );
 
@@ -378,7 +394,7 @@
                                     },
                             name => { type => SCALAR },
                             required => { type => SCALAR | ARRAYREF, default => [ [ ] ] },
-                            optional => { type => SCALAR | ARRAYREF, default => [ [ ] ] },
+                            optional => { type => SCALAR | ARRAYREF, default => [ ]  },
                           },
                     );
 
@@ -701,7 +717,7 @@
     else
     {
         my $error =
-            $@ ? $@ : "Tying to Apache::Session::$self->{session_class_piece} failed but did not throw an exception";
+            $err ? $err : "Tying to Apache::Session::$self->{session_class_piece} failed but did not throw an exception";
         die $error;
     }
 }




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