[Python-modules-commits] r8840 - in packages/tg.devtools/trunk/debian (5 files)

[zack at users.alioth.debian.org]

    Date: Sunday, June 21, 2009 @ 14:22:56
  Author: zack
Revision: 8840

* debian/patches/
  - add new patches avoid-catwalk-dep and no-auth-by-default to loosen
    Catwalk needs, which is enabled only when auth support is enabled
* debian/control: recommends python-catwalk (needed when auth is enabled)

Added:
  packages/tg.devtools/trunk/debian/patches/avoid-catwalk-dep.dpatch
  packages/tg.devtools/trunk/debian/patches/no-auth-by-default.dpatch
Modified:
  packages/tg.devtools/trunk/debian/changelog
  packages/tg.devtools/trunk/debian/control
  packages/tg.devtools/trunk/debian/patches/00list

Modified: packages/tg.devtools/trunk/debian/changelog
===================================================================
--- packages/tg.devtools/trunk/debian/changelog	2009-06-20 15:11:02 UTC (rev 8839)
+++ packages/tg.devtools/trunk/debian/changelog	2009-06-21 14:22:56 UTC (rev 8840)
@@ -1,3 +1,12 @@
+tg.devtools (2.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/
+    - add new patches avoid-catwalk-dep and no-auth-by-default to loosen
+      Catwalk needs, which is enabled only when auth support is enabled
+  * debian/control: recommends python-catwalk (needed when auth is enabled)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 21 Jun 2009 13:29:13 +0200
+
 tg.devtools (2.0-1) experimental; urgency=low
 
   * First release (Closes: #531848)

Modified: packages/tg.devtools/trunk/debian/control
===================================================================
--- packages/tg.devtools/trunk/debian/control	2009-06-20 15:11:02 UTC (rev 8839)
+++ packages/tg.devtools/trunk/debian/control	2009-06-21 14:22:56 UTC (rev 8840)
@@ -33,6 +33,7 @@
  python-sqlalchemy (>= 0.5),
  python-repoze.what-plugins,
  python-repoze.who
+Recommends: python-catwalk (>= 2.0.2)
 Description: developer tools for the TurboGears web framework
  TurboGears2 is a framework to develop web applications in Python,
  following a model-view-controller architecture.

Modified: packages/tg.devtools/trunk/debian/patches/00list
===================================================================
--- packages/tg.devtools/trunk/debian/patches/00list	2009-06-20 15:11:02 UTC (rev 8839)
+++ packages/tg.devtools/trunk/debian/patches/00list	2009-06-21 14:22:56 UTC (rev 8840)
@@ -1 +1,3 @@
 fix-template-shebang
+no-auth-by-default
+avoid-catwalk-dep

Added: packages/tg.devtools/trunk/debian/patches/avoid-catwalk-dep.dpatch
===================================================================
--- packages/tg.devtools/trunk/debian/patches/avoid-catwalk-dep.dpatch	                        (rev 0)
+++ packages/tg.devtools/trunk/debian/patches/avoid-catwalk-dep.dpatch	2009-06-21 14:22:56 UTC (rev 8840)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## avoid-catwalk-dep.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix to avoid declaring a useless dep on Catwalk, if auth
+## DP: support has not been requested on a given project.
+
+ at DPATCH@
+diff -urNad trunk~/devtools/templates/turbogears/setup.py_tmpl trunk/devtools/templates/turbogears/setup.py_tmpl
+--- trunk~/devtools/templates/turbogears/setup.py_tmpl	2009-03-16 23:57:55.000000000 +0100
++++ trunk/devtools/templates/turbogears/setup.py_tmpl	2009-06-21 13:26:40.663854382 +0200
+@@ -15,7 +15,9 @@
+     #url='',
+     install_requires=[
+         "TurboGears2 >= 2.0b7",
++        {{if auth == "sqlalchemy"}}
+         "Catwalk >= 2.0.2",
++        {{endif}}
+         "Babel >=0.9.4",
+         {{if sqlalchemy}}
+         "zope.sqlalchemy >= 0.4 ",


Property changes on: packages/tg.devtools/trunk/debian/patches/avoid-catwalk-dep.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/tg.devtools/trunk/debian/patches/no-auth-by-default.dpatch
===================================================================
--- packages/tg.devtools/trunk/debian/patches/no-auth-by-default.dpatch	                        (rev 0)
+++ packages/tg.devtools/trunk/debian/patches/no-auth-by-default.dpatch	2009-06-21 14:22:56 UTC (rev 8840)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-auth-by-default.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change the default of the auth query to "no". If needed, auth
+## DP: support should be explicitly requested at quickstart time.
+
+ at DPATCH@
+diff -urNad trunk~/devtools/commands/quickstart.py trunk/devtools/commands/quickstart.py
+--- trunk~/devtools/commands/quickstart.py	2009-03-05 00:34:07.000000000 +0100
++++ trunk/devtools/commands/quickstart.py	2009-06-21 13:18:32.515854157 +0200
+@@ -142,9 +142,9 @@
+             while self.auth is None:
+                 self.auth = raw_input(
+                     "Do you need authentication and authorization"
+-                    " in this project? [yes] ")
++                    " in this project? [no] ")
+                 self.auth = dict(y=True, n=False).get(
+-                    self.auth.lstrip()[:1].lower() or 'y')
++                    self.auth.lstrip()[:1].lower() or 'n')
+                 if self.auth is None:
+                     print "Please enter y(es) or n(o)."
+ 


Property changes on: packages/tg.devtools/trunk/debian/patches/no-auth-by-default.dpatch
___________________________________________________________________
Added: svn:executable
   + *