tags 602171 + pending thanks Dear maintainer,
I've prepared an NMU for gdesklets (versioned as 0.36.1-4.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Die Schmetterlinge: Dachau-Lied
diff -u gdesklets-0.36.1/debian/changelog gdesklets-0.36.1/debian/changelog --- gdesklets-0.36.1/debian/changelog +++ gdesklets-0.36.1/debian/changelog @@ -1,3 +1,13 @@ +gdesklets (0.36.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "won't start": repair debian/patches/01_python2.6.patch: at the moment + it just creates a debian/patches/10_python2.6.patch file which never gets + applied (closes: #602171). -- Thanks to Giovanni Mascellani for testing + the fix. + + -- gregor herrmann <gre...@debian.org> Mon, 15 Nov 2010 21:38:19 +0100 + gdesklets (0.36.1-4) unstable; urgency=low * debian/patches/01_python2.6.patch: diff -u gdesklets-0.36.1/debian/patches/01_python2.6.patch gdesklets-0.36.1/debian/patches/01_python2.6.patch --- gdesklets-0.36.1/debian/patches/01_python2.6.patch +++ gdesklets-0.36.1/debian/patches/01_python2.6.patch @@ -1,23 +1,20 @@ +Description: Fix exception when running under python2.6. Patch from Ubuntu, commited upstream. +Origin: https://bugs.launchpad.net/gdesklets/+bug/344079 +Forwarded: http://bazaar.launchpad.net/~gdesklets-core-team/gdesklets/0.3x/revision/118 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561645 ---- gdesklets-0.36.1.orig/debian/patches/10_python2.6.patch -+++ gdesklets-0.36.1/debian/patches/10_python2.6.patch -@@ -0,0 +1,18 @@ -+Description: Fix exception when running under python2.6. Patch from Ubuntu, commited upstream. -+Origin: https://bugs.launchpad.net/gdesklets/+bug/344079 -+Forwarded: http://bazaar.launchpad.net/~gdesklets-core-team/gdesklets/0.3x/revision/118 -+diff -Nur -x '*.orig' -x '*~' gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py -+--- gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py 2009-03-25 11:53:35.000000000 -0400 -++++ gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py 2009-05-12 13:38:39.000000000 -0400 -+@@ -113,9 +113,9 @@ -+ # give us an absolute path. -+ # -+ _old_imp = __import__ -+-def _new_imp(name, globs = {}, locls = {}, fromlist = []): -++def _new_imp(*args, **kwargs): -+ -+- module = _old_imp(name, globs, locls, fromlist) -++ module = _old_imp(*args, **kwargs) -+ # builtin modules have no "__file__" attribute, so we have to check for it -+ if (module): -+ if (hasattr(module, "__file__")): +diff -Nur -x '*.orig' -x '*~' gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py +--- gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py 2009-03-25 11:53:35.000000000 -0400 ++++ gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py 2009-05-12 13:38:39.000000000 -0400 +@@ -113,9 +113,9 @@ + # give us an absolute path. + # + _old_imp = __import__ +-def _new_imp(name, globs = {}, locls = {}, fromlist = []): ++def _new_imp(*args, **kwargs): + +- module = _old_imp(name, globs, locls, fromlist) ++ module = _old_imp(*args, **kwargs) + # builtin modules have no "__file__" attribute, so we have to check for it + if (module): + if (hasattr(module, "__file__")):
signature.asc
Description: Digital signature
