r23176 - in /packages/unstable/gdesklets/debian: changelog patches/ patches/01_python2.6.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Mar  2 16:55:53 2010
New Revision: 23176

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23176
Log:
* debian/patches/01_python2.6.patch:
  - Make gdesklets work with Python 2.6. Thanks to Andrew Starr-Bochicchio
    for the report. Closes: #561645.

Added:
    packages/unstable/gdesklets/debian/patches/
    packages/unstable/gdesklets/debian/patches/01_python2.6.patch
Modified:
    packages/unstable/gdesklets/debian/changelog

Modified: packages/unstable/gdesklets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/changelog?rev=23176&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog [utf-8] (original)
+++ packages/unstable/gdesklets/debian/changelog [utf-8] Tue Mar  2 16:55:53 2010
@@ -1,3 +1,11 @@
+gdesklets (0.36.1-4) UNRELEASED; urgency=low
+
+  * debian/patches/01_python2.6.patch:
+    - Make gdesklets work with Python 2.6. Thanks to Andrew Starr-Bochicchio
+      for the report. Closes: #561645.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 02 Mar 2010 17:52:37 +0100
+
 gdesklets (0.36.1-3) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Added: packages/unstable/gdesklets/debian/patches/01_python2.6.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/patches/01_python2.6.patch?rev=23176&op=file
==============================================================================
--- packages/unstable/gdesklets/debian/patches/01_python2.6.patch (added)
+++ packages/unstable/gdesklets/debian/patches/01_python2.6.patch [utf-8] Tue Mar  2 16:55:53 2010
@@ -1,0 +1,23 @@
+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__")):