[med-svn] r4966 - trunk/packages/gwyddion/trunk/debian/patches

[Jan Beyer]

Author: beathovn-guest
Date: 2010-06-30 19:32:05 +0000 (Wed, 30 Jun 2010)
New Revision: 4966

Removed:
   trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/patches/series
Log:
string exception issue fixed upstream, so we can skip this patch

Deleted: trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch	2010-06-30 19:29:48 UTC (rev 4965)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch	2010-06-30 19:32:05 UTC (rev 4966)
@@ -1,18 +0,0 @@
-Description: Python 2.6 doesn't allow raising string exceptions any longer.
- Upstream patch slightly adapted using http://wiki.python.org/moin/FutureProofPython.
-Bug-Debian: http://bugs.debian.org/585235
-Origin: upstream, http://gwyddion.svn.sourceforge.net/viewvc/gwyddion/trunk/gwyddion/python/Gwyddion/dump.py?r1=11323&r2=11322&pathrev=11323
-Author: David Necas (Yeti) <yeti at gwyddion.net>
-Applied-Upstream: 2.20
-
---- gwyddion/python/Gwyddion/dump.py	2010/06/10 18:23:03	11322
-+++ gwyddion/python/Gwyddion/dump.py	2010/06/11 09:09:33	11323
-@@ -87,7 +87,7 @@
-         if m:
-             data[m.group('key')] = m.group('val')
-             continue
--        raise 'Can\'t understand input'
-+        raise ValueError('Malformed header')
-     fh.close()
-     return data
-

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2010-06-30 19:29:48 UTC (rev 4965)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2010-06-30 19:32:05 UTC (rev 4966)
@@ -1,3 +1,2 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
-fix-python-raising-string-exception.patch