r20349 - in /trunk/libnet-amazon-s3-perl: debian/changelog debian/control debian/patches/ debian/patches/key-named-zero.patch debian/patches/series debian/rules lib/Net/Amazon/S3/Bucket.pm

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri May 23 19:23:46 2008
New Revision: 20349

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20349
Log:
Split Joey's patch out into key-named-zero.patch; add quilt framework.

Added:
    trunk/libnet-amazon-s3-perl/debian/patches/
    trunk/libnet-amazon-s3-perl/debian/patches/key-named-zero.patch
    trunk/libnet-amazon-s3-perl/debian/patches/series
Modified:
    trunk/libnet-amazon-s3-perl/debian/changelog
    trunk/libnet-amazon-s3-perl/debian/control
    trunk/libnet-amazon-s3-perl/debian/rules
    trunk/libnet-amazon-s3-perl/lib/Net/Amazon/S3/Bucket.pm

Modified: trunk/libnet-amazon-s3-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-amazon-s3-perl/debian/changelog?rev=20349&op=diff
==============================================================================
--- trunk/libnet-amazon-s3-perl/debian/changelog (original)
+++ trunk/libnet-amazon-s3-perl/debian/changelog Fri May 23 19:23:46 2008
@@ -1,7 +1,11 @@
 libnet-amazon-s3-perl (0.44-3) unstable; urgency=low
 
+  [ Joey Hess ]
   * Allow storing a key named "0".
     (Upstream bug report: http://rt.cpan.org//Ticket/Display.html?id=35705)
+
+  [ gregor herrmann ]
+  * Split Joey's patch out into key-named-zero.patch; add quilt framework.
 
  -- Joey Hess <joeyh at debian.org>  Wed, 07 May 2008 21:05:23 -0400
 

Modified: trunk/libnet-amazon-s3-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-amazon-s3-perl/debian/control?rev=20349&op=diff
==============================================================================
--- trunk/libnet-amazon-s3-perl/debian/control (original)
+++ trunk/libnet-amazon-s3-perl/debian/control Fri May 23 19:23:46 2008
@@ -1,7 +1,7 @@
 Source: libnet-amazon-s3-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
 Build-Depends-Indep: perl (>= 5.8.0-7), libtest-pod-perl,
  libtest-pod-coverage-perl, libdigest-md5-file-perl, libxml-libxml-perl,
  libclass-accessor-perl, libdatetime-format-strptime-perl

Added: trunk/libnet-amazon-s3-perl/debian/patches/key-named-zero.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-amazon-s3-perl/debian/patches/key-named-zero.patch?rev=20349&op=file
==============================================================================
--- trunk/libnet-amazon-s3-perl/debian/patches/key-named-zero.patch (added)
+++ trunk/libnet-amazon-s3-perl/debian/patches/key-named-zero.patch Fri May 23 19:23:46 2008
@@ -1,0 +1,24 @@
+Author: Joey Hess <joeyh at debian.org>
+Description: Allow storing a key named "0".
+Upstream bug report: http://rt.cpan.org//Ticket/Display.html?id=35705
+
+--- libnet-amazon-s3-perl.orig/lib/Net/Amazon/S3/Bucket.pm
++++ libnet-amazon-s3-perl/lib/Net/Amazon/S3/Bucket.pm
+@@ -112,7 +112,7 @@
+ # returns bool
+ sub add_key {
+     my ( $self, $key, $value, $conf ) = @_;
+-    croak 'must specify key' unless $key && length $key;
++    croak 'must specify key' unless defined $key && length $key;
+ 
+     if ( $conf->{acl_short} ) {
+         $self->account->_validate_acl_short( $conf->{acl_short} );
+@@ -260,7 +260,7 @@
+ # returns bool
+ sub delete_key {
+     my ( $self, $key ) = @_;
+-    croak 'must specify key' unless $key && length $key;
++    croak 'must specify key' unless defined $key && length $key;
+     return $self->account->_send_request_expect_nothing( 'DELETE',
+         $self->_uri($key), {} );
+ }

Added: trunk/libnet-amazon-s3-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-amazon-s3-perl/debian/patches/series?rev=20349&op=file
==============================================================================
--- trunk/libnet-amazon-s3-perl/debian/patches/series (added)
+++ trunk/libnet-amazon-s3-perl/debian/patches/series Fri May 23 19:23:46 2008
@@ -1,0 +1,1 @@
+key-named-zero.patch

Modified: trunk/libnet-amazon-s3-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-amazon-s3-perl/debian/rules?rev=20349&op=diff
==============================================================================
--- trunk/libnet-amazon-s3-perl/debian/rules (original)
+++ trunk/libnet-amazon-s3-perl/debian/rules Fri May 23 19:23:46 2008
@@ -11,19 +11,21 @@
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 
+include /usr/share/quilt/quilt.make
+
 PERL   ?= /usr/bin/perl
 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp

Modified: trunk/libnet-amazon-s3-perl/lib/Net/Amazon/S3/Bucket.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-amazon-s3-perl/lib/Net/Amazon/S3/Bucket.pm?rev=20349&op=diff
==============================================================================
--- trunk/libnet-amazon-s3-perl/lib/Net/Amazon/S3/Bucket.pm (original)
+++ trunk/libnet-amazon-s3-perl/lib/Net/Amazon/S3/Bucket.pm Fri May 23 19:23:46 2008
@@ -112,7 +112,7 @@
 # returns bool
 sub add_key {
     my ( $self, $key, $value, $conf ) = @_;
-    croak 'must specify key' unless defined $key && length $key;
+    croak 'must specify key' unless $key && length $key;
 
     if ( $conf->{acl_short} ) {
         $self->account->_validate_acl_short( $conf->{acl_short} );
@@ -260,7 +260,7 @@
 # returns bool
 sub delete_key {
     my ( $self, $key ) = @_;
-    croak 'must specify key' unless defined $key && length $key;
+    croak 'must specify key' unless $key && length $key;
     return $self->account->_send_request_expect_nothing( 'DELETE',
         $self->_uri($key), {} );
 }