[Python-modules-commits] r772 - in /packages/kiwi/trunk/debian: changelog rules

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Jun 10 22:06:45 2006
New Revision: 772

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=772
Log:
  - rename the egg-info directory to remove the python version

Modified:
    packages/kiwi/trunk/debian/changelog
    packages/kiwi/trunk/debian/rules

Modified: packages/kiwi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/changelog?rev=772&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Sat Jun 10 22:06:45 2006
@@ -1,9 +1,11 @@
-kiwi (1.9.8-3) UNRELEASED; urgency=low
+kiwi (1.9.8-3) unstable; urgency=low
 
   * debian/control:
   - added dependency on python2.4-setuptools
+  * debian/rules:
+  - rename the egg-info directory to remove the python version
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 Jun 2006 18:50:37 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 Jun 2006 19:05:25 -0300
 
 kiwi (1.9.8-2) unstable; urgency=low
 

Modified: packages/kiwi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/rules?rev=772&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/rules (original)
+++ packages/kiwi/trunk/debian/rules Sat Jun 10 22:06:45 2006
@@ -7,11 +7,16 @@
 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 --install-lib usr/share/python-support/python-kiwi
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed \
+	--install-lib usr/share/python-support/python-kiwi
+PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
 
 common-binary-post-install-indep::
+	mv debian/python-cherrypy/usr/share/python-support/python-kiwi/kiwi-${UPSTREAM_VERSION}-py${PYVER}.egg-info \
+		debian/python-cherrypy/usr/share/python-support/python-kiwi/kiwi-${UPSTREAM_VERSION}.egg-info
+
 	mkdir -p debian/python-kiwi/usr/share/python-support/gazpacho
-	mv debian/python-kiwi/usr/lib/python2.3/site-packages/gazpacho \
+	mv debian/python-kiwi/usr/lib/python${PYVER}/site-packages/gazpacho \
 		debian/python-kiwi/usr/share/python-support/gazpacho/
 	rm -rf debian/python-kiwi/usr/lib
 	install -D -o root -g root -m 644 debian/python-support.version \