Author: beathovn-guest Date: 2010-06-15 20:37:50 +0000 (Tue, 15 Jun 2010) New Revision: 4889
Added: trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch Modified: trunk/packages/gwyddion/trunk/debian/changelog trunk/packages/gwyddion/trunk/debian/patches/series Log: Adding adapted patch from upstream to fix minor Python 2.6 issue with raising string exceptions. Not sure about necessity of upload to Debian. We'll see. Modified: trunk/packages/gwyddion/trunk/debian/changelog =================================================================== --- trunk/packages/gwyddion/trunk/debian/changelog 2010-06-15 16:00:05 UTC (rev 4888) +++ trunk/packages/gwyddion/trunk/debian/changelog 2010-06-15 20:37:50 UTC (rev 4889) @@ -3,8 +3,9 @@ * NOT RELEASED YET * Switch to dpkg-source 3.0 (quilt) format * Bumped Standards-Version to 3.8.4 (no changes needed) + * Added adapted upstream patch for Python 2.6 compatibility (Closes: #585235) - -- Jan Beyer <j...@beathovn.de> Sun, 31 Jan 2010 21:08:59 +0100 + -- Jan Beyer <j...@beathovn.de> Tue, 15 Jun 2010 22:36:30 +0200 gwyddion (2.19-1) unstable; urgency=low Added: trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch =================================================================== --- trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch (rev 0) +++ trunk/packages/gwyddion/trunk/debian/patches/fix-python-raising-string-exception.patch 2010-06-15 20:37:50 UTC (rev 4889) @@ -0,0 +1,18 @@ +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) <y...@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-15 16:00:05 UTC (rev 4888) +++ trunk/packages/gwyddion/trunk/debian/patches/series 2010-06-15 20:37:50 UTC (rev 4889) @@ -1,2 +1,3 @@ fix-manpage-section-for-debian.diff fix-rpath-issue.patch +fix-python-raising-string-exception.patch _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit