[Python-modules-commits] r9684 - in packages/turbogears/trunk (15 files)
federico-guest at users.alioth.debian.org
federico-guest at users.alioth.debian.org
Sat Sep 5 20:09:15 UTC 2009
Date: Saturday, September 5, 2009 @ 20:09:14
Author: federico-guest
Revision: 9684
[svn-inject] Applying Debian modifications to trunk
Added:
packages/turbogears/trunk/debian/
packages/turbogears/trunk/debian/changelog
packages/turbogears/trunk/debian/compat
packages/turbogears/trunk/debian/control
packages/turbogears/trunk/debian/copyright
packages/turbogears/trunk/debian/patches/
packages/turbogears/trunk/debian/patches/01-autobuild.patch
packages/turbogears/trunk/debian/patches/02-sqlalchemy-default-if-no-correct-sqlobject.patch
packages/turbogears/trunk/debian/patches/03-sqlalchemy-identity-toolbox-fixup.patch
packages/turbogears/trunk/debian/patches/series
packages/turbogears/trunk/debian/pycompat
packages/turbogears/trunk/debian/python-turbogears.README.Debian
packages/turbogears/trunk/debian/python-turbogears.docs
packages/turbogears/trunk/debian/pyversions
packages/turbogears/trunk/debian/rules
Property changes on: packages/turbogears/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/turbogears/trunk/debian/changelog
===================================================================
--- packages/turbogears/trunk/debian/changelog (rev 0)
+++ packages/turbogears/trunk/debian/changelog 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,353 @@
+turbogears (1.0.8-2) unstable; urgency=low
+
+ * Orphaning package.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 16 Jun 2009 08:11:00 +0200
+
+turbogears (1.0.8-1) unstable; urgency=low
+
+ * New maintainer (Closes: #507790).
+ * Redone debian packaging from scratch.
+ * New upstream release (Closes: #503450).
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 11 Jan 2009 16:36:00 -0500
+
+turbogears (1.0.4.4-2) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Gustavo Noronha Silva ]
+ * Orphaning.
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 04 Dec 2008 11:27:52 -0200
+
+turbogears (1.0.4.4-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ - replaced the dependency on python-setuptools for a dependency on
+ python-pkg-resources (Closes: #468708)
+ * debian/control, debian/patches/01_disable_requirements.diff:
+ - no longer try to fight the dumb setuptools dependency stuff, we'll
+ just play along, providing the build system with all the runtime needs
+ * 03_sqlalchemy_identity_toolbox_fixup.diff:
+ - updated for new version
+ * debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+ - use the actual requirement expression which is defined in setup.py, instead
+ of hardcoding our own
+ * debian/control:
+ - removed the debian revision from all deps and build-deps which were
+ refering to -1 revisions
+ - updated turbokid's requirement to 1.0.4
+ - updated turbojson's requirement to 1.1.2
+ - updated python-dispatch's requirement to 0.5a.svn20080510
+ - updated sqlobject's requirement to 0.8
+ - accept patch by Vincent Bernat <bernat at debian.org> to fix celementtree
+ deps given that python 2.5 already has the module builtin (Closes: #476225)
+ * debian/patches/04_loosen_sqlobject_requirement.diff:
+ - make sqlobject requirement be >=0.8, so that it will work with the
+ version currently in unstable, with which it is supposed to work
+ (Closes: #479713, #478134)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 10 May 2008 18:08:44 -0300
+
+turbogears (1.0.4.3-1) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - uniforming Vcs-Browser field
+
+ [ Piotr Ożarowski ]
+ * Bump required python-pastescript version to 1.6.1.1-1 (Closes: #460258)
+
+ [ Gustavo Noronha Silva ]
+ * New upstream release (Closes: #462599, 463490)
+ * debian/control:
+ - remove -1 from setuptools' version requirement on build-deps
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 11 Feb 2008 00:08:02 -0200
+
+turbogears (1.0.4~b3-1) unstable; urgency=low
+
+ * New upstream release
+ - fixes quickstart (Closes: #457303)
+ * debian/patches/01_disable_requirements.diff,
+ debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+ - updated to the new version
+ * debian/patches/01_disable_requirements.diff:
+ - also hardcode the specific version requirement quickstart tries to
+ add for sqlobject and sqlalchemy, since we don't list the requirements
+ on setup.py
+ * debian/control:
+ - updated Standards-Version, no changes required
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 01 Jan 2008 19:16:34 -0200
+
+turbogears (1.0.4~b2-1) unstable; urgency=low
+
+ [ Piotr Ożarowski ]
+ * Vcs-Browser and Homepage fields added
+ * XS-Vcs-Svn field renamed to Vcs-Svn
+
+ [ Gustavo Noronha Silva ]
+ * New upstream release
+ - supports the new version of SQLAlchemy (Closes: #449588)
+ * debian/patches/01_disable_requirements.diff,
+ debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+ - patches updated for the new version
+ * debian/control:
+ - added python-elixir to Recommends
+
+ -- Gustavo Noronha Silva <kov at debian.org> Fri, 16 Nov 2007 18:41:56 -0200
+
+turbogears (1.0.3.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #439370, #434443)
+ - includes the xml.etree patch (Closes: #433192)
+ - includes fix for the mismatch between the identity model classes and
+ the tables used by toolbox (Closes: #415909)
+ * 01_disable_requirements.diff,
+ 02_sqlalchemy_default_if_no_correct_sqlobject.diff,
+ 03_sqlalchemy_identity_toolbox_fixup.diff:
+ - updated to match new version
+ * debian/patches/05_xml_etree.diff:
+ - removed; no longer needed, since it has been applied upstream
+ * debian/patches/04_keep_using_pyprotocols.diff, debian/control:
+ - removed; now we're able to use the newest python-decoratortools package;
+ - also depend on the new package, thus
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 15 Sep 2007 15:01:20 -0300
+
+turbogears (1.0.2.2-2) UNRELEASED; urgency=low
+
+ * debian/patches/05_xml_etree.diff: Try importing xml.etree from python2.5
+ and fall-back to elementtree if not available
+ (http://trac.turbogears.org/changeset/3262)
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 05 Aug 2007 23:17:29 -0400
+
+turbogears (1.0.2.2-1) unstable; urgency=low
+
+ * New upstream release
+ - includes fix for SA autocommit, which was not working because
+ the call was being optimized out;
+ See: http://trac.turbogears.org/changeset/2874
+ (Closes: #408358)
+ * debian/control:
+ - changed python-markup to python-genshi on Suggests, following the
+ upstream (and Debian package) rename (Closes: #419567)
+ - Build-Depends on python-support >= 0.6.4, which automatically renames
+ the egg-info directories to remove the python version number from their
+ names
+ - updated build-dependencies according to the python policy (python-support
+ and cdbs affected)
+ - updated dependencies according to the requirements expressed in setup.py
+ * debian/watch:
+ - added to watch for new versions
+ * debian/patches/01_disable_requirements.diff:
+ - updated according to the changes in upstream package
+ * debian/patches/04_keep_using_pyprotocols.diff:
+ - added; reverse change done upstream which makes TurboGears
+ depend on PEAK's peak.util.decorators module, which is not yet
+ packaged for Debian; since the change is minimal and doesn't seem
+ to affect other modules in TG, I decided to reverse it
+ * debian/rules:
+ - fixed pyversions script usage to only get the current default python
+ version, in order to rename the egg-info directory
+ - removed hack to rename the egg-info directory, since python-support
+ 0.6.4 already does this
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 12 May 2007 14:45:02 -0300
+
+turbogears (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 14 Feb 2007 23:33:00 -0200
+
+turbogears (1.0-1) unstable; urgency=medium
+
+ * New upstream release. 1.0 is here!
+ * debian/patches/01_disable_requirements.diff,
+ debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff:
+ - updated to match the new version
+ * debian/patches/04_sqlalchemy_fix_identity_relations.diff:
+ - removed; applied upstream
+ * debian/NEWS.Debian, debian/README.Debian:
+ - document changes and important information concerning upgrade
+ from the preview releases to the 1.0 stable release
+ * debian/control:
+ - moved python-support to Build-Depends, following lintian's advice
+ * urgency set to medium since this is basically the 1.0~b series
+ with bug fixes
+
+ -- Gustavo Noronha Silva <kov at debian.org> Fri, 5 Jan 2007 17:50:16 -0200
+
+turbogears (1.0~b1-4) UNRELEASED; urgency=low
+
+ * Added XS-Vcs-Svn field
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Thu, 23 Nov 2006 14:44:59 +0100
+
+turbogears (1.0~b1-3) unstable; urgency=high
+
+ * debian/README.Debian:
+ - updated to remove incorrect info on SQLObject and also to improve a little
+ on some descriptions (Closes: #398134)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 13 Nov 2006 22:42:19 -0200
+
+turbogears (1.0~b1-2) unstable; urgency=low
+
+ * debian/patches/04_sqlalchemy_fix_identity_relations.diff:
+ - added, grabbed from upstream to fix doubled relations declarations
+ canceling each other; patch from:
+ http://trac.turbogears.org/turbogears/changeset/1958#file1
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 8 Nov 2006 23:28:07 -0200
+
+turbogears (1.0~b1-1) unstable; urgency=low
+
+ * First TG beta release; first upload to unstable!
+ - no longer provides the docs HTMLs, for they are being worked on
+ the wiki and site; check them for the docs
+ * debian/python-turbogears.doc-base.docs:
+ - removed;
+ * debian/patches/01_disable_requirements.diff:
+ - updated for the new version
+ * debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff:
+ - make toolbox work when the project is using sqlalchemy + identity
+ * debian/README.Debian:
+ - document SQLAlchemy as default backend;
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 10 Sep 2006 22:09:57 -0300
+
+turbogears (0.9a9-1) experimental; urgency=low
+
+ [ Gustavo Noronha Silva ]
+ * New upstream release
+ * debian/patches/01_disable_requirements.diff:
+ - updated
+ * debian/patches/{02_fix_toolbox_configuration.diff,03_fix_admi18n.diff}:
+ - removed; fixes included in upstream code
+ * got the docs from the previous tarball since this new tarball does not
+ provide them;
+ * debian/control:
+ - added python-sqlalchemy as alternative to the development version of
+ SQLObject (Closes: #384415)
+ * debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+ - allow sqlalchemy to be the default ORM if the required SQLObject version
+ is not available; this may be allow me to upload TG to unstable this week
+ if no critical problems arise
+
+ [ Piotr Ozarowski ]
+ * Added SQLAlchemy to long description
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 26 Aug 2006 21:10:11 -0300
+
+turbogears (0.9a8-3) experimental; urgency=low
+
+ * debian/control:
+ - Recommend python-pysqlite2 (Closes: #381156)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 02 Aug 2006 23:33:35 -0300
+
+turbogears (0.9a8-2) experimental; urgency=low
+
+ * debian/patches/03_fix_admi18n.diff:
+ - added; fixes string collection and pot file generation in
+ admi18n - patch by Joseph Wenninger <jowenn at kde.org> grabbed from
+ the project's trac ticket #945
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 24 Jul 2006 19:51:11 -0300
+
+turbogears (0.9a8-1) experimental; urgency=low
+
+ * New upstream release (Closes: #379078)
+ * debian/patches/01_disable_requirements.diff:
+ - updated to the new version; also avoid using ez_setup, which would
+ require a newer setuptools which is not in Debian yet without the
+ need;
+ * debian/patches/02_project_start_py2.4.diff:
+ - removed; the TurboGears build system is now smart enough to auto
+ detect the Python version with which it was built
+ * debian/patches/02_fix_toolbox_configuration.diff:
+ - added; bug fix grabbed from the 1.0 branch of the upstream SVN;
+ avoids bug in the Identity framework code which would not allow
+ Catwalk to add users, and maybe more problems;
+ * debian/control:
+ - build-depend on python-all, for we will sometimes need
+ python2.4, instead of simply 'python'
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 22 Jul 2006 15:02:35 -0300
+
+turbogears (0.9a6-3) experimental; urgency=low
+
+ * debian/python-turbogears.install, debian/rules,
+ debian/python-turbogears.doc-base:
+ - install documentation, and replace the ${root} substitution variable
+ in the HTMLs for the absolute path of their 'root' when installed
+ (Closes: #378448)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 9 Jul 2006 15:33:40 -0300
+
+turbogears (0.9a6-2) experimental; urgency=low
+
+ * debian/control:
+ - fixed dependencies so that the sqlobject snapshot from experimental
+ is required, as well as the new python-policy conformant cheetah
+ * debian/patches/01_disable_turbocheetah.diff:
+ - removed in favor of 03_disable_sqlobject_requirement.diff
+ * debian/patches/01_disable_requirements.diff:
+ - added, do not honor setup.py requirements
+ - do not require stuff in setup.py
+ * debian/rules:
+ - remove hack to detect and apply changing the python hashbang (mainly
+ in the tg-admin script) since this appears to be taken care of by
+ python-support now
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 9 Jul 2006 15:16:10 -0300
+
+turbogears (0.9a6-1) experimental; urgency=low
+
+ * First 0.9 release for Debian
+ - supports the new Python Policy
+ * debian/control:
+ - updated dependencies; pastescript, formencode >= 0.5.1-2,
+ cherrypy >= 2.2.1, simplejson >= 1.3, ruledispatch, nose >= 0.8,
+ sqlobject >= 0.7.0-3, celementtree >= 1.0.5-6,
+ pastedeploy >= 0.5, paste, turbokid >= 0.9.6, turbojson >= 0.9.2,
+ cheetah (needed by quickstart);
+ - moved python and python-setuptools to build-deps, since they
+ are needed on clean
+ - fixed Homepage pseudo-header; thanks to Piotr Ozarowski for pointing
+ the relevant section of Developer's Reference
+ - updated build-dep to mention python-setuptools >= 0.6a11
+ - updated Standards-Version to 3.7.2
+ * debian/patches/00_avoid_deps_on_build.diff,
+ debian/patches/01_reloader_args_for_cherrypy2.2.diff:
+ - removed; no longer apply
+ * debian/patches/01_disable_turbocheetah.diff:
+ - added, to disable turbocheetah for now (there's no egg-info)
+ support for the package in Debian, and it is not required,
+ since we have kid
+ * debian/patches/02_project_start_py2.4.diff:
+ - updated
+ * debian/copyright:
+ - updated to mention the copyright information for the json
+ plugin
+ * debian/rules:
+ - fix permissions, so we don't have lots of file with the executable
+ bit set without the need for that
+ * debian/python-turbogears.{postinst,prerm}:
+ - removed; generated by dh_pysupport now
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 15 May 2006 21:59:06 -0300
+
+turbogears (0.8.9-1) UNRELEASED; urgency=low
+
+ * Initial Release (Closes: #338676)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 3 May 2006 22:52:25 -0300
Added: packages/turbogears/trunk/debian/compat
===================================================================
--- packages/turbogears/trunk/debian/compat (rev 0)
+++ packages/turbogears/trunk/debian/compat 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1 @@
+7
Added: packages/turbogears/trunk/debian/control
===================================================================
--- packages/turbogears/trunk/debian/control (rev 0)
+++ packages/turbogears/trunk/debian/control 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,30 @@
+Source: turbogears
+Section: python
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 7), quilt, python, python-all, python-cheetah, python-cherrypy (<< 3.0.0), python-configobj, python-decoratortools, python-dispatch, python-formencode, python-kid, python-nose, python-paste, python-pastedeploy, python-pastescript, python-setuptools, python-simplejson, python-sqlalchemy, python-sqlobject, python-support, python-turbokid, python-turbojson
+Standards-Version: 3.8.0
+Homepage: http://www.turbogears.org/
+Vcs-Browser: http://git.debian.net/?p=debian/turbogears.git
+Vcs-Git: git://git.debian.net/git/debian/turbogears.git
+
+Package: python-turbogears
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python, python-cheetah, python-cherrypy (<< 3.0.0), python-configobj, python-decoratortools, python-dispatch, python-formencode, python-kid, python-nose, python-paste, python-pastedeploy, python-pastescript, python-pkg-resources, python-simplejson, python-sqlalchemy | python-sqlobject, python-turbokid, python-turbojson
+Recommends: python-elixir, python-pysqlite2
+Suggests: python-genshi
+XB-Python-Version: ${python:Versions}
+Description: Python-based web framework
+ TurboGears takes the best components available and combines them into one
+ easy-to-install, documented whole. TurboGears includes parts that join the
+ pieces together and make them work together seamlessly, but doesn't obscure
+ each included project. This allows you to take advantage of all existing
+ documentation, articles, mailing lists and other resources that have built up
+ in the communities for each project.
+ .
+ TurboGears glues together the following components:
+ .
+ * CherryPy
+ * SQLObject/SQLAlchemy
+ * Kid
+ * Mochikit
Added: packages/turbogears/trunk/debian/copyright
===================================================================
--- packages/turbogears/trunk/debian/copyright (rev 0)
+++ packages/turbogears/trunk/debian/copyright 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,44 @@
+Author: Kevin Dangoor <dangoor+turbogears at gmail.com>
+Download: http://www.turbogears.org/download/filelist.html
+
+Files: *
+Copyright: (C) 2005-2008 Kevin Dangoor <dangoor+turbogears at gmail.com>
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
Added: packages/turbogears/trunk/debian/patches/01-autobuild.patch
===================================================================
--- packages/turbogears/trunk/debian/patches/01-autobuild.patch (rev 0)
+++ packages/turbogears/trunk/debian/patches/01-autobuild.patch 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,14 @@
+Author: Gustavo Noronha Silva <kov at debian.org>
+Description: Don't check module dependencies during build.
+
+diff -Naurp turbogears.orig/setup.py turbogears/setup.py
+--- turbogears.orig/setup.py 2008-12-17 07:31:53.000000000 +0000
++++ turbogears/setup.py 2009-01-12 03:30:33.000000000 +0000
+@@ -1,5 +1,5 @@
+-from ez_setup import use_setuptools
+-use_setuptools()
++#from ez_setup import use_setuptools
++#use_setuptools()
+ from setuptools import setup, find_packages
+ from pkg_resources import DistributionNotFound
+
Added: packages/turbogears/trunk/debian/patches/02-sqlalchemy-default-if-no-correct-sqlobject.patch
===================================================================
--- packages/turbogears/trunk/debian/patches/02-sqlalchemy-default-if-no-correct-sqlobject.patch (rev 0)
+++ packages/turbogears/trunk/debian/patches/02-sqlalchemy-default-if-no-correct-sqlobject.patch 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,28 @@
+Author: Gustavo Noronha Silva <kov at debian.org>
+Description: Debian hack to make sqlalchemy the default if the required version of sqlobject is not available.
+
+diff -Naurp turbogears.orig/turbogears/command/quickstart.py turbogears/turbogears/command/quickstart.py
+--- turbogears.orig/turbogears/command/quickstart.py 2008-12-17 07:31:52.000000000 +0000
++++ turbogears/turbogears/command/quickstart.py 2009-01-12 03:45:26.000000000 +0000
+@@ -135,9 +135,19 @@ class quickstart:
+ parser = optparse.OptionParser(
+ usage="%prog quickstart [options] [project name]",
+ version="%prog " + version)
++ # Debian hack to make sqlalchemy the default if the
++ # required version of sqlobject is not available
++ try:
++ pkg_resources.require (str(get_requirement('sqlobject')))
++ debsqlalchemy = False
++ except:
++ print 'Warning: using SQLAlchemy since your version of SQLObject does not meet the requirements: ',
++ print str(get_requirement('sqlobject'))
++ debsqlalchemy = True
+ parser.add_option("-s", "--sqlalchemy",
+- help="use SQLAlchemy instead of SQLObject",
+- action="store_true", dest="sqlalchemy", default = False)
++ help="use SQLAlchemy instead of SQLObject",
++ action="store_true", dest="sqlalchemy", default = debsqlalchemy)
++ # end of Debian hack
+ parser.add_option("-e", "--elixir",
+ help="use SQLAlchemy Elixir instead of SQLObject",
+ action="store_true", dest="elixir", default = False)
Added: packages/turbogears/trunk/debian/patches/03-sqlalchemy-identity-toolbox-fixup.patch
===================================================================
--- packages/turbogears/trunk/debian/patches/03-sqlalchemy-identity-toolbox-fixup.patch (rev 0)
+++ packages/turbogears/trunk/debian/patches/03-sqlalchemy-identity-toolbox-fixup.patch 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,32 @@
+Author: Gustavo Noronha Silva <kov at debian.org>
+Description: Disable tools which need SQLObject if it is not being used.
+
+diff -Naurp turbogears.orig/turbogears/command/base.py turbogears/turbogears/command/base.py
+--- turbogears.orig/turbogears/command/base.py 2008-12-17 07:31:52.000000000 +0000
++++ turbogears/turbogears/command/base.py 2009-01-12 03:49:21.000000000 +0000
+@@ -51,6 +51,8 @@ class CommandWithDB(object):
+ development or installed project."""
+ load_project_config(self.config)
+ self.dburi = config.get("sqlobject.dburi", None)
++ if not self.dburi:
++ self.dburi = config.get("sqlalchemy.dburi", None)
+ if self.dburi and self.dburi.startswith("notrans_"):
+ self.dburi = self.dburi[8:]
+
+@@ -304,8 +306,14 @@ class ToolboxCommand(CommandWithDB):
+ if 'global' in conf:
+ config.update({'global': conf['global']})
+
+- root = SecureObject(toolbox.Toolbox(), from_any_host(self.hostlist),
+- exclude=['noaccess'])
++ tb = toolbox.Toolbox()
++ # Disable tools which need SQLObject if it is not being used
++ if conf.get('global').get('sqlobject.dburi', None) is None:
++ for tool in tb.toolbox:
++ if tool['label'] == 'CatWalk' or tool['label'] == 'ModelDesigner':
++ tool['disabled'] = True
++ root = SecureObject(tb, from_any_host(self.hostlist),
++ exclude=['noaccess'])
+
+ cherrypy.tree.mount(root, "/")
+
Added: packages/turbogears/trunk/debian/patches/series
===================================================================
--- packages/turbogears/trunk/debian/patches/series (rev 0)
+++ packages/turbogears/trunk/debian/patches/series 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,3 @@
+01-autobuild.patch
+02-sqlalchemy-default-if-no-correct-sqlobject.patch
+03-sqlalchemy-identity-toolbox-fixup.patch
Added: packages/turbogears/trunk/debian/pycompat
===================================================================
--- packages/turbogears/trunk/debian/pycompat (rev 0)
+++ packages/turbogears/trunk/debian/pycompat 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1 @@
+2
Added: packages/turbogears/trunk/debian/python-turbogears.README.Debian
===================================================================
--- packages/turbogears/trunk/debian/python-turbogears.README.Debian (rev 0)
+++ packages/turbogears/trunk/debian/python-turbogears.README.Debian 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,113 @@
+turbogears for Debian
+---------------------
+
+1. Introduction
+
+This is the packaging of TurboGears for Debian. Lots of thought are needed on
+how to best package aditional widgets, extensions and specially applications. If
+you have comments or ideas, please send them to the maintainers email address.
+
+2. SQLObject vs SQLAlchemy
+
+SQLObject is the default ORM used by TurboGears; For the Debian
+packaging we are providing patches which make using SQLAlchemy as the
+primary ORM saner, though TG will prefer SQLObject if a working
+version is installed.
+
+3. Toolbox
+
+Two of the Toolbox tools are disabled if you're using SQLAlchemy, for
+they are not suppored by that backend yet: Catwalk and
+ModelDesigner. Yeah, I know. You can take advantage of those tools by
+installing and using SQLObject.
+
+4. Upgrading from Preview versions
+
+4.1. Visit framework model change
+
+This is the first stable release of TurboGears. Those who have been
+using the preview versions will probably have already quickstarted
+their applications using an earlier version. If you did so before
+the 1.0b2 version (any Debian package version, in summary) and use
+SQLObject with the Identity framework you will hit the following
+problem when starting your applications under this release:
+
+-- code starts here --
+ [...]
+ File "turbogears/visit/api.py", line 144, in before_main
+ visit= _manager.new_visit_with_key( visit_key )
+ File "turbogears/visit/sovisit.py", line 44, in new_visit_with_key
+ visit= visit_class( visit_key=visit_key,
+ expiry=datetime.now() + self.timeout )
+ File "sqlobject/declarative.py", line 94, in _wrapper
+ return fn(self, *args, **kwargs)
+ File "sqlobject/main.py", line 1214, in __init__
+ self._create(id, **kw)
+ File "sqlobject/main.py", line 1235, in _create
+ raise TypeError, "%s() did not get expected keyword argument %s" % \
+ (self.__class__.__name__, column.name)
+ TypeError: VisitIdentity() did not get expected keyword argument user_id
+-- code ends here --
+
+This is because the Visit framework model has been modified in the
+1.0b2 version, which eventually evolved into 1.0 proper. You will have
+to edit your model.py file manually. The VisitIdentity class became
+Visit, and has the following definition:
+
+-- code starts here --
+ class Visit(SQLObject):
+ class sqlmeta:
+ table = "visit"
+
+ visit_key = StringCol(length=40, alternateID=True,
+ alternateMethodName="by_visit_key")
+ created = DateTimeCol(default=datetime.now)
+ expiry = DateTimeCol()
+
+ def lookup_visit(cls, visit_key):
+ try:
+ return cls.by_visit_key(visit_key)
+ except SQLObjectNotFound:
+ return None
+ lookup_visit = classmethod(lookup_visit)
+-- code ends here --
+
+After adding that to your model.py go to the
+<application>/config/app.cfg configuration file and change the
+visit.soprovider.model setting to point to <application>.model.Visit.
+Don't forget to run `tg-admin sql create' after you do all that
+to have the new table created in your database.
+
+This information has been gathered from Christopher Arndt's blog:
+http://paddyland.serveblog.net/article/14. Thanks! This information
+will probably show up afterwards at:
+
+ http://www.turbogears.org/download/upgrade.html
+
+4.2. Problems viewing kid templates
+
+You may also hit the following problem:
+
+-- code starts here --
+ [...]
+ File "/var/lib/python-support/python2.4/kid/filter.py", line 28, in apply_matches
+ item = stream.expand()
+ File "/var/lib/python-support/python2.4/kid/parser.py", line 103, in expand
+ for ev, item in self._iter:
+ File "/var/lib/python-support/python2.4/kid/parser.py", line 174, in _track
+ for p in stream:
+ File "/var/lib/python-support/python2.4/kid/parser.py", line 218, in _coalesce
+ for ev, item in stream:
+ File "/home/kov/src/application/application/templates/mytemplate.py", line 37, in _pull
+ TypeError: generate_content() takes exactly 1 argument (2 given)
+-- code ends here --
+
+This happens simply because your 'compiled' templates are incompatible
+with a newer kid version; all you need to do is remove all the .pyc
+files from the templates directory:
+
+ $ rm <aplication>/templates/*pyc
+
+This should make it work again.
+
+ -- Gustavo Noronha Silva <kov at debian.org> Fri, 5 Jan 2007 17:38:18 -0200
Added: packages/turbogears/trunk/debian/python-turbogears.docs
===================================================================
--- packages/turbogears/trunk/debian/python-turbogears.docs (rev 0)
+++ packages/turbogears/trunk/debian/python-turbogears.docs 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1 @@
+CONTRIBUTORS.txt
Added: packages/turbogears/trunk/debian/pyversions
===================================================================
--- packages/turbogears/trunk/debian/pyversions (rev 0)
+++ packages/turbogears/trunk/debian/pyversions 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1 @@
+2.4-
Added: packages/turbogears/trunk/debian/rules
===================================================================
--- packages/turbogears/trunk/debian/rules (rev 0)
+++ packages/turbogears/trunk/debian/rules 2009-09-05 20:09:14 UTC (rev 9684)
@@ -0,0 +1,45 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+clean: clean-patched unpatch
+clean-patched: patch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ python setup.py clean
+ rm -rf dist build TurboGears.egg-info
+
+ dh_clean
+
+build:
+
+install: patch
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/python-turbogears --install-lib /usr/share/python-support/python-turbogears
+
+ find debian/python-turbogears -type f -name "*.pyc" | xargs rm -f
+
+binary: binary-indep
+
+binary-arch:
+
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGELOG.txt
+ dh_installdocs
+ dh_pysupport
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+.PHONY: clean build install binary binary-arch binary-indep
Property changes on: packages/turbogears/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
More information about the Python-modules-commits
mailing list