r9973 - in /trunk/libmail-imapclient-perl/debian: changelog control patches/ patches/catch_ssl_attribute.patch patches/series rules
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Wed Nov 28 21:45:06 UTC 2007
Author: gregoa-guest
Date: Wed Nov 28 21:45:06 2007
New Revision: 9973
URL: http://svn.debian.org/wsvn/?sc=1&rev=9973
Log:
add new patch catch_ssl_attribute.patch to catch the Ssl attribute intriduced by the now removed patch 20_ssl_support.dpatch; do some editing on the changelog
Added:
trunk/libmail-imapclient-perl/debian/patches/
trunk/libmail-imapclient-perl/debian/patches/catch_ssl_attribute.patch
trunk/libmail-imapclient-perl/debian/patches/series
Modified:
trunk/libmail-imapclient-perl/debian/changelog
trunk/libmail-imapclient-perl/debian/control
trunk/libmail-imapclient-perl/debian/rules
Modified: trunk/libmail-imapclient-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmail-imapclient-perl/debian/changelog?rev=9973&op=diff
==============================================================================
--- trunk/libmail-imapclient-perl/debian/changelog (original)
+++ trunk/libmail-imapclient-perl/debian/changelog Wed Nov 28 21:45:06 2007
@@ -1,7 +1,4 @@
libmail-imapclient-perl (3.00-1) UNRELEASED; urgency=low
-
- CHECK: removal of patch 20_ssl_support might break backward compatibility!
- (--> a patch that intercepts Ssl attribute and dies, pointing to NEWS.Debian)
[ Joey Hess ]
* Fix watch file to deal with mangled version number.
@@ -15,9 +12,9 @@
- repackaging the upstream source not needed any more, because the
non-free docs were removed; removing the note from README.Debian and
the version mangling from debian/watch.
- * Use a search.cpan.org/dist based URL in debian/watch.
+ * Use a dist-based based URL in debian/watch.
* debian/copyright:
- - add generic upstream URL
+ - add generic upstream URL.
- copy current maintainer/copyright/license statement verbatim from
README.
* Remove patch 10_get_socket_on_external, included in rewritten upstream
@@ -25,18 +22,21 @@
* Remove patch 20_ssl_support, SSL connections are now handled via the
(Raw)Socket method; add NEWS.Debian containing this information; remove
libio-socket-ssl-perl from build dependencies; move
- libio-socket-ssl-perl from Depends to Recommends; remove README.Debian.
+ libio-socket-ssl-perl from Depends to Recommends; remove README.Debian;
+ add new patch catch_ssl_attribute to catch the use of the old Ssl
+ attribute provided by the now deleted patch.
* Remove patch 30_uninitialized_warning, not relevant for new upstream
code any more.
* Remove patch 40_pod_whatis_parse_error, not relevant for new upstream
code any more.
- * Remove debian/patches, remove dpatch from build dependencies and patch
- targets from debian/rules after removing all patches.
* debian/rules:
- move dh_clean before $(MAKE) distclean.
- set mode for *.grammar files to 644.
- don't install *.pod files.
- * debian/control: add libtest-pod-perl to Build-Depends-Indep.
+ * debian/control:
+ - add libtest-pod-perl to Build-Depends-Indep.
+ - add quilt to Build-Depends.
+ - remove dpatch from Build-Depends.
[ Damyan Ivanov ]
* Remove unused dh_link call
Modified: trunk/libmail-imapclient-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libmail-imapclient-perl/debian/control?rev=9973&op=diff
==============================================================================
--- trunk/libmail-imapclient-perl/debian/control (original)
+++ trunk/libmail-imapclient-perl/debian/control Wed Nov 28 21:45:06 2007
@@ -3,7 +3,7 @@
Section: perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Joachim Breitner <nomeata at debian.org>, Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>, Russ Allbery <rra at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
Build-Depends-Indep: perl (>= 5.6.0-17), libparse-recdescent-perl, libtest-pod-perl
Standards-Version: 3.7.2.2
Homepage: http://search.cpan.org/dist/Mail-IMAPClient/
Added: trunk/libmail-imapclient-perl/debian/patches/catch_ssl_attribute.patch
URL: http://svn.debian.org/wsvn/trunk/libmail-imapclient-perl/debian/patches/catch_ssl_attribute.patch?rev=9973&op=file
==============================================================================
--- trunk/libmail-imapclient-perl/debian/patches/catch_ssl_attribute.patch (added)
+++ trunk/libmail-imapclient-perl/debian/patches/catch_ssl_attribute.patch Wed Nov 28 21:45:06 2007
@@ -1,0 +1,15 @@
+Index: libmail-imapclient-perl/lib/Mail/IMAPClient.pm
+===================================================================
+--- libmail-imapclient-perl.orig/lib/Mail/IMAPClient.pm 2007-11-28 22:33:10.000000000 +0100
++++ libmail-imapclient-perl/lib/Mail/IMAPClient.pm 2007-11-28 22:33:38.000000000 +0100
+@@ -201,6 +201,10 @@
+ my $v = shift;
+ $self->{$k} = $v if defined $v;
+ }
++
++ # catch Ssl attribute from old Debian patch
++ Carp::croak 'Ssl is unsupported as attribute. See NEWS.Debian for more info' if exists $self->{Ssl};
++
+ bless $self, ref($class)||$class;
+
+ if(my $sup = $self->{Supportedflags}) # unpack into case-less HASH
Added: trunk/libmail-imapclient-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libmail-imapclient-perl/debian/patches/series?rev=9973&op=file
==============================================================================
--- trunk/libmail-imapclient-perl/debian/patches/series (added)
+++ trunk/libmail-imapclient-perl/debian/patches/series Wed Nov 28 21:45:06 2007
@@ -1,0 +1,1 @@
+catch_ssl_attribute.patch
Modified: trunk/libmail-imapclient-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libmail-imapclient-perl/debian/rules?rev=9973&op=diff
==============================================================================
--- trunk/libmail-imapclient-perl/debian/rules (original)
+++ trunk/libmail-imapclient-perl/debian/rules Wed Nov 28 21:45:06 2007
@@ -4,11 +4,12 @@
PERL ?= /usr/bin/perl
TMP := $(CURDIR)/debian/libmail-imapclient-perl
+include /usr/share/quilt/quilt.make
build: build-arch build-indep
build-arch:
build-indep: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
touch test.txt
$(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -17,7 +18,7 @@
$(MAKE) test
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
dh_clean build-stamp install-stamp Thread/Thread.grammar \
More information about the Pkg-perl-cvs-commits
mailing list