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

kov at users.alioth.debian.org kov at users.alioth.debian.org
Mon May 15 00:11:06 UTC 2006 

Author: kov
Date: Mon May 15 00:11:05 2006
New Revision: 621

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=621
Log:
removing python-turbo{kid,json} packaging; they have their
own source packages now

Removed:
    packages/turbogears/branches/0.9/debian/python-turbojson.postinst
    packages/turbogears/branches/0.9/debian/python-turbojson.prerm
    packages/turbogears/branches/0.9/debian/python-turbokid.postinst
    packages/turbogears/branches/0.9/debian/python-turbokid.prerm
Modified:
    packages/turbogears/branches/0.9/debian/changelog
    packages/turbogears/branches/0.9/debian/control
    packages/turbogears/branches/0.9/debian/copyright
    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=621&op=diff
==============================================================================
--- packages/turbogears/branches/0.9/debian/changelog (original)
+++ packages/turbogears/branches/0.9/debian/changelog Mon May 15 00:11:05 2006
@@ -5,10 +5,9 @@
   - updated dependencies; pastescript, formencode >= 0.5.1,
     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,
-    pastedeploy >= 0.5, paste;
+    pastedeploy >= 0.5, paste, turbokid >= 0.9.6, turbojson => 0.9.2;
     some with the generic name, some with the specific (2.4) version
     needed;
-  - added python-turbo{kid,json} packages
   - moved python and python-setuptools to build-deps, since they
     are needed on clean
   - fixed Homepage pseudo-header; thanks to Piotr Ozarowski for pointing
@@ -29,9 +28,8 @@
   * debian/rules:
   - do not use python-distutils cdbs class, run setup by hand
     so creating the three packages will work
-  * debian/python-turbo{gears,kid,json}.{postinst,prerm}:
+  * debian/python-turbogears.{postinst,prerm}:
   - renamed the turbogears directory for python-support;
-  - register and unregister turbo{kid,json} on python-support;
 
  -- Gustavo Noronha Silva <kov at debian.org>  Sat, 13 May 2006 18:59:40 -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=621&op=diff
==============================================================================
--- packages/turbogears/branches/0.9/debian/control (original)
+++ packages/turbogears/branches/0.9/debian/control Mon May 15 00:11:05 2006
@@ -9,7 +9,7 @@
 
 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), python2.4-setuptools (>= 0.6a9-1)
+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-setuptools (>= 0.6a9-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
@@ -27,21 +27,3 @@
   * Mochikit
  .
   Homepage: http://www.turbogears.org/
-
-Package: python-turbokid
-Architecture: all
-Depends: python (>= 2.3), python (<< 2.5), python-support, python-kid (>= 0.8)
-Description: TurboGears template plugin that supports Kid templates
- This package enables the use of kid templates in the TurboGears
- megaframework.
- .
-  Homepage: http://www.turbogears.org/
-
-Package: python-turbojson
-Architecture: all
-Depends: python (>= 2.3), python (<< 2.5), python-support
-Description: TurboGears template plugin that supports json
- This package enables the use of json templates in the TurboGears
- megaframework.
- .
-  Homepage: http://www.turbogears.org/

Modified: packages/turbogears/branches/0.9/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/branches/0.9/debian/copyright?rev=621&op=diff
==============================================================================
--- packages/turbogears/branches/0.9/debian/copyright (original)
+++ packages/turbogears/branches/0.9/debian/copyright Mon May 15 00:11:05 2006
@@ -9,11 +9,6 @@
 
 Copyright (c) 2005, 2006 Kevin Dangoor and contributors.
 TurboGears is a trademark of Kevin Dangoor.
-
-The TurboJson plugin, available under plugins/json has the
-following copyright:
-
-Copyright (c) 2005 Elvelind Grandin
 
 License:
 

Modified: packages/turbogears/branches/0.9/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/branches/0.9/debian/rules?rev=621&op=diff
==============================================================================
--- packages/turbogears/branches/0.9/debian/rules (original)
+++ packages/turbogears/branches/0.9/debian/rules Mon May 15 00:11:05 2006
@@ -1,38 +1,21 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/buildcore.mk
+# python-distutils before debhelper to avoid it calling dh_python
+# itself
+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 --no-compile -O0
 DEB_PYTHON_INSTALL_ARGS_python-turbogears = --install-lib usr/share/python-support/python-turbogears
-DEB_PYTHON_INSTALL_ARGS_python-turbokid = --install-lib usr/share/python-support/python-turbokid
-DEB_PYTHON_INSTALL_ARGS_python-turbojson = --install-lib usr/share/python-support/python-turbojson
-
-DEB_PYTHON_REAL_LIB_PACKAGES :=
-DEB_PYTHON_SIMPLE_PACKAGES := python-turbogears
 
 clean::
 	# hack (CDBS bug -- see #300149)
-	-rm -rf build build-kid build-json
+	-rm -rf build
 	-find . -name '*.py[co]' -exec rm {} \;
-
-build/python-turbogears::
-	python setup.py build --build-base="$(CURDIR)/build"
-install/python-turbogears::
-	python setup.py install --root=debian/python-turbogears $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_python-turbogears)
-
-build/python-turbokid::
-	cd plugins/kid && python setup.py build --build-base="$(CURDIR)/build-kid"
-install/python-turbokid::
-	cd plugins/kid && python setup.py install --root=../../debian/python-turbokid $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_python-turbokid)
-
-build/python-turbojson::
-	cd plugins/json && python setup.py build --build-base="$(CURDIR)/build-json"
-install/python-turbojson::
-	cd plugins/json && python setup.py install --root=../../debian/python-turbojson $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_python-turbojson)
 
 binary-post-install/python-turbogears::
 	install -D -o root -g root -m 644 debian/python-support.version \
-		debian/python-turbogears/usr/share/python-support/turbogears/.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

More information about the Python-modules-commits mailing list