[Python-modules-commits] r12238 - in packages/forgetsql/trunk/debian (4 files)

[werner at users.alioth.debian.org]

    Date: Thursday, March 11, 2010 @ 13:55:14
  Author: werner
Revision: 12238


 * Add patch from Morten Brekkevold to change string exceptions not
   supported by Python 2.6. (Closes: #573417)
 * Updated debian/copyright to new machine-readable format.
 * Bumped standards-version to 3.8.4
 * Changed my lastname.

Added:
  packages/forgetsql/trunk/debian/patches/fix-string-exception
Modified:
  packages/forgetsql/trunk/debian/changelog
  packages/forgetsql/trunk/debian/control
  packages/forgetsql/trunk/debian/copyright

Modified: packages/forgetsql/trunk/debian/changelog
===================================================================
--- packages/forgetsql/trunk/debian/changelog	2010-03-11 11:20:27 UTC (rev 12237)
+++ packages/forgetsql/trunk/debian/changelog	2010-03-11 13:55:14 UTC (rev 12238)
@@ -1,3 +1,13 @@
+forgetsql (0.5.1-11) UNRELEASED; urgency=low
+
+  * Add patch from Morten Brekkevold to change string exceptions not
+    supported by Python 2.6. (Closes: #573417)
+  * Updated debian/copyright to new machine-readable format.
+  * Bumped standards-version to 3.8.4
+  * Changed my lastname.
+
+ -- Morten Werner Forsbring <werner at debian.org>  Thu, 11 Mar 2010 14:57:59 +0100
+
 forgetsql (0.5.1-10) unstable; urgency=low
 
   [ Bernd Zeimetz ]

Modified: packages/forgetsql/trunk/debian/control
===================================================================
--- packages/forgetsql/trunk/debian/control	2010-03-11 11:20:27 UTC (rev 12237)
+++ packages/forgetsql/trunk/debian/control	2010-03-11 13:55:14 UTC (rev 12238)
@@ -2,13 +2,13 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Morten Werner Olsen <werner at debian.org>
+Uploaders: Morten Werner Forsbring <werner at debian.org>
 Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python (>= 2.3.5-10), python-support (>= 0.3)
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/forgetsql/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/forgetsql/trunk/
-Standards-Version: 3.7.2
-Homepage: http://forgetsql.sourceforge.net
+Standards-Version: 3.8.4
+Homepage: http://forgetsql.sourceforge.net/
 
 Package: python-forgetsql
 Architecture: all

Modified: packages/forgetsql/trunk/debian/copyright
===================================================================
--- packages/forgetsql/trunk/debian/copyright	2010-03-11 11:20:27 UTC (rev 12237)
+++ packages/forgetsql/trunk/debian/copyright	2010-03-11 13:55:14 UTC (rev 12238)
@@ -1,12 +1,20 @@
-This package was debianized by Morten Werner Olsen <werner at skolelinux.no> on
-Mon,  2 Aug 2004 08:45:49 +0200.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: lessfs
+Maintainer: Mark Ruijter <mruijter at lessfs.com>
+Source: http://www.lessfs.com/
 
-It was downloaded from
- http://voxel.dl.sourceforge.net/sourceforge/forgetsql/forgetSQL-0.5.1.tar.gz
+Copyright: 2002-2003, Stian Soiland <stian at soiland.no>
+License: LGPL-2.1
 
-Upstream Author: Stian Soiland <stian at soiland.no>
+Files: debian/*
+Copyright: 2010, Morten Werner Forsbring <werner at debian.org>
+License: LGPL-2.1
 
-Copyright: (c) Stian Søiland 2002-2003
-
-GNU Lesser General Public License, version 2.1 at
-/usr/share/common-licenses/LGPL-2.1.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ The complete text of version 2.1 of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.

Added: packages/forgetsql/trunk/debian/patches/fix-string-exception
===================================================================
--- packages/forgetsql/trunk/debian/patches/fix-string-exception	                        (rev 0)
+++ packages/forgetsql/trunk/debian/patches/fix-string-exception	2010-03-11 13:55:14 UTC (rev 12238)
@@ -0,0 +1,36 @@
+Description: Change string exceptions not supported by Python 2.6
+Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573417
+Author: Morten Brekkevold <morten.brekkevold at uninett.no>
+Bug-Debian: http://bugs.debian.org/573417
+
+--- forgetsql-0.5.1.orig/forgetSQL.py	2010-02-24 11:55:01.000000000 +0100
++++ forgetsql-0.5.1/forgetSQL.py	2010-02-24 11:57:32.000000000 +0100
+@@ -1,4 +1,4 @@
+-
++#-*- coding: iso-8859-1 -*-
+ __version__ = "0.5.1"
+ 
+ ## Distributed under LGPL
+@@ -209,18 +209,18 @@
+     try:  # to implement 'goto' in Python.. UGH
+       if not cls._cache.has_key(args):
+         # unknown
+-        raise "NotFound"
++        raise NotFound
+       (ref, updated) = cls._cache[args]
+       realObject = ref()
+       if realObject is None:
+         # No more real references to it, dead object
+-        raise "NotFound"
++        raise NotFound
+       age = time.time() - updated
+       if age > cls._timeout:
+         # Too old!
+-        raise "NotFound"
++        raise NotFound
+       updated = time.time()
+-    except "NotFound":
++    except NotFound:
+       # We'll need to create it
+       realObject = object.__new__(cls, *args)  
+       ref = weakref.ref(realObject)