Hi Ross, I reworked my patch for kid-0.9 following the latest discussions on debian-python and now I use setuptools to install the modules but instead of providing eggs, I provide regular modules with egg meta-info in a separate directory (so that the user can still use eggs and have the system detect that he has kid installed).
I had to make some more changes because of that (mainly remove the auto-generated scripts and fix some lintian warnings). You didn't reply to my previous mail yet. Is the patch OK ? Since you're listed on http://wiki.debian.org/LowThresholdNmu I'll probably make an NMU soon ... but I'd prefer to have your agreement since the changes are important (new usptream version, renaming, creation of a new package, etc.). Cheers, -- Raphaël Hertzog -+- http://www.ouaza.com Freexian : des développeurs Debian au service des entreprises http://www.freexian.com
diff -urN ../kid-0.8/debian/changelog debian/changelog --- ../kid-0.8/debian/changelog 2006-03-25 20:54:36.000000000 +0000 +++ debian/changelog 2006-03-29 07:18:34.000000000 +0000 @@ -1,3 +1,18 @@ +kid (0.9-0.1) unstable; urgency=low + + * NMU. + * New upstream release. Closes: #359012 + * Create 3 packages python2.3-kid, python2.4-kid, and python-kid depending + on python2.3-kid and providing the 2 binaries with their manpages. + * Make python2.3-kid and python-kid replaces the old "kid" package. + * Make python-kid provides kid to ease the upgrade from the old package + name. And conflicts on it so that it gets removed. + * Use setuptools now to install the package so that we can install the egg + meta-data and make them available to the users. That's why we + build-depends on python-setuptools (>= 0.6a9). + + -- Raphael Hertzog <[EMAIL PROTECTED]> Wed, 29 Mar 2006 06:43:53 +0000 + kid (0.8-1) unstable; urgency=low * New upstream release (closes: #338276) diff -urN ../kid-0.8/debian/control debian/control --- ../kid-0.8/debian/control 2006-03-25 20:54:36.000000000 +0000 +++ debian/control 2006-03-29 07:31:56.000000000 +0000 @@ -2,12 +2,34 @@ Section: python Priority: optional Maintainer: Ross Burton <[EMAIL PROTECTED]> -Build-Depends-Indep: debhelper (>= 4.1.0), cdbs, python, python-dev, python-setuptools, python-elementtree +Build-Depends-Indep: debhelper (>= 4.1.0), cdbs, python, python-dev, python-setuptools (>= 0.6a9), python-elementtree, python2.4, python2.4-dev, python2.4-setuptools (>= 0.6a9), python2.4-elementtree Standards-Version: 3.6.2 -Package: kid +Package: python2.3-kid Architecture: all -Depends: ${python:Depends}, python-elementtree +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} +Replaces: kid +Provides: kid +Conflicts: 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 diff -urN ../kid-0.8/debian/docs debian/docs --- ../kid-0.8/debian/docs 2006-03-25 20:54:36.000000000 +0000 +++ debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -doc/* diff -urN ../kid-0.8/debian/kid.manpages debian/kid.manpages --- ../kid-0.8/debian/kid.manpages 2006-03-25 20:54:36.000000000 +0000 +++ debian/kid.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/kid.1 -debian/kidc.1 diff -urN ../kid-0.8/debian/patches/no-setuptools.patch debian/patches/no-setuptools.patch --- ../kid-0.8/debian/patches/no-setuptools.patch 2006-03-25 20:54:36.000000000 +0000 +++ debian/patches/no-setuptools.patch 2006-03-29 07:42:23.000000000 +0000 @@ -1,26 +1,10 @@ ---- kid-0.8.orig/setup.py 2005-12-02 07:46:12.000000000 +0000 -+++ kid-0.8/setup.py 2005-12-02 12:40:36.000000000 +0000 -@@ -1,6 +1,4 @@ - # bootstrap setuptools if necessary +--- kid-0.9.orig/setup.py 2006-03-25 21:25:57.000000000 +0000 ++++ kid-0.9/setup.py 2006-03-25 21:27:52.000000000 +0000 +@@ -1,7 +1,3 @@ +-# bootstrap setuptools if necessary -from ez_setup import use_setuptools -use_setuptools() +- + import os - import kid as package - -@@ -8,7 +6,7 @@ - package_version = package.__version__ - doc_parts = package.__doc__.strip().splitlines() - --from setuptools import setup -+from distutils.core import setup - setup( - name=package_name, - version=package_version, -@@ -25,7 +23,6 @@ - py_modules=[], - packages=[package_name, - package_name + '.test'], -- install_requires=['elementtree'], - classifiers = [ - 'Development Status :: 4 - Beta', - 'Environment :: Console', + execfile(os.path.join("kid", "release.py")) diff -urN ../kid-0.8/debian/python2.3-kid.docs debian/python2.3-kid.docs --- ../kid-0.8/debian/python2.3-kid.docs 1970-01-01 00:00:00.000000000 +0000 +++ debian/python2.3-kid.docs 2006-03-25 22:50:39.000000000 +0000 @@ -0,0 +1 @@ +doc/* diff -urN ../kid-0.8/debian/python2.4-kid.docs debian/python2.4-kid.docs --- ../kid-0.8/debian/python2.4-kid.docs 1970-01-01 00:00:00.000000000 +0000 +++ debian/python2.4-kid.docs 2006-03-25 22:50:42.000000000 +0000 @@ -0,0 +1 @@ +doc/* diff -urN ../kid-0.8/debian/python-kid.install debian/python-kid.install --- ../kid-0.8/debian/python-kid.install 1970-01-01 00:00:00.000000000 +0000 +++ debian/python-kid.install 2006-03-25 22:19:13.000000000 +0000 @@ -0,0 +1,2 @@ +bin/kid usr/bin +bin/kidc usr/bin diff -urN ../kid-0.8/debian/python-kid.manpages debian/python-kid.manpages --- ../kid-0.8/debian/python-kid.manpages 1970-01-01 00:00:00.000000000 +0000 +++ debian/python-kid.manpages 2006-03-25 21:02:51.000000000 +0000 @@ -0,0 +1,2 @@ +debian/kid.1 +debian/kidc.1 diff -urN ../kid-0.8/debian/rules debian/rules --- ../kid-0.8/debian/rules 2006-03-25 20:54:36.000000000 +0000 +++ debian/rules 2006-03-29 07:49:48.000000000 +0000 @@ -4,6 +4,18 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/python-distutils.mk +DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed + +binary-post-install/python2.3-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 + +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 diff -urN ../kid-0.8/debian/watch debian/watch --- ../kid-0.8/debian/watch 2006-03-25 20:54:36.000000000 +0000 +++ debian/watch 2006-03-25 22:54:28.000000000 +0000 @@ -1,3 +1,2 @@ version=2 -# Mangle the timestamped version out of existence -opts="uversionmangle=s/20050131//" http://lesscode.org/dist/kid/kid-([\d\.]+)\.tar\.gz +http://lesscode.org/dist/kid/0.9/kid-([\d\.]+)\.tar\.gz