[Python-modules-commits] r228 - in /packages/kid/trunk/debian: changelog control patches/no-setuptools.patch python-kid.docs python-kid.install python-kid.postinst python-kid.prerm python2.3-kid.docs python2.4-kid.docs rules

Tue Apr 18 14:07:35 UTC 2006

Author: hertzog
Date: Tue Apr 18 14:07:34 2006
New Revision: 228

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=228
Log:
Major changes to provide the module to all Python versions in a single package.
And new upstream version BTW.

Added:
    packages/kid/trunk/debian/python-kid.docs
    packages/kid/trunk/debian/python-kid.postinst
    packages/kid/trunk/debian/python-kid.prerm
Removed:
    packages/kid/trunk/debian/patches/no-setuptools.patch
    packages/kid/trunk/debian/python-kid.install
    packages/kid/trunk/debian/python2.3-kid.docs
    packages/kid/trunk/debian/python2.4-kid.docs
Modified:
    packages/kid/trunk/debian/changelog
    packages/kid/trunk/debian/control
    packages/kid/trunk/debian/rules

Modified: packages/kid/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/kid/trunk/debian/changelog?rev=228&op=diff
==============================================================================

--- packages/kid/trunk/debian/changelog (original)
+++ packages/kid/trunk/debian/changelog Tue Apr 18 14:07:34 2006
@@ -1,6 +1,11 @@
 kid (0.9.1-1) unstable; urgency=low
 
   * New upstream version.
+  * Updated watch file to really detect new upstream version.
+  * Use python-support to support all available python versions with a single
+    package. Thus removes python2.{3,4}-kid packages.
+  * Manually rename the egg-info directory to make it clearer that the egg
+    is available to all python versions. 
 
  -- Raphael Hertzog <hertzog at debian.org>  Mon, 17 Apr 2006 21:08:00 +0000
 

Modified: packages/kid/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/kid/trunk/debian/control?rev=228&op=diff
==============================================================================
--- packages/kid/trunk/debian/control (original)
+++ packages/kid/trunk/debian/control Tue Apr 18 14:07:34 2006
@@ -3,31 +3,12 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Raphael Hertzog <hertzog at debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.0), cdbs, python, python-dev, python-setuptools (>= 0.6a9), python-elementtree, python2.3, python2.3-dev, python2.4, python2.4-dev, python2.4-setuptools (>= 0.6a9), python2.4-elementtree
+Build-Depends-Indep: debhelper (>= 5.0.0), cdbs, python, python-dev, python-setuptools (>= 0.6a9), python-elementtree
 Standards-Version: 3.6.2
-
-Package: python2.3-kid
-Architecture: all
-Depends: ${python:Depends}, python2.3-elementtree
-Replaces: kid
-Description: simple Pythonic template language for XML based vocabularies
- Kid is a simple Pythonic template language for XML based vocabularies. It was
- spawned as a result of a kinky love triangle between XSLT, TAL, and PHP. We
- believe many of the best features of these languages live on in Kid with much
- of the limitations and complexity stamped out.
-
-Package: python2.4-kid
-Architecture: all
-Depends: ${python:Depends}, python2.4-elementtree
-Description: simple Pythonic template language for XML based vocabularies
- Kid is a simple Pythonic template language for XML based vocabularies. It was
- spawned as a result of a kinky love triangle between XSLT, TAL, and PHP. We
- believe many of the best features of these languages live on in Kid with much
- of the limitations and complexity stamped out.
 
 Package: python-kid
 Architecture: all
-Depends: ${python:Depends}
+Depends: python (>= 2.3), python (<< 2.5), python-support, python2.3-elementtree, python2.4-elementtree
 Replaces: kid
 Provides: kid
 Conflicts: kid

Added: packages/kid/trunk/debian/python-kid.docs
URL: http://svn.debian.org/wsvn/python-modules/packages/kid/trunk/debian/python-kid.docs?rev=228&op=file
==============================================================================
--- packages/kid/trunk/debian/python-kid.docs (added)
+++ packages/kid/trunk/debian/python-kid.docs Tue Apr 18 14:07:34 2006
@@ -1,0 +1,1 @@
+doc/*

Added: packages/kid/trunk/debian/python-kid.postinst
URL: http://svn.debian.org/wsvn/python-modules/packages/kid/trunk/debian/python-kid.postinst?rev=228&op=file
==============================================================================
--- packages/kid/trunk/debian/python-kid.postinst (added)
+++ packages/kid/trunk/debian/python-kid.postinst Tue Apr 18 14:07:34 2006
@@ -1,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ] && which update-python-modules >/dev/null 2>&1; then
+        update-python-modules -i /usr/share/python-support/kid
+fi
+

Added: packages/kid/trunk/debian/python-kid.prerm
URL: http://svn.debian.org/wsvn/python-modules/packages/kid/trunk/debian/python-kid.prerm?rev=228&op=file
==============================================================================
--- packages/kid/trunk/debian/python-kid.prerm (added)
+++ packages/kid/trunk/debian/python-kid.prerm Tue Apr 18 14:07:34 2006
@@ -1,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if which update-python-modules >/dev/null 2>&1; then
+        update-python-modules -c -i /usr/share/python-support/kid
+fi
+

Modified: packages/kid/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/kid/trunk/debian/rules?rev=228&op=diff
==============================================================================
--- packages/kid/trunk/debian/rules (original)
+++ packages/kid/trunk/debian/rules Tue Apr 18 14:07:34 2006
@@ -4,18 +4,22 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+# Install egg-info directories
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
-binary-post-install/python2.3-kid::
+UPSTREAM_VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
+PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
+
+binary-post-install/python-kid::
 # Remove scripts which are provided by python-kid and fix rights
-	rm -rf debian/python2.3-kid/usr/bin
-	find debian/python2.3-kid -name 'run.py' -o -name 'compile.py' | xargs chmod 755
+	find debian/python-kid -name 'run.py' -o -name 'compile.py' | xargs chmod 755
+	mkdir -p debian/python-kid/usr/share/python-support/kid/
+	mv debian/python-kid/usr/lib/python${PYVER}/site-packages/* debian/python-kid/usr/share/python-support/kid/
+	mv debian/python-kid/usr/share/python-support/kid/kid-${UPSTREAM_VERSION}-py${PYVER}.egg-info \
+	   debian/python-kid/usr/share/python-support/kid/kid-${UPSTREAM_VERSION}.egg-info
+	rm -rf debian/python-kid/usr/lib/
+
 	
-binary-post-install/python2.4-kid::
-# Remove scripts which are provided by python-kid and fix rights
-	rm -rf debian/python2.4-kid/usr/bin
-	find debian/python2.4-kid -name 'run.py' -o -name 'compile.py' | xargs chmod 755
-
 clean::
 # Hack to work around "setup.py clean" creating pyc files
 	find . -name \*.pyc -print0 | xargs -r0 rm


