Hi David,
Axel Beckert wrote:
> I intend to NMU a fix based on isis' patch soon. A complete debdiff
> will follow soon.
Attached the debdiff for the NMU. I uploaded it to DELAYED/2.
I also pushed the according git commit[0] to collab-maint, but to a
new branch called nmu[1], so in case you will upload a new version
earlier, you just need to delete that branch.
[0]
http://anonscm.debian.org/gitweb/?p=collab-maint/wicd.git;a=commitdiff;h=7cd8a85621466e5632334a1fd2d8f015061322a1
[1]
http://anonscm.debian.org/gitweb/?p=collab-maint/wicd.git;a=shortlog;h=refs/heads/nmu
In case my NMU hits Debian Unstable, I'll like fast-forward the master
branch accordingly and remove my nmu branch again.
Regards, Axel
--
,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
`- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
diff -Nru wicd-1.7.2.4/debian/changelog wicd-1.7.2.4/debian/changelog
--- wicd-1.7.2.4/debian/changelog 2012-11-10 21:41:59.000000000 +0100
+++ wicd-1.7.2.4/debian/changelog 2013-06-07 18:42:09.000000000 +0200
@@ -1,3 +1,12 @@
+wicd (1.7.2.4-4.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Add patch by isis agora lovecruft to fix wicd-curses run time errors
+ caused by the changes of python-urwid 1.1 API (Closes: #709120)
+ * Bump wicd-curses dependency on python-urwid to >= 1.1
+
+ -- Axel Beckert <a...@debian.org> Fri, 07 Jun 2013 18:42:23 +0200
+
wicd (1.7.2.4-4) unstable; urgency=low
* Move user-adding code from debconf-config to wicd-daemon postinst
diff -Nru wicd-1.7.2.4/debian/control wicd-1.7.2.4/debian/control
--- wicd-1.7.2.4/debian/control 2012-11-10 21:41:59.000000000 +0100
+++ wicd-1.7.2.4/debian/control 2013-06-07 18:05:07.000000000 +0200
@@ -109,7 +109,7 @@
Depends:
${misc:Depends}
, ${python:Depends}
- , python-urwid
+ , python-urwid (>= 1.1)
, wicd-daemon (= ${source:Version})
Recommends: sudo
Provides: wicd-client
diff -Nru wicd-1.7.2.4/debian/patches/33-focus_property.patch
wicd-1.7.2.4/debian/patches/33-focus_property.patch
--- wicd-1.7.2.4/debian/patches/33-focus_property.patch 1970-01-01
01:00:00.000000000 +0100
+++ wicd-1.7.2.4/debian/patches/33-focus_property.patch 2013-06-07
18:17:36.000000000 +0200
@@ -0,0 +1,85 @@
+Description: fix AttributeError for self.focus property
+Forwarded: yes wicd-de...@lists.sourceforge.net
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709120
+Author: Isis Agora Lovecruft <i...@patternsinthevoid.net>
+Reviewed-By: Axel Beckert <a...@debian.org>
+Last-Update: 2013-06-07
+
+Adaptions necessary for the python-urwid 1.1 API.
+
+ * In curses_misc.py, the class ComboBox(urwid.WidgetWrap) attempts to set set
+ the attribute 'self.focus' in the method ComboBox.__init__(), though in
+ urwid.WidgetWrap 'focus' in a property. Because it the 'focus' property is
+ inherited, the @property methods for it must either:
+
+ 1) If the desire is to reuse the parent class, urwid.WidgetWrap, methods,
+ do:
+
+ @property
+ def focus(self): return super(ComboBox, self)._get_focus()
+ @property.setter
+ def focus(self, index): return super(ComboBox, self)._set_focus(index)
+ @property.deleter
+ def focus(self): return super(ComboBox, self)._del_focus()
+
+ 2) If the desire is to create new property descriptors, do:
+
+ def __init__(self, focus, [...]):
+ [...]
+ self._focus = focus
+
+ @property
+ def focus(self): return self._focus
+ @property.setter
+ def focus(self, index): self._focus = index
+ @property.deleter
+ def focus(self): del self._focus
+
+ I went with #2.
+
+Index: wicd-1.7.2.4/curses/curses_misc.py
+===================================================================
+--- wicd-1.7.2.4.orig/curses/curses_misc.py 2013-06-07 18:17:24.361894496
+0200
++++ wicd-1.7.2.4/curses/curses_misc.py 2013-06-07 18:17:24.349894443 +0200
+@@ -314,9 +314,9 @@
+ #Send key to underlying widget:
+ self._w.keypress(dim, k)
+
+- #def get_size(self):
+-
+- def
__init__(self,label='',list=[],attrs=('body','editnfc'),focus_attr='focus',use_enter=True,focus=0,callback=None,user_args=None):
++ def __init__(self, label='', list=[], attrs=('body','editnfc'),
++ focus_attr='focus', use_enter=True, focus=0, callback=None,
++ user_args=None):
+ """
+ label : bit of text that preceeds the combobox. If it is "",
then
+ ignore it
+@@ -349,7 +349,7 @@
+ # We need this to pick our keypresses
+ self.use_enter = use_enter
+
+- self.focus = focus
++ self._focus = focus
+
+ self.callback = callback
+ self.user_args = user_args
+@@ -358,6 +358,19 @@
+ self.parent = None
+ self.ui = None
+ self.row = None
++
++ @property
++ def focus(self):
++ return self._focus
++
++ @focus.setter
++ def focus(self, index):
++ self._focus = index
++
++ @focus.deleter
++ def focus(self):
++ del self._focus
++
+ def set_list(self,list):
+ self.list = list
+
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 2012-11-10 21:41:59.000000000 +0100
+++ wicd-1.7.2.4/debian/patches/series 2013-06-07 18:13:37.000000000 +0200
@@ -4,3 +4,4 @@
04-fix_resolv.conf_backup-restore.patch
26-support_etc-network_scripts.patch
32-prefer_gksu.patch
+33-focus_property.patch
