r13618 - in /trunk/libwww-curl-perl: Makefile.PL debian/changelog debian/control debian/patches/ debian/patches/Makefile.PL.patch debian/patches/series debian/rules
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sat Jan 26 18:08:21 UTC 2008
Author: gregoa-guest
Date: Sat Jan 26 18:08:20 2008
New Revision: 13618
URL: http://svn.debian.org/wsvn/?sc=1&rev=13618
Log:
Split Niko's changes on Makefile.PL into Makefile.PL.patch and add quilt
framework.
Added:
trunk/libwww-curl-perl/debian/patches/
trunk/libwww-curl-perl/debian/patches/Makefile.PL.patch
trunk/libwww-curl-perl/debian/patches/series
Modified:
trunk/libwww-curl-perl/Makefile.PL
trunk/libwww-curl-perl/debian/changelog
trunk/libwww-curl-perl/debian/control
trunk/libwww-curl-perl/debian/rules
Modified: trunk/libwww-curl-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libwww-curl-perl/Makefile.PL?rev=13618&op=diff
==============================================================================
--- trunk/libwww-curl-perl/Makefile.PL (original)
+++ trunk/libwww-curl-perl/Makefile.PL Sat Jan 26 18:08:20 2008
@@ -30,7 +30,7 @@
# Get curl to tell us where it is, if we can
#
my $cflags = `curl-config --cflags`;
-my $lflags = '-lcurl';
+my $lflags = `curl-config --libs`;
if ($lflags !~ m/curl/i) {
# curl7.8 doesn't include itself in the link flags
@@ -178,16 +178,15 @@
open(EASY_PM, ">lib/WWW/Curl/Easy.pm") or die "Can't create lib/WWW/Curl/Easy.pm\n";
open(EASY_PM_IN, "Easy.pm.in") or die "Can't read Easy.pm.in\n";
while (my $line = <EASY_PM_IN>) {
- if ($line !~ m/^(\s*)\@CURLOPT_INCLUDE\@/) {
+ if ($line !~ m/^\@CURLOPT_INCLUDE\@/) {
print EASY_PM $line;
} else {
- my $indent = $1;
foreach my $option (sort keys %cinit_types) {
next unless $option; # an empty CURLOPT_
- print EASY_PM $indent . "CURLOPT_$option\n";
+ print EASY_PM "CURLOPT_$option\n";
}
foreach my $option (sort @curlinfo) {
- print EASY_PM $indent . $option . "\n";
+ print EASY_PM $option . "\n";
}
}
}
Modified: trunk/libwww-curl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libwww-curl-perl/debian/changelog?rev=13618&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/changelog (original)
+++ trunk/libwww-curl-perl/debian/changelog Sat Jan 26 18:08:20 2008
@@ -17,6 +17,8 @@
- use $@ for touching -stamp files
- add note why tests are not enabled (need local webserver and ssl
certificates)
+ * Split Niko's changes on Makefile.PL into Makefile.PL.patch and add quilt
+ framework.
[ Frank Lichtenheld ]
* debian/rules: Cleanup:
@@ -24,7 +26,7 @@
+ fix dependency of build-stamp on configure-stamp
+ reorder clean target
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 26 Jan 2008 18:55:36 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 26 Jan 2008 19:05:42 +0100
libwww-curl-perl (3.02-2) unstable; urgency=low
Modified: trunk/libwww-curl-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libwww-curl-perl/debian/control?rev=13618&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/control (original)
+++ trunk/libwww-curl-perl/debian/control Sat Jan 26 18:08:20 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Michael Zehrer <zehrer at zepan.org>, Joachim Breitner <nomeata at debian.org>, Niko Tyni <ntyni at iki.fi>
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0-19), libcurl3-openssl-dev
+Build-Depends: debhelper (>= 6), perl (>= 5.8.0-19), libcurl3-openssl-dev, quilt
Standards-Version: 3.7.3
Homepage: http://curl.haxx.se/libcurl/perl/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libwww-curl-perl/
Added: trunk/libwww-curl-perl/debian/patches/Makefile.PL.patch
URL: http://svn.debian.org/wsvn/trunk/libwww-curl-perl/debian/patches/Makefile.PL.patch?rev=13618&op=file
==============================================================================
--- trunk/libwww-curl-perl/debian/patches/Makefile.PL.patch (added)
+++ trunk/libwww-curl-perl/debian/patches/Makefile.PL.patch Sat Jan 26 18:08:20 2008
@@ -1,0 +1,31 @@
+--- libwww-curl-perl.orig/Makefile.PL
++++ libwww-curl-perl/Makefile.PL
+@@ -30,7 +30,7 @@
+ # Get curl to tell us where it is, if we can
+ #
+ my $cflags = `curl-config --cflags`;
+-my $lflags = `curl-config --libs`;
++my $lflags = '-lcurl';
+
+ if ($lflags !~ m/curl/i) {
+ # curl7.8 doesn't include itself in the link flags
+@@ -178,15 +178,16 @@
+ open(EASY_PM, ">lib/WWW/Curl/Easy.pm") or die "Can't create lib/WWW/Curl/Easy.pm\n";
+ open(EASY_PM_IN, "Easy.pm.in") or die "Can't read Easy.pm.in\n";
+ while (my $line = <EASY_PM_IN>) {
+- if ($line !~ m/^\@CURLOPT_INCLUDE\@/) {
++ if ($line !~ m/^(\s*)\@CURLOPT_INCLUDE\@/) {
+ print EASY_PM $line;
+ } else {
++ my $indent = $1;
+ foreach my $option (sort keys %cinit_types) {
+ next unless $option; # an empty CURLOPT_
+- print EASY_PM "CURLOPT_$option\n";
++ print EASY_PM $indent . "CURLOPT_$option\n";
+ }
+ foreach my $option (sort @curlinfo) {
+- print EASY_PM $option . "\n";
++ print EASY_PM $indent . $option . "\n";
+ }
+ }
+ }
Added: trunk/libwww-curl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libwww-curl-perl/debian/patches/series?rev=13618&op=file
==============================================================================
--- trunk/libwww-curl-perl/debian/patches/series (added)
+++ trunk/libwww-curl-perl/debian/patches/series Sat Jan 26 18:08:20 2008
@@ -1,0 +1,1 @@
+Makefile.PL.patch
Modified: trunk/libwww-curl-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libwww-curl-perl/debian/rules?rev=13618&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/rules (original)
+++ trunk/libwww-curl-perl/debian/rules Sat Jan 26 18:08:20 2008
@@ -2,6 +2,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
PACKAGE=$(shell dh_listpackages)
@@ -21,7 +23,7 @@
endif
configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
touch $@
@@ -33,7 +35,7 @@
# $(MAKE) test # would need local webserver and ssl certificates
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp install-stamp Makefile.old curlopt-constants.c lib/WWW/Curl/Easy.pm
More information about the Pkg-perl-cvs-commits
mailing list