r31214 - in /trunk/libwww-perl/debian: README.source changelog compat control copyright patches/ patches/fix_no_proxy_desc.patch patches/fix_ua_ssl_deps.patch patches/series rules
antonio-guest at users.alioth.debian.org
antonio-guest at users.alioth.debian.org
Sat Feb 28 12:35:27 UTC 2009
Author: antonio-guest
Date: Sat Feb 28 12:35:18 2009
New Revision: 31214
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31214
Log:
some patches, more notes, dh7 compatibility
Added:
trunk/libwww-perl/debian/README.source
trunk/libwww-perl/debian/patches/
trunk/libwww-perl/debian/patches/fix_no_proxy_desc.patch
trunk/libwww-perl/debian/patches/fix_ua_ssl_deps.patch
trunk/libwww-perl/debian/patches/series
Modified:
trunk/libwww-perl/debian/changelog
trunk/libwww-perl/debian/compat
trunk/libwww-perl/debian/control
trunk/libwww-perl/debian/copyright
trunk/libwww-perl/debian/rules
Added: trunk/libwww-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/README.source?rev=31214&op=file
==============================================================================
--- trunk/libwww-perl/debian/README.source (added)
+++ trunk/libwww-perl/debian/README.source Sat Feb 28 12:35:18 2009
@@ -1,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: trunk/libwww-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/changelog?rev=31214&op=diff
==============================================================================
--- trunk/libwww-perl/debian/changelog (original)
+++ trunk/libwww-perl/debian/changelog Sat Feb 28 12:35:18 2009
@@ -1,14 +1,25 @@
libwww-perl (5.825-1) UNRELEASED; urgency=low
-
- NOTICE:
- Antonio is going through the list of open bugs, let's wait with the upload,
- maybe we can close a couple of bugs :)
[ Antonio Radici ]
* New upstream release
* debian/control:
+ Adding me to the Uploaders
+ removing duplicate 'priority' and 'section' from the binary package
+ + added quilt dependency
+ + bumped dependency to debhelper 7
+ * debian/compat:
+ + bumped to 7
+ * debian/rules:
+ + refreshed with dh-make-perl --dh 7
+ + added quilt directives
+ * debian/README.source
+ + added as per Debian Policy
+ * debian/patches/fix_no_proxy_desc.patch:
+ + fix some erorrs in the description of no_proxy() on LWP::UserAgent
+ + bug already forwarded upstream (Closes: #277970)
+ * debian/patches/fix_ua_ssl_deps.patch:
+ + fix the error message when some perl modules are not installed to support HTTPS
+ + bug already forwarded upstream (Closes: #500186)
[ gregor herrmann ]
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
Modified: trunk/libwww-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/compat?rev=31214&op=diff
==============================================================================
--- trunk/libwww-perl/debian/compat (original)
+++ trunk/libwww-perl/debian/compat Sat Feb 28 12:35:18 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libwww-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/control?rev=31214&op=diff
==============================================================================
--- trunk/libwww-perl/debian/control (original)
+++ trunk/libwww-perl/debian/control Sat Feb 28 12:35:18 2009
@@ -9,7 +9,7 @@
Homepage: http://search.cpan.org/dist/libwww-perl/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libwww-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libwww-perl/
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7), quilt
Build-Depends-Indep: netbase, perl (>= 5.8.1), libdigest-md5-perl,
liburi-perl (>= 1.10), libhtml-parser-perl (>= 3.33), libcompress-zlib-perl
Modified: trunk/libwww-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/copyright?rev=31214&op=diff
==============================================================================
--- trunk/libwww-perl/debian/copyright (original)
+++ trunk/libwww-perl/debian/copyright Sat Feb 28 12:35:18 2009
@@ -1,157 +1,31 @@
-This is Debian GNU/Linux's prepackaged version of libwww-perl. This
-is a set of perl modules which provide access to the world wide web
-via HTTP and HTML tools.
-
-Original sources can be found at http://search.cpan.org/dist/libwww-perl/
-
-This package was put together by Michael Alan Dorman <mdorman at debian.org>,
-following the example of Rob Browning <osiris at cs.utexas.edu>.
-It was maintained also by John Goerzen <jgoerzen at complete.org>, Brendan O'Dea
-<bod at debian.org> and Jay Bonci <jaybonci at debian.org>.
-Current maintainer is Debian Perl Group <debian-perl at lists.debian.org>
-
-UPSTREAM AUTHORS, according to the AUTHORS file:
- Adam Newby <adam at NewsNow.co.uk>
- Albert Dvornik <bert at genscan.com>
- Alexandre Duret-Lutz <duret_g at lrde.epita.fr>
- Andreas Gustafsson <gson at araneus.fi>
- Andreas König <andreas.koenig at anima.de>
- Andreas König <koenig at mind.de>
- Andrew Pimlott <andrew at pimlott.net>
- Andy Lester <andy at petdance.com>
- Ben Coleman <bcoleman at mindspring.com>
- Benjamin Low <ben at snrc.uow.edu.au>
- Ben Low <ben at snrc.uow.edu.au>
- Ben Tilly <Ben_Tilly at trepp.com>
- Blair Zajac <blair at gps.caltech.edu>
- Blair Zajac <blair at orcaware.com>
- Bob Dalgleish
- BooK <book at netcourrier.com>
- Brad Hughes <brad at tmc.naecker.com>
- Brian J. Murrell
- Brian McCauley <B.A.McCauley at bham.ac.uk>
- Charles C. Fu <ccwf at bacchus.com>
- Charles Lane <lane at DUPHY4.Physics.Drexel.Edu>
- Chris Nandor <pudge at pobox.com>
- Christian Gilmore <cgilmore at tivoli.com>
- Chris W. Unger <cunger at cas.org>
- Craig Macdonald <craig at freeasphost.co.uk>
- Dale Couch <dcouch at training.orl.lmco.com>
- Dan Kubb <dan.kubb at onautopilot.com>
- Dave Dunkin <dave_dunkin at hotmail.com>
- Dave W. Smith <dws at postcognitive.com>
- David Coppit <david at coppit.org>
- David Dick <david_dick at iprimus.com.au>
- David D. Kilzer <ddkilzer at madison.dseg.ti.com>
- Doug MacEachern <dougm at covalent.net>
- Doug MacEachern <dougm at osf.org>
- Doug MacEachern <dougm at pobox.com>
- Edward Avis <epa98 at doc.ic.ac.uk>
- <erik at mediator.uni-c.dk>
- Gary Shea <shea at gtsdesign.com>
- Gisle Aas <aas at oslonett.no>
- Gisle Aas <aas at sn.no>
- Gisle Aas <gisle at aas.no>
- Gisle Aas <gisle at ActiveState.com>
- Graham Barr
- Gurusamy Sarathy <gsar at ActiveState.com>
- Gurusamy Sarathy <gsar at engin.umich.edu>
- Hans de Graaff <hans at degraaff.org>
- Harald Joerg <haj at oook.m.uunet.de>
- Harry Bochner <bochner at das.harvard.edu>
- Hugo <hv at crypt.compulink.co.uk>
- Ilya Zakharevich
- INOUE Yoshinari <inoue at kusm.kyoto-u.ac.jp>
- Ivan Panchenko
- Jack Shirazi
- James Tillman
- Jan Dubois <jand at ActiveState.com>
- Jared Rhine
- Jim Stern <jstern at world.northgrum.com>
- Joao Lopes <developer at st3tailor.com.br>
- John Klar <j.klar at xpedite.com>
- Johnny Lee <typo_pl at hotmail.com>
- Josh Kronengold <mneme at mcny.com>
- Josh Rai <josh at rai.name>
- Joshua Chamas <joshua at chamas.com>
- Joshua Hoblitt <jhoblitt at ifa.hawaii.edu>
- Kartik Subbarao <subbarao at computer.org>
- Keiichiro Nagano <knagano at sodan.org>
- Ken Williams <ken at mathforum.org>
- KONISHI Katsuhiro <konishi at din.or.jp>
- Lee T Lindley <Lee.Lindley at viasystems.com>
- Liam Quinn <liam at htmlhelp.com>
- Marc Hedlund <hedlund at best.com>
- Marc Langheinrich <marc at ccm.cl.nec.co.jp>
- Mark D. Anderson <mda at discerning.com>
- Marko Asplund <aspa at hip.fi>
- Mark Stosberg <markstos at cpan.org>
- Markus B Krüger <markusk at pvv.org>
- Markus Laker <mlaker at contax.co.uk>
- Martijn Koster <m.koster at nexor.co.uk>
- Martin Thurn <mthurn at northropgrumman.com>
- Matthew Eldridge <eldridge at Graphics.Stanford.EDU>
- <Matthew.van.Eerde at hbinc.com>
- Matt Sergeant <matt-news at sergeant.org>
- Michael A. Chase <mchase at ix.netcom.com>
- Michael Quaranta <quaranta at vnet.IBM.COM>
- Michael Thompson <mickey at berkeley.innomedia.com>
- Mike Schilli <schilli1 at pacbell.net>
- Moshe Kaminsky <kaminsky at math.huji.ac.il>
- Nathan Torkington <gnat at frii.com>
- Nicolai Langfeldt <janl at ifi.uio.no>
- Nicolai Langfeldt <janl at math.uio.no>
- Norton Allen <allen at huarp.harvard.edu>
- Olly Betts <olly at muscat.co.uk>
- Paul J. Schinder <schinder at leprss.gsfc.nasa.gov>
- <peterm at zeta.org.au>
- Philip GuentherDaniel Buenzli <buenzli at rzu.unizh.ch>
- Pon Hwa Lin <koala at fragment.com>
- Radoslaw Zielinski <radek at karnet.pl>
- Radu Greab <radu at netsoft.ro>
- Randal L. Schwartz <merlyn at stonehenge.com>
- Richard Chen <richard at lexitech.com>
- Robin Barker <Robin.Barker at npl.co.uk>
- Roy Fielding <fielding at beach.w3.org>
- Sander van Zoest <sander at covalent.net>
- Sean M. Burke <sburke at cpan.org>
- <shildreth at emsphone.com>
- Slaven Rezic <slaven at rezic.de>
- Steve A Fink <steve at fink.com>
- Steve Hay <steve.hay at uk.radan.com>
- Steven Butler <stevenb at kjross.com.au>
- <Steve_Kilbane at cegelecproj.co.uk>
- Takanori Ugai <ugai at jp.fujitsu.com>
- Thomas Lotterer <thl at dev.de.cw.com>
- Tim Bunce
- Tom Hughes <thh at cyberscience.com>
- Tony Finch <fanf at demon.net>
- Ville Skyttä <ville.skytta at iki.fi>
- Ward Vandewege <ward at pong.be>
- William York <william at mathworks.com>
- Yale Huang <yale at sdf-eu.org>
- Yitzchak Scott-Thoennes <sthoenna at efn.org>
-
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Gisle Aas <gisle at activestate.com>
+Upstream-Source: http://search.cpan.org/dist/libwww-perl/
+Upstream-Name: libwww-perl
Files: *
-Copyright: © 1995-2009 Gisle Aas. All rights reserved.
- © 1995 Martijn Koster. All rights reserved.
-License: GPL-1+ | Artistic
- This library is free software; you can redistribute it and/or modify it under
- the same terms as Perl itself.
+Copyright:
+ (c) 1995-2009, Gisle Aas <gisle at activestate.com>
+ (c) 1995, Martijn Koster
+License-Alias: Perl
+License: Artistic | GPL-1+
Files: debian/*
-Copyright: © 2007 MartÃn Ferrari <martin.ferrari at gmail.com>
- © 2007-2008 gregor herrmann <gregoa at debian.org>
- © 2004-2006 Jay Bonci <jaybonci at debian.org>
- © 2002 Brendan O'Dea <bod at debian.org>
- © 1999 John Goerzen <jgoerzen at complete.org>
- © 1996-2004 Michael Alan Dorman <mdorman at debian.org>
-License: other
- It is being assumed that all maintainers did choose a license compatible with
- the license used by upstream
+Copyright: various members of the Debian Perl Group
+ (cf debian/changelog)
+License: Artistic | GPL-1+
-Perl is distributed under your choice of the GNU General Public License or the
-Artistic License. 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'.
+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'
+
+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'
Added: trunk/libwww-perl/debian/patches/fix_no_proxy_desc.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/patches/fix_no_proxy_desc.patch?rev=31214&op=file
==============================================================================
--- trunk/libwww-perl/debian/patches/fix_no_proxy_desc.patch (added)
+++ trunk/libwww-perl/debian/patches/fix_no_proxy_desc.patch Sat Feb 28 12:35:18 2009
@@ -1,0 +1,19 @@
+fix a description for the no_proxy() function
+the bug was forwarded upstream:
+https://rt.cpan.org/Ticket/Display.html?id=43728
+Index: libwww-perl/lib/LWP/UserAgent.pm
+===================================================================
+--- libwww-perl.orig/lib/LWP/UserAgent.pm 2009-02-28 10:57:05.000000000 +0000
++++ libwww-perl/lib/LWP/UserAgent.pm 2009-02-28 10:59:28.000000000 +0000
+@@ -1282,9 +1282,9 @@
+ =item $ua->no_proxy( $domain, ... )
+
+ Do not proxy requests to the given domains. Calling no_proxy without
+-any domains clears the list of domains. Eg:
++any domains clears the list of domains. E.g.:
+
+- $ua->no_proxy('localhost', 'no', ...);
++ $ua->no_proxy('localhost', ...);
+
+ =item $ua->env_proxy
+
Added: trunk/libwww-perl/debian/patches/fix_ua_ssl_deps.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/patches/fix_ua_ssl_deps.patch?rev=31214&op=file
==============================================================================
--- trunk/libwww-perl/debian/patches/fix_ua_ssl_deps.patch (added)
+++ trunk/libwww-perl/debian/patches/fix_ua_ssl_deps.patch Sat Feb 28 12:35:18 2009
@@ -1,0 +1,20 @@
+LWP::UserAgent supports HTTPS URLs if one of the two SSL modules is installed
+the bug and this patch has already been forwarded upstream:
+https://rt.cpan.org/Ticket/Display.html?id=43729
+Index: libwww-perl/lib/LWP/UserAgent.pm
+===================================================================
+--- libwww-perl.orig/lib/LWP/UserAgent.pm 2009-02-28 11:29:21.000000000 +0000
++++ libwww-perl/lib/LWP/UserAgent.pm 2009-02-28 11:30:05.000000000 +0000
+@@ -157,10 +157,10 @@
+ $@ =~ s/ at .* line \d+.*//s; # remove file/line number
+ $response = _new_response($request, &HTTP::Status::RC_NOT_IMPLEMENTED, $@);
+ if ($scheme eq "https") {
+- $response->message($response->message . " (Crypt::SSLeay not installed)");
++ $response->message($response->message . " (Crypt::SSLeay and IO::Socket::SSL not installed)");
+ $response->content_type("text/plain");
+ $response->content(<<EOT);
+-LWP will support https URLs if the Crypt::SSLeay module is installed.
++LWP will support https URLs if either Crypt::SSLeay or IO::Socket::SSL is installed.
+ More information at <http://www.linpro.no/lwp/libwww-perl/README.SSL>.
+ EOT
+ }
Added: trunk/libwww-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/patches/series?rev=31214&op=file
==============================================================================
--- trunk/libwww-perl/debian/patches/series (added)
+++ trunk/libwww-perl/debian/patches/series Sat Feb 28 12:35:18 2009
@@ -1,0 +1,2 @@
+fix_no_proxy_desc.patch
+fix_ua_ssl_deps.patch
Modified: trunk/libwww-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/rules?rev=31214&op=diff
==============================================================================
--- trunk/libwww-perl/debian/rules (original)
+++ trunk/libwww-perl/debian/rules Sat Feb 28 12:35:18 2009
@@ -1,64 +1,25 @@
#!/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.
-# 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)
+include /usr/share/quilt/quilt.make
build: build-stamp
-build-stamp:
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE)
- # Turn off the live checks
- if [ -f t/live/ENABLED ]; then rm t/live/ENABLED; fi
- if [ -f t/live/ZLIB_OK ]; then rm t/live/ZLIB_OK; fi
- $(MAKE) test
+build-stamp: $(QUILT_STAMPFN)
+ dh build
touch $@
-clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
+clean: unpatch
+ dh $@
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
+ dh install
touch $@
binary-arch:
-# We have nothing to do here for an architecture-independent package
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs README README.SSL
- dh_installchangelogs Changes
- dh_link
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep: install
+ dh $@
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
More information about the Pkg-perl-cvs-commits
mailing list