[Python-modules-commits] r966 - in /packages/turbogears/branches/0.9/debian: changelog control python-turbogears.postinst python-turbogears.prerm rules

Tue Jun 20 03:16:49 UTC 2006

Author: kov
Date: Tue Jun 20 03:16:48 2006
New Revision: 966

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=966
Log:
preparing a version supporting the new Python Policy

Removed:
    packages/turbogears/branches/0.9/debian/python-turbogears.postinst
    packages/turbogears/branches/0.9/debian/python-turbogears.prerm
Modified:
    packages/turbogears/branches/0.9/debian/changelog
    packages/turbogears/branches/0.9/debian/control
    packages/turbogears/branches/0.9/debian/rules

Modified: packages/turbogears/branches/0.9/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/branches/0.9/debian/changelog?rev=966&op=diff
==============================================================================

--- packages/turbogears/branches/0.9/debian/changelog (original)
+++ packages/turbogears/branches/0.9/debian/changelog Tue Jun 20 03:16:48 2006
@@ -1,22 +1,21 @@
-turbogears (0.9a6-1) experimental; urgency=low
+turbogears (0.9a6-1) UNRELEASED; urgency=low
 
   * First 0.9 release for Debian
+  - supports the new Python Policy
   * debian/control:
-  - updated dependencies; pastescript, formencode >= 0.5.1,
+  - updated dependencies; pastescript, formencode >= 0.5.1-2,
     cherrypy >= 2.2.1, simplejson >= 1.3, ruledispatch, nose >= 0.8,
-    sqlobject >= 0.7.0.really.0.7.1, celementtree >= 1.0.5-2.1,
+    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);
-    some with the generic name, some with the specific (2.4) version
-    needed;
   - 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 0.7.2
+  - updated Standards-Version to 3.7.2
   * debian/patches/00_avoid_deps_on_build.diff,
-    debian/patches/01_reloader_args_for_cherrypy2.2}.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)
@@ -28,12 +27,10 @@
   - updated to mention the copyright information for the json
     plugin
   * debian/rules:
-  - do not use python-distutils cdbs class, run setup by hand
-    so creating the three packages will work
   - 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}:
-  - renamed the turbogears directory for python-support;
+  - removed; generated by dh_pysupport now
 
  -- Gustavo Noronha Silva <kov at debian.org>  Mon, 15 May 2006 21:59:06 -0300
 

Modified: packages/turbogears/branches/0.9/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/branches/0.9/debian/control?rev=966&op=diff
==============================================================================
--- packages/turbogears/branches/0.9/debian/control (original)
+++ packages/turbogears/branches/0.9/debian/control Tue Jun 20 03:16:48 2006
@@ -3,13 +3,16 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), python, python2.4-setuptools (>= 0.6a11-1)
-Build-Depends-Indep: python2.4-dev
+Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.1), python, python-setuptools (>= 0.6b3-1)
+Build-Depends-Indep: python-support (>= 0.2.3)
 Standards-Version: 3.7.2
+XS-Python-Standards-Version: 0.4
+XS-Python-Version: all, >= 2.4
 
 Package: python-turbogears
 Architecture: all
-Depends: python (>= 2.4) | python2.4, python (<< 2.5) | python2.4, python-support, python-cherrypy (>= 2.2.1), python-kid (>= 0.8), python2.4-sqlobject (>= 0.7.0.really.0.7.1), python2.4-celementtree (>= 1.0.5-2.1), python-elementtree (>= 1.2.6), python2.4-formencode (>= 0.5.1), python-pastedeploy (>= 0.5), python-pastescript (>= 0.5.1), python-paste, python-simplejson (>= 1.3), python-configobj (>= 4.3.0), python-dispatch, python-nose (>= 0.8), python-turbokid (>= 0.9.5), python-turbojson (>= 0.9.2), python2.4-cheetah, python2.4-setuptools (>= 0.6a9-1)
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python-cherrypy (>= 2.2.1), python-kid (>= 0.8), python-sqlobject (>= 0.7.0-3), python-celementtree (>= 1.0.5-6), python-elementtree (>= 1.2.6-9), python-formencode (>= 0.5.1-2), python-pastedeploy (>= 0.5), python-pastescript (>= 0.5.1), python-paste, python-simplejson (>= 1.3), python-configobj (>= 4.3.0), python-dispatch, python-nose (>= 0.8), python-turbokid (>= 0.9.5), python-turbojson (>= 0.9.2), python2.4-cheetah, python-setuptools (>= 0.6b3-1)
 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

Modified: packages/turbogears/branches/0.9/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/branches/0.9/debian/rules?rev=966&op=diff
==============================================================================
--- packages/turbogears/branches/0.9/debian/rules (original)
+++ packages/turbogears/branches/0.9/debian/rules Tue Jun 20 03:16:48 2006
@@ -1,22 +1,20 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_SYSTEM := pysupport
+
 include /usr/share/cdbs/1/rules/buildcore.mk
-# python-distutils before debhelper to avoid it calling dh_python
-# itself
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed  --install-lib usr/share/python-support/python-turbogears
 
-clean::
-	# hack (CDBS bug -- see #300149)
-	-rm -rf build
-	-find . -name '*.py[co]' -exec rm {} \;
+PYVER=$(shell pyversions -vr 'current')
 
 binary-post-install/python-turbogears::
 	find debian/python-turbogears/usr/share/python-support/ -type f \
 		-exec chmod a-x {} \;
 	install -D -o root -g root -m 644 debian/python-support.version \
 		debian/python-turbogears/usr/share/python-support/python-turbogears/.version
-	sed -i 's,/usr/bin/python,/usr/bin/python2.4,g' debian/python-turbogears/usr/bin/tg-admin
+	test "${PYVER}" = "2.3" && \
+		sed -i 's,/usr/bin/python,/usr/bin/python2.4,g' debian/python-turbogears/usr/bin/tg-admin


