[Python-modules-commits] r11356 - in packages/forgetsql/trunk (13 files)
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Wed Jan 27 16:38:00 UTC 2010
Date: Wednesday, January 27, 2010 @ 16:37:54
Author: hertzog
Revision: 11356
* Switch to source format "3.0 (quilt)".
* Bump debian/compat to 5.
* Add missing ${misc:Depends}.
* Revert upstream changes and move them to separate quilt patches with
proper DEP-3 headers.
Added:
packages/forgetsql/trunk/debian/patches/
packages/forgetsql/trunk/debian/patches/fix-mysqldb-support
packages/forgetsql/trunk/debian/patches/fix-output-option
packages/forgetsql/trunk/debian/patches/mark-unchanged-after-save
packages/forgetsql/trunk/debian/patches/series
packages/forgetsql/trunk/debian/source/
packages/forgetsql/trunk/debian/source/format
Modified:
packages/forgetsql/trunk/bin/forgetsql-generate
packages/forgetsql/trunk/debian/changelog
packages/forgetsql/trunk/debian/compat
packages/forgetsql/trunk/debian/control
packages/forgetsql/trunk/debian/copyright
packages/forgetsql/trunk/lib/forgetSQL.py
Modified: packages/forgetsql/trunk/bin/forgetsql-generate
===================================================================
--- packages/forgetsql/trunk/bin/forgetsql-generate 2010-01-27 15:32:31 UTC (rev 11355)
+++ packages/forgetsql/trunk/bin/forgetsql-generate 2010-01-27 16:37:54 UTC (rev 11356)
@@ -193,7 +193,7 @@
if options.output:
try:
# Override print.. dirty.
- sys.stdout = open(options.output, "w")
+ sys.stdout = open(output, "w")
except IOError, e:
print >>sys.stderr, "%s: %s" % (e.strerror, e.filename)
sys.exit(3)
@@ -220,10 +220,7 @@
else:
params = {}
if options.database:
- if options.dbmodule == "MySQLdb":
- params['db'] = options.database
- else:
- params['database'] = options.database
+ params['database'] = options.database
else:
print >>sys.stderr, "Missing required option --database or --connect"
sys.exit(7)
@@ -232,11 +229,7 @@
if options.username:
params['user'] = options.username
if options.password:
- if options.dbmodule == "MySQLdb":
- params['passwd'] = options.password
- else:
- params['password'] = options.password
-
+ params['password'] = options.password
connectstring = ", ".join(["%s=%r" % (key, value)
for (key,value) in params.items()
# filter out password for 'security reasons'
Modified: packages/forgetsql/trunk/debian/changelog
===================================================================
--- packages/forgetsql/trunk/debian/changelog 2010-01-27 15:32:31 UTC (rev 11355)
+++ packages/forgetsql/trunk/debian/changelog 2010-01-27 16:37:54 UTC (rev 11356)
@@ -19,10 +19,15 @@
* debian/control
- Added Homepage field.
- [ Raphael Hertzog ]
+ [ Raphaël Hertzog ]
* Remove myself from Uploaders.
+ * Switch to source format "3.0 (quilt)".
+ * Bump debian/compat to 5.
+ * Add missing ${misc:Depends}.
+ * Revert upstream changes and move them to separate quilt patches with
+ proper DEP-3 headers.
- -- Sandro Tosi <matrixhasu at gmail.com> Wed, 02 Jan 2008 18:32:29 +0100
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Wed, 27 Jan 2010 17:05:53 +0100
forgetsql (0.5.1-9) unstable; urgency=medium
Modified: packages/forgetsql/trunk/debian/compat
===================================================================
--- packages/forgetsql/trunk/debian/compat 2010-01-27 15:32:31 UTC (rev 11355)
+++ packages/forgetsql/trunk/debian/compat 2010-01-27 16:37:54 UTC (rev 11356)
@@ -1 +1 @@
-4
+5
Modified: packages/forgetsql/trunk/debian/control
===================================================================
--- packages/forgetsql/trunk/debian/control 2010-01-27 15:32:31 UTC (rev 11355)
+++ packages/forgetsql/trunk/debian/control 2010-01-27 16:37:54 UTC (rev 11356)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Morten Werner Olsen <werner at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python-dev (>= 2.3.5-10), python-support (>= 0.3)
+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/
@@ -12,7 +12,7 @@
Package: python-forgetsql
Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
Suggests: python-egenix-mxdatetime
Provides: ${python:Provides}
Conflicts: python2.3-forgetsql
Modified: packages/forgetsql/trunk/debian/copyright
===================================================================
--- packages/forgetsql/trunk/debian/copyright 2010-01-27 15:32:31 UTC (rev 11355)
+++ packages/forgetsql/trunk/debian/copyright 2010-01-27 16:37:54 UTC (rev 11356)
@@ -6,7 +6,7 @@
Upstream Author: Stian Soiland <stian at soiland.no>
-Copyright:
+Copyright: (c) Stian Søiland 2002-2003
GNU Lesser General Public License, version 2.1 at
/usr/share/common-licenses/LGPL-2.1.
Added: packages/forgetsql/trunk/debian/patches/fix-mysqldb-support
===================================================================
--- packages/forgetsql/trunk/debian/patches/fix-mysqldb-support (rev 0)
+++ packages/forgetsql/trunk/debian/patches/fix-mysqldb-support 2010-01-27 16:37:54 UTC (rev 11356)
@@ -0,0 +1,32 @@
+Description: Make forgetsql-generate work with the MySQLdb module
+Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324919#5
+Author: Cruz Fernandez <cruz at chuchuwa.com.ar>
+Bug-Debian: http://bugs.debian.org/324919
+
+--- forgetsql-0.5.1.orig/bin/forgetsql-generate
++++ forgetsql-0.5.1/bin/forgetsql-generate
+@@ -220,7 +220,10 @@ stdin or as a file using option --tables
+ else:
+ params = {}
+ if options.database:
+- params['database'] = options.database
++ if options.dbmodule == "MySQLdb":
++ params['db'] = options.database
++ else:
++ params['database'] = options.database
+ else:
+ print >>sys.stderr, "Missing required option --database or --connect"
+ sys.exit(7)
+@@ -229,7 +232,11 @@ stdin or as a file using option --tables
+ if options.username:
+ params['user'] = options.username
+ if options.password:
+- params['password'] = options.password
++ if options.dbmodule == "MySQLdb":
++ params['passwd'] = options.password
++ else:
++ params['password'] = options.password
++
+ connectstring = ", ".join(["%s=%r" % (key, value)
+ for (key,value) in params.items()
+ # filter out password for 'security reasons'
Added: packages/forgetsql/trunk/debian/patches/fix-output-option
===================================================================
--- packages/forgetsql/trunk/debian/patches/fix-output-option (rev 0)
+++ packages/forgetsql/trunk/debian/patches/fix-output-option 2010-01-27 16:37:54 UTC (rev 11356)
@@ -0,0 +1,16 @@
+Description: Make --output option work
+Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324917#5
+Author: Cruz Fernandez <cruz at chuchuwa.com.ar>
+Bug-Debian: http://bugs.debian.org/324917
+
+--- forgetsql-0.5.1.orig/bin/forgetsql-generate
++++ forgetsql-0.5.1/bin/forgetsql-generate
+@@ -193,7 +193,7 @@ stdin or as a file using option --tables
+ if options.output:
+ try:
+ # Override print.. dirty.
+- sys.stdout = open(output, "w")
++ sys.stdout = open(options.output, "w")
+ except IOError, e:
+ print >>sys.stderr, "%s: %s" % (e.strerror, e.filename)
+ sys.exit(3)
Added: packages/forgetsql/trunk/debian/patches/mark-unchanged-after-save
===================================================================
--- packages/forgetsql/trunk/debian/patches/mark-unchanged-after-save (rev 0)
+++ packages/forgetsql/trunk/debian/patches/mark-unchanged-after-save 2010-01-27 16:37:54 UTC (rev 11356)
@@ -0,0 +1,25 @@
+Description: Fix save to mark forgetter instances as unchanged
+ Forgetter instances that were changed were never marked as unchanged when
+ saved, resulting in unnecessary re-saves on subsequent calls to save() or
+ upon garbage collection. Patched forgetSQL.py to fix this.
+ .
+ Also drop useless shebang line as it's a module not a script.
+Origin: vendor, introduced by maintainer in 0.5.1-9
+Author: Morten Werner Olsen <werner at debian.org>
+
+--- forgetsql-0.5.1.orig/lib/forgetSQL.py
++++ forgetsql-0.5.1/lib/forgetSQL.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ __version__ = "0.5.1"
+
+@@ -667,6 +666,8 @@ My fields: %s""" % (selectfields, cls._s
+ # cursor.commit()
+ cursor.close()
+ self._new = False
++ # Make sure we don't think we're still modified after a save
++ self._changed = None
+
+ def getAll(cls, where=None, orderBy=None):
+ """Retrieves all the objects, possibly matching
Added: packages/forgetsql/trunk/debian/patches/series
===================================================================
--- packages/forgetsql/trunk/debian/patches/series (rev 0)
+++ packages/forgetsql/trunk/debian/patches/series 2010-01-27 16:37:54 UTC (rev 11356)
@@ -0,0 +1,3 @@
+fix-output-option
+fix-mysqldb-support
+mark-unchanged-after-save
Added: packages/forgetsql/trunk/debian/source/format
===================================================================
--- packages/forgetsql/trunk/debian/source/format (rev 0)
+++ packages/forgetsql/trunk/debian/source/format 2010-01-27 16:37:54 UTC (rev 11356)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/forgetsql/trunk/lib/forgetSQL.py
===================================================================
--- packages/forgetsql/trunk/lib/forgetSQL.py 2010-01-27 15:32:31 UTC (rev 11355)
+++ packages/forgetsql/trunk/lib/forgetSQL.py 2010-01-27 16:37:54 UTC (rev 11356)
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
__version__ = "0.5.1"
@@ -666,8 +667,6 @@
# cursor.commit()
cursor.close()
self._new = False
- # Make sure we don't think we're still modified after a save
- self._changed = None
def getAll(cls, where=None, orderBy=None):
"""Retrieves all the objects, possibly matching
More information about the Python-modules-commits
mailing list