r13426 - in /trunk/libnet-irc-perl/debian: ./ patches/

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Thu Jan 24 14:39:10 UTC 2008


Author: dmn
Date: Thu Jan 24 14:39:10 2008
New Revision: 13426

URL: http://svn.debian.org/wsvn/?sc=1&rev=13426
Log:
* convert patches to quilt

Added:
    trunk/libnet-irc-perl/debian/patches/10manpages.diff
    trunk/libnet-irc-perl/debian/patches/20do_one_loop.diff
    trunk/libnet-irc-perl/debian/patches/30irctest.diff
    trunk/libnet-irc-perl/debian/patches/40handler.diff
    trunk/libnet-irc-perl/debian/patches/50fix_next_outside_loop_with_return.diff
    trunk/libnet-irc-perl/debian/patches/60warnings_from_unknown_event.diff
    trunk/libnet-irc-perl/debian/patches/series
Removed:
    trunk/libnet-irc-perl/debian/patches/00list
    trunk/libnet-irc-perl/debian/patches/10manpages.dpatch
    trunk/libnet-irc-perl/debian/patches/20do_one_loop.dpatch
    trunk/libnet-irc-perl/debian/patches/30irctest.dpatch
    trunk/libnet-irc-perl/debian/patches/40handler.dpatch
    trunk/libnet-irc-perl/debian/patches/50fix_next_outside_loop_with_return.dpatch
    trunk/libnet-irc-perl/debian/patches/60warnings_from_unknown_event.dpatch
Modified:
    trunk/libnet-irc-perl/debian/changelog
    trunk/libnet-irc-perl/debian/control
    trunk/libnet-irc-perl/debian/rules

Modified: trunk/libnet-irc-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/changelog?rev=13426&op=diff
==============================================================================
--- trunk/libnet-irc-perl/debian/changelog (original)
+++ trunk/libnet-irc-perl/debian/changelog Thu Jan 24 14:39:10 2008
@@ -20,6 +20,9 @@
   * debian/copyright
     + Add Upstream URL
     + converting to new format and adding copyright note for other authors
+
+  [ Damyan Ivanov ]
+  * convert patches to quilt
 
  -- Rene Mayorga <rmayorga at debian.org.sv>  Wed, 23 Jan 2008 17:43:51 -0600
 

Modified: trunk/libnet-irc-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/control?rev=13426&op=diff
==============================================================================
--- trunk/libnet-irc-perl/debian/control (original)
+++ trunk/libnet-irc-perl/debian/control Thu Jan 24 14:39:10 2008
@@ -8,7 +8,7 @@
 Homepage: http://search.cpan.org/dist/Net-IRC/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnet-irc-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-irc-perl/
-Build-Depends: debhelper (>= 6), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 6), quilt
 Build-Depends-Indep: perl (>= 5.6.1)
 
 Package: libnet-irc-perl

Added: trunk/libnet-irc-perl/debian/patches/10manpages.diff
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/10manpages.diff?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/10manpages.diff (added)
+++ trunk/libnet-irc-perl/debian/patches/10manpages.diff Thu Jan 24 14:39:10 2008
@@ -1,0 +1,17 @@
+Index: libnet-irc-perl/Makefile.PL
+===================================================================
+--- libnet-irc-perl.orig/Makefile.PL	2008-01-24 15:43:38.000000000 +0200
++++ libnet-irc-perl/Makefile.PL	2008-01-24 16:38:13.000000000 +0200
+@@ -21,6 +21,12 @@
+                   'IO::Socket'    => 0,
+                   'Sys::Hostname' => 0,
+               },
++	      'MAN3PODS' => {
++		  'IRC.pm' => 'blib/man3/Net::IRC.3pm',
++		  'Connection.pm' => 'blib/man3/Net::IRC::Connection.3pm',
++		  'DCC.pm' => 'blib/man3/Net::IRC::DCC.3pm',
++		  'Event.pm' => 'blib/man3/Net::IRC::Event.3pm',
++	      },
+ 	      'VERSION_FROM' => 'IRC.pm', # finds $VERSION
+               'dist' => { 'COMPRESS' => 'gzip --best' },
+ );

