r39799 - in /trunk/libhttp-response-encoding-perl/debian: changelog control patches/ patches/lwp5827.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jul 12 23:08:52 2009
New Revision: 39799

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39799
Log:
Add patch to make the module work with libwww-perl >= 5.827; add quilt
framework and adjust build and runtime dependencies (closes: #536648).

Added:
    trunk/libhttp-response-encoding-perl/debian/patches/
    trunk/libhttp-response-encoding-perl/debian/patches/lwp5827.patch
    trunk/libhttp-response-encoding-perl/debian/patches/series
Modified:
    trunk/libhttp-response-encoding-perl/debian/changelog
    trunk/libhttp-response-encoding-perl/debian/control
    trunk/libhttp-response-encoding-perl/debian/rules

Modified: trunk/libhttp-response-encoding-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-response-encoding-perl/debian/changelog?rev=39799&op=diff
==============================================================================
--- trunk/libhttp-response-encoding-perl/debian/changelog (original)
+++ trunk/libhttp-response-encoding-perl/debian/changelog Sun Jul 12 23:08:52 2009
@@ -10,6 +10,10 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
+  [ gregor herrmann ]
+  * Add patch to make the module work with libwww-perl >= 5.827; add quilt
+    framework and adjust build and runtime dependencies (closes: #536648).
+
  -- Rene Mayorga <rmayorga at debian.org>  Tue, 20 Jan 2009 01:27:35 -0600
 
 libhttp-response-encoding-perl (0.05-1) unstable; urgency=low

Modified: trunk/libhttp-response-encoding-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-response-encoding-perl/debian/control?rev=39799&op=diff
==============================================================================
--- trunk/libhttp-response-encoding-perl/debian/control (original)
+++ trunk/libhttp-response-encoding-perl/debian/control Sun Jul 12 23:08:52 2009
@@ -1,8 +1,8 @@
 Source: libhttp-response-encoding-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.6.10-12), libwww-perl, libtest-pod-perl, libtest-pod-coverage-perl
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Build-Depends-Indep: perl (>= 5.6.10-12), libwww-perl (>= 5.827), libtest-pod-perl, libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Mayorga <rmayorga at debian.org>
 Standards-Version: 3.8.0
@@ -12,7 +12,7 @@
 
 Package: libhttp-response-encoding-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libwww-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libwww-perl (>= 5.827)
 Description: encoding() methods for HTTP::Response
  HTTP::Response:Enconding adds methods to better handle encoded responses from 
  HTTP::Response

Added: trunk/libhttp-response-encoding-perl/debian/patches/lwp5827.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-response-encoding-perl/debian/patches/lwp5827.patch?rev=39799&op=file
==============================================================================
--- trunk/libhttp-response-encoding-perl/debian/patches/lwp5827.patch (added)
+++ trunk/libhttp-response-encoding-perl/debian/patches/lwp5827.patch Sun Jul 12 23:08:52 2009
@@ -1,0 +1,39 @@
+Bugs-Debian: #536648
+Bugs-CPAN: RT#47033
+Patch-Origin: https://rt.cpan.org/Ticket/Attachment/620300/315414/lwp5827.patch
+Description: adjust to libwww-perl >= 5.827
+Reviewed-By: gregor herrmann <gregoa at debian.org>
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -12,6 +12,7 @@
+     PREREQ_PM => {
+         'Encode'         => 2.00,
+         'Test::More'     => 0,
++	'HTTP::Message'  => 5.827,
+         'HTTP::Response' => 0,
+       },
+     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+--- a/lib/HTTP/Response/Encoding.pm
++++ b/lib/HTTP/Response/Encoding.pm
+@@ -5,11 +5,7 @@
+ 
+ sub HTTP::Response::charset {
+     my $self = shift;
+-    return $self->{__charset} if exists $self->{__charset};
+-    my $content_type = $self->headers->header('Content-Type');
+-    return unless $content_type;
+-    $content_type =~ /charset=([A-Za-z0-9_\-]+)/io;
+-    $self->{__charset} = $1 || undef;
++    return $self->content_charset;
+ }
+ 
+ sub HTTP::Response::encoder {
+--- a/t/01-file.t
++++ b/t/01-file.t
+@@ -55,4 +55,4 @@
+ $uri->path(File::Spec->catfile($cwd, "t", "t-null.html"));
+ my $res = $ua->get($uri);
+ die unless $res->is_success;
+-is $res->encoding, undef, "res->encoding eq undef";
++is $res->encoding, "ascii", "res->encoding is ascii";

Added: trunk/libhttp-response-encoding-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-response-encoding-perl/debian/patches/series?rev=39799&op=file
==============================================================================
--- trunk/libhttp-response-encoding-perl/debian/patches/series (added)
+++ trunk/libhttp-response-encoding-perl/debian/patches/series Sun Jul 12 23:08:52 2009
@@ -1,0 +1,1 @@
+lwp5827.patch

Modified: trunk/libhttp-response-encoding-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-response-encoding-perl/debian/rules?rev=39799&op=diff
==============================================================================
--- trunk/libhttp-response-encoding-perl/debian/rules (original)
+++ trunk/libhttp-response-encoding-perl/debian/rules Sun Jul 12 23:08:52 2009
@@ -1,23 +1,3 @@
 #!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
-	dh build
-	touch $@
-
-clean:
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch:
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
+%:
+	dh --with quilt $@