Hi Salvo, Salvo Tomaselli wrote: > I messed up a bit with that patch. The original version in mentor was > a bit incorrect (as pointed out by Gianfranco Costamagna) because it > also changes the shebang of the py file.
Indeed. Didn't notice that change. But then again, the "#!/usr/bin/python" shebang is the correct one and "#!/usr/bin/env python" is wrong for all packaged stuff, because it would break for any user who has a locally installed version of python in his $PATH and hasn't all run-time dependencies available there, too. See https://www.debian.org/doc/packaging-manuals/python-policy/ch-python.html#s-interpreter_loc for details. > I've just uploaded on mentors a 3rd (and hopefully last) version of > the package with the patch. I actually was about to write a mail that I've uploaded your NMU to DELAYED/2, see https://ftp-master.debian.org/deferred.html I could withdraw that upload, but since it actually fixes the shebang line to be "#!/usr/bin/python", I'd prefer to leave it. Then again, that change should be mentioned in the changelog. And in the meanwhile this issue has been reported upstream, too (at https://github.com/dpaleino/wicd/pull/5), so "Forwarded: no" is no more true. Salvo: Do you mind if I update debian/changelog and the patch headers accordingly and re-upload the package? Here's the debdiff I uploaded to DELAYED/2 so far: diff -Nru wicd-1.7.2.4/debian/changelog wicd-1.7.2.4/debian/changelog --- wicd-1.7.2.4/debian/changelog 2013-06-07 18:42:09.000000000 +0200 +++ wicd-1.7.2.4/debian/changelog 2015-10-03 09:58:09.000000000 +0200 @@ -1,3 +1,10 @@ +wicd (1.7.2.4-4.2) unstable; urgency=high + + * Non-maintainer upload. + * Patch to work with newer python-urwid (Closes: #800693) + + -- Salvo 'LtWorf' Tomaselli <tipos...@tiscali.it> Sat, 03 Oct 2015 09:56:54 +0200 + wicd (1.7.2.4-4.1) unstable; urgency=low * Non-maintainer upload diff -Nru wicd-1.7.2.4/debian/patches/34-newer_urwid wicd-1.7.2.4/debian/patches/34-newer_urwid --- wicd-1.7.2.4/debian/patches/34-newer_urwid 1970-01-01 01:00:00.000000000 +0100 +++ wicd-1.7.2.4/debian/patches/34-newer_urwid 2015-10-03 09:56:47.000000000 +0200 @@ -0,0 +1,29 @@ +Description: Fix to accomodate changes in python-urwid + Version 3 of the package is not backwards compatible. +Origin: other https://bbs.archlinux.org/viewtopic.php?pid=1481016 +Bug-Debian: https://bugs.debian.org/#800693 +Forwarded: no +Reviewed-By: Salvo 'LtWorf' Tomaselli <tipos...@tiscali.it> +Last-Update: 2015-10-03 + +--- wicd-1.7.2.4.orig/curses/wicd-curses.py ++++ wicd-1.7.2.4/curses/wicd-curses.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#! /usr/bin/python + # -* coding: utf-8 -*- + + """ wicd-curses. (curses/urwid-based) console interface to wicd +@@ -927,9 +927,10 @@ class appGUI(): + if not ui._started: + return False + +- input_data = ui.get_input_nonblocking() ++ ui.set_input_timeouts(max_wait=0) ++ input_data = ui.get_input() + # Resolve any "alarms" in the waiting +- self.handle_keys(input_data[1]) ++ self.handle_keys(input_data) + + # Update the screen + canvas = self.frame.render( (self.size),True ) diff -Nru wicd-1.7.2.4/debian/patches/series wicd-1.7.2.4/debian/patches/series --- wicd-1.7.2.4/debian/patches/series 2013-06-07 18:13:37.000000000 +0200 +++ wicd-1.7.2.4/debian/patches/series 2015-10-03 09:53:21.000000000 +0200 @@ -5,3 +5,4 @@ 26-support_etc-network_scripts.patch 32-prefer_gksu.patch 33-focus_property.patch +34-newer_urwid Regards, Axel -- ,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