Added: trunk/libnet-irc-perl/debian/patches/20do_one_loop.diff
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/20do_one_loop.diff?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/20do_one_loop.diff (added)
+++ trunk/libnet-irc-perl/debian/patches/20do_one_loop.diff Thu Jan 24 14:39:10 2008
@@ -1,0 +1,13 @@
+Index: libnet-irc-perl/IRC.pm
+===================================================================
+--- libnet-irc-perl.orig/IRC.pm	2008-01-24 15:43:38.000000000 +0200
++++ libnet-irc-perl/IRC.pm	2008-01-24 16:38:13.000000000 +0200
+@@ -138,7 +138,7 @@
+   # we don't want to bother waiting on input or running
+   # scheduled events if we're just flushing the output queue
+   # so we bail out here
+-  return if $caller eq 'Net::IRC::flush_output_queue';
++  return if defined($caller) and $caller eq 'Net::IRC::flush_output_queue';
+ 
+   # Check the queue for scheduled events to run.
+   if(!$self->schedulequeue->is_empty) {

Added: trunk/libnet-irc-perl/debian/patches/30irctest.diff
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/30irctest.diff?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/30irctest.diff (added)
+++ trunk/libnet-irc-perl/debian/patches/30irctest.diff Thu Jan 24 14:39:10 2008
@@ -1,0 +1,26 @@
+Index: libnet-irc-perl/irctest
+===================================================================
+--- libnet-irc-perl.orig/irctest	2008-01-24 15:43:38.000000000 +0200
++++ libnet-irc-perl/irctest	2008-01-24 16:38:14.000000000 +0200
+@@ -14,6 +14,21 @@
+ 
+ my $irc = new Net::IRC;
+ 
++print << 'INIT_WARN';
+++------------------------------------------------------------
++| IMPORTANT NOTE
++|
++| Running this script might constitute a severe security risk
++| This script will send ANY FILE it is requested as a response
++| to the message 'Send me <filename>'
++|
++| You have been warned.
+++------------------------------------------------------------
++(sleeping for two seconds)
++INIT_WARN
++
++sleep 2;
++
+ print "Creating connection to IRC server...\n";
+ 
+ my $conn = $irc->newconn(Server   => ($ARGV[0]  ||  'irc.prison.net'),

Added: trunk/libnet-irc-perl/debian/patches/40handler.diff
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/40handler.diff?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/40handler.diff (added)
+++ trunk/libnet-irc-perl/debian/patches/40handler.diff Thu Jan 24 14:39:10 2008
@@ -1,0 +1,13 @@
+Index: libnet-irc-perl/DCC.pm
+===================================================================
+--- libnet-irc-perl.orig/DCC.pm	2008-01-24 15:43:38.000000000 +0200
++++ libnet-irc-perl/DCC.pm	2008-01-24 16:38:14.000000000 +0200
+@@ -145,7 +145,7 @@
+     # Only do the Disconnection Dance of Death if the socket is still
+     # live. Duplicate dcc_close events would be a Bad Thing.
+     
+-    if ($self->{_socket}->opened) {
++    if ($self->{_socket}->opened and $self->{_parent}->can('handler')) {
+ 	$self->{_parent}->handler(Net::IRC::Event->new('dcc_close',
+ 						       $self->{_nick},
+ 						       $self->{_socket},

Added: trunk/libnet-irc-perl/debian/patches/50fix_next_outside_loop_with_return.diff
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/50fix_next_outside_loop_with_return.diff?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/50fix_next_outside_loop_with_return.diff (added)
+++ trunk/libnet-irc-perl/debian/patches/50fix_next_outside_loop_with_return.diff Thu Jan 24 14:39:10 2008
@@ -1,0 +1,13 @@
+Index: libnet-irc-perl/DCC.pm
+===================================================================
+--- libnet-irc-perl.orig/DCC.pm	2008-01-24 16:38:14.000000000 +0200
++++ libnet-irc-perl/DCC.pm	2008-01-24 16:38:14.000000000 +0200
+@@ -253,7 +253,7 @@
+ 
+     my $line = $self->_getline($_[0], 'BLOCKS');
+ 
+-    next unless defined $line;
++    return unless defined $line;
+     unless(print {$self->{_fh}} $line) {
+ 	carp ("Error writing to " . $self->{_filename} . ": $!");
+ 	close $self->{_fh};

Added: trunk/libnet-irc-perl/debian/patches/60warnings_from_unknown_event.diff
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/60warnings_from_unknown_event.diff?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/60warnings_from_unknown_event.diff (added)
+++ trunk/libnet-irc-perl/debian/patches/60warnings_from_unknown_event.diff Thu Jan 24 14:39:10 2008
@@ -1,0 +1,38 @@
+Index: libnet-irc-perl/Connection.pm
+===================================================================
+--- libnet-irc-perl.orig/Connection.pm	2008-01-24 15:43:38.000000000 +0200
++++ libnet-irc-perl/Connection.pm	2008-01-24 16:38:15.000000000 +0200
+@@ -467,6 +467,7 @@
+   my $ev;
+   if (ref $event) {
+     $ev = $event->type;
++    $ev = "" if !$ev;
+   } elsif (defined $event) {
+     $ev = $event;
+     $event = Net::IRC::Event->new($event, '', '', '');
+@@ -1126,11 +1127,15 @@
+   
+   $from = substr $from, 1 if $from =~ /^:/;
+   
+-  return Net::IRC::Event->new( $type,
++  my $event = Net::IRC::Event->new( $type,
+                                $from,
+                                '',
+                                'server',
+                                @stuff );
++  if (!$event->type and $self->{_debug}) {
++    carp("Unknown code $type received") ;
++  }
++  return $event;
+ }
+ 
+ # Helps you flee those hard-to-stand channels.
+@@ -1584,6 +1589,8 @@
+     croak "You EEEEEDIOT!!! Not enough args to _default()!";
+   }
+   
++  return 1 if !$event->type;
++
+   # Reply to PING from server as quickly as possible.
+   if ($event->type eq "ping") {
+     $self->sl("PONG " . (CORE::join ' ', $event->args));

Added: trunk/libnet-irc-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/patches/series?rev=13426&op=file
==============================================================================
--- trunk/libnet-irc-perl/debian/patches/series (added)
+++ trunk/libnet-irc-perl/debian/patches/series Thu Jan 24 14:39:10 2008
@@ -1,0 +1,6 @@
+10manpages.diff
+20do_one_loop.diff
+30irctest.diff
+40handler.diff
+50fix_next_outside_loop_with_return.diff
+60warnings_from_unknown_event.diff

Modified: trunk/libnet-irc-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnet-irc-perl/debian/rules?rev=13426&op=diff
==============================================================================
--- trunk/libnet-irc-perl/debian/rules (original)
+++ trunk/libnet-irc-perl/debian/rules Thu Jan 24 14:39:10 2008
@@ -7,10 +7,10 @@
 package	:= $(firstword $(shell dh_listpackages))
 prefix	:= $(CURDIR)/debian/$(package)/usr
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build:	build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
 	$(MAKE)




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