r10050 - in /trunk/libnet-imap-simple-perl: debian/changelog debian/control debian/patches/ debian/patches/fix_warnings.patch debian/patches/series debian/rules lib/Net/IMAP/Simple.pm

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Fri Nov 30 17:21:25 UTC 2007


Author: gregoa-guest
Date: Fri Nov 30 17:21:24 2007
New Revision: 10050

URL: http://svn.debian.org/wsvn/?sc=1&rev=10050
Log:
* Split out the changes from -2 in a separate patch; add quilt to
  debian/control and adapt debian/rules accordingly.
* debian/rules: remove unneeded compiler flags; move dh_clean before
  $(MAKE) distclean; remove unneeded dh_link call.

Added:
    trunk/libnet-imap-simple-perl/debian/patches/
    trunk/libnet-imap-simple-perl/debian/patches/fix_warnings.patch
    trunk/libnet-imap-simple-perl/debian/patches/series
Modified:
    trunk/libnet-imap-simple-perl/debian/changelog
    trunk/libnet-imap-simple-perl/debian/control
    trunk/libnet-imap-simple-perl/debian/rules
    trunk/libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm

Modified: trunk/libnet-imap-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnet-imap-simple-perl/debian/changelog?rev=10050&op=diff
==============================================================================
--- trunk/libnet-imap-simple-perl/debian/changelog (original)
+++ trunk/libnet-imap-simple-perl/debian/changelog Fri Nov 30 17:21:24 2007
@@ -1,3 +1,12 @@
+libnet-imap-simple-perl (1.17-3) UNRELEASED; urgency=low
+
+  * Split out the changes from -2 in a separate patch; add quilt to
+    debian/control and adapt debian/rules accordingly.
+  * debian/rules: remove unneeded compiler flags; move dh_clean before
+    $(MAKE) distclean; remove unneeded dh_link call.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Fri, 30 Nov 2007 18:17:21 +0100
+
 libnet-imap-simple-perl (1.17-2) unstable; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/libnet-imap-simple-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnet-imap-simple-perl/debian/control?rev=10050&op=diff
==============================================================================
--- trunk/libnet-imap-simple-perl/debian/control (original)
+++ trunk/libnet-imap-simple-perl/debian/control Fri Nov 30 17:21:24 2007
@@ -1,7 +1,7 @@
 Source: libnet-imap-simple-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 5.0.0), quilt
 Build-Depends-Indep: perl (>= 5.8.0-7)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Allard Hoeve <allard at byte.nl>, Gunnar Wolf <gwolf at debian.org>, Joachim Breitner <nomeata at debian.org> , gregor herrmann <gregor+debian at comodo.priv.at>, Rene Mayorga <rmayorga at debian.org.sv>

Added: trunk/libnet-imap-simple-perl/debian/patches/fix_warnings.patch
URL: http://svn.debian.org/wsvn/trunk/libnet-imap-simple-perl/debian/patches/fix_warnings.patch?rev=10050&op=file
==============================================================================
--- trunk/libnet-imap-simple-perl/debian/patches/fix_warnings.patch (added)
+++ trunk/libnet-imap-simple-perl/debian/patches/fix_warnings.patch Fri Nov 30 17:21:24 2007
@@ -1,0 +1,16 @@
+Index: libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm
+===================================================================
+--- libnet-imap-simple-perl.orig/lib/Net/IMAP/Simple.pm	2007-11-30 18:13:54.000000000 +0100
++++ libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm	2007-11-30 18:14:18.000000000 +0100
+@@ -898,9 +898,9 @@
+  $str =~ s/\r/\\r/g;
+  $str =~ s/\cM/^M/g;
+ 
+- my $line = "[$package :: $filename :: $line\@$dline -> $routine] $str\n";
++ $line = "[$package :: $filename :: $line\@$dline -> $routine] $str\n";
+  if(ref($self->{debug}) eq 'GLOB'){
+-	write($self->{debug}, $line);
++        print { $self->{debug} } $line;
+  } else {
+ 	print STDOUT $line;
+  }

Added: trunk/libnet-imap-simple-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libnet-imap-simple-perl/debian/patches/series?rev=10050&op=file
==============================================================================
--- trunk/libnet-imap-simple-perl/debian/patches/series (added)
+++ trunk/libnet-imap-simple-perl/debian/patches/series Fri Nov 30 17:21:24 2007
@@ -1,0 +1,1 @@
+fix_warnings.patch

Modified: trunk/libnet-imap-simple-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnet-imap-simple-perl/debian/rules?rev=10050&op=diff
==============================================================================
--- trunk/libnet-imap-simple-perl/debian/rules (original)
+++ trunk/libnet-imap-simple-perl/debian/rules Fri Nov 30 17:21:24 2007
@@ -6,6 +6,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
 
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
@@ -19,32 +21,23 @@
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-# Allow disabling build optimation by setting noopt in
-# $DEB_BUILD_OPTIONS
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# commands to compile the package
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="$(CFLAGS)"
+	$(MAKE)
 	$(MAKE) test
 	
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
-	dh_clean build-stamp install-stamp
 
 install: install-stamp
 install-stamp: build-stamp
@@ -69,7 +62,6 @@
 	dh_installdocs 
 	dh_installchangelogs Changes
 	dh_perl
-	dh_link
 	dh_compress
 	dh_installexamples imap.pl
 	dh_fixperms

Modified: trunk/libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm
URL: http://svn.debian.org/wsvn/trunk/libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm?rev=10050&op=diff
==============================================================================
--- trunk/libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm (original)
+++ trunk/libnet-imap-simple-perl/lib/Net/IMAP/Simple.pm Fri Nov 30 17:21:24 2007
@@ -898,9 +898,9 @@
  $str =~ s/\r/\\r/g;
  $str =~ s/\cM/^M/g;
 
- $line = "[$package :: $filename :: $line\@$dline -> $routine] $str\n";
+ my $line = "[$package :: $filename :: $line\@$dline -> $routine] $str\n";
  if(ref($self->{debug}) eq 'GLOB'){
-        print { $self->{debug} } $line;
+	write($self->{debug}, $line);
  } else {
 	print STDOUT $line;
  }




More information about the Pkg-perl-cvs-commits mailing list