r60369 - in /trunk/libcurses-ui-perl/debian: changelog patches/ patches/00list patches/01_remove_solaris_hack.dpatch patches/02_feedkeys.dpatch rules

[antgel-guest at users.alioth.debian.org]

Author: antgel-guest
Date: Sat Jul 17 19:18:50 2010
New Revision: 60369

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60369
Log:
Add patches to fix 556846 and 556934.

Added:
    trunk/libcurses-ui-perl/debian/patches/
    trunk/libcurses-ui-perl/debian/patches/00list
    trunk/libcurses-ui-perl/debian/patches/01_remove_solaris_hack.dpatch   (with props)
    trunk/libcurses-ui-perl/debian/patches/02_feedkeys.dpatch   (with props)
Modified:
    trunk/libcurses-ui-perl/debian/changelog
    trunk/libcurses-ui-perl/debian/rules

Modified: trunk/libcurses-ui-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-ui-perl/debian/changelog?rev=60369&op=diff
==============================================================================
--- trunk/libcurses-ui-perl/debian/changelog (original)
+++ trunk/libcurses-ui-perl/debian/changelog Sat Jul 17 19:18:50 2010
@@ -1,6 +1,11 @@
 libcurses-ui-perl (0.9607-2) UNRELEASED; urgency=low
 
   * debian/watch: Update to ignore development releases.
+
+  [Antony Gelberg]
+  * Add patch to remove broken Solaris hack. (Closes: 556846)
+  * Add patch to remove broken flushkeys hack. (Closes: 556934)
+  * Modify debian/rules to use dpatch.
 
  -- Nathan Handler <nhandler at ubuntu.com>  Sat, 06 Jun 2009 01:33:28 +0000
 

Added: trunk/libcurses-ui-perl/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-ui-perl/debian/patches/00list?rev=60369&op=file
==============================================================================
--- trunk/libcurses-ui-perl/debian/patches/00list (added)
+++ trunk/libcurses-ui-perl/debian/patches/00list Sat Jul 17 19:18:50 2010
@@ -1,0 +1,2 @@
+01_remove_solaris_hack
+02_feedkeys

Added: trunk/libcurses-ui-perl/debian/patches/01_remove_solaris_hack.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-ui-perl/debian/patches/01_remove_solaris_hack.dpatch?rev=60369&op=file
==============================================================================
--- trunk/libcurses-ui-perl/debian/patches/01_remove_solaris_hack.dpatch (added)
+++ trunk/libcurses-ui-perl/debian/patches/01_remove_solaris_hack.dpatch Sat Jul 17 19:18:50 2010
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_remove_solaris_hack.dpatch by  <antony.gelberg at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libcurses-ui-perl-0.9605~/lib/Curses/UI.pm
+libcurses-ui-perl-0.9605/lib/Curses/UI.pm
+--- libcurses-ui-perl-0.9605~/lib/Curses/UI.pm  2009-11-17 20:24:52.000000000
++0000
++++ libcurses-ui-perl-0.9605/lib/Curses/UI.pm   2009-11-17 20:29:23.000000000
++0000
+@@ -437,8 +437,13 @@
+     # feed them to the application in this way, the screen
+     # hangs in case I do a lot of input on my Solaris
+     # machine.
+-    $key = $self->get_key(0);
+-    $self->feedkey($key) unless $key eq '-1';
++    #
++    # Removed by Antony Gelberg for Debian - causes lots of problems on my 
++    # Linux box when the app is blocked and input is queued.  Plan to contact
++    # upstream to ask for justification or removal.
++    #
++    # $key = $self->get_key(0);
++    # $self->feedkey($key) unless $key eq '-1';
+ 
+     # Update the screen.
+     doupdate();
+

Propchange: trunk/libcurses-ui-perl/debian/patches/01_remove_solaris_hack.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/libcurses-ui-perl/debian/patches/02_feedkeys.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-ui-perl/debian/patches/02_feedkeys.dpatch?rev=60369&op=file
==============================================================================
--- trunk/libcurses-ui-perl/debian/patches/02_feedkeys.dpatch (added)
+++ trunk/libcurses-ui-perl/debian/patches/02_feedkeys.dpatch Sat Jul 17 19:18:50 2010
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_flushkeys.dpatch by  <antony.gelberg at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libcurses-ui-perl-0.9605~/lib/Curses/UI.pm
+libcurses-ui-perl-0.9605/lib/Curses/UI.pm
+--- libcurses-ui-perl-0.9605~/lib/Curses/UI.pm  2009-11-18 12:14:40.000000000
++0000
++++ libcurses-ui-perl-0.9605/lib/Curses/UI.pm   2009-11-18 12:15:51.000000000
++0000
+@@ -504,7 +504,9 @@
+ {
+     my $self = shift;
+     my $key = shift;
+-    $self->flushkeys();
++    # Removed by Antony Gelberg for Debian - again this causes things to get
++    # out of sync.
++    #$self->flushkeys();
+     $self->{-feedkey} = $key;
+     return $self;
+ }
+

Propchange: trunk/libcurses-ui-perl/debian/patches/02_feedkeys.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/libcurses-ui-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-ui-perl/debian/rules?rev=60369&op=diff
==============================================================================
--- trunk/libcurses-ui-perl/debian/rules (original)
+++ trunk/libcurses-ui-perl/debian/rules Sat Jul 17 19:18:50 2010
@@ -1,11 +1,14 @@
 #!/usr/bin/make -f
 
-build: build-stamp
+include /usr/share/quilt/quilt.make
+include /usr/share/dpatch/dpatch.make
+
+build: patch build-stamp
 build-stamp:
 	dh build
 	touch $@
 
-clean:
+clean: unpatch
 	dh $@
 
 install: install-stamp