[Python-modules-commits] r866 - in /packages/kiwi/trunk/debian: changelog control python-kiwi.postinst python-kiwi.prerm python-support.version rules

[kov at users.alioth.debian.org]

Author: kov
Date: Fri Jun 16 00:05:11 2006
New Revision: 866

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=866
Log:
implement new python policy

Removed:
    packages/kiwi/trunk/debian/python-kiwi.postinst
    packages/kiwi/trunk/debian/python-kiwi.prerm
    packages/kiwi/trunk/debian/python-support.version
Modified:
    packages/kiwi/trunk/debian/changelog
    packages/kiwi/trunk/debian/control
    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=866&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Fri Jun 16 00:05:11 2006
@@ -4,8 +4,12 @@
   - don't try to parse the sys.version string; there's no need to check
     for versions inside the script; that's the packaging system's job,
     so simply disabling (Closes: #372660)
+  * debian/control, debian/rules:
+  - support the new Python Policy (Closes: #373560)
+  * debian/python-kiwi.{postinst,prerm}, debian/python-support.version:
+  - removed; will be created automatically from now on
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 Jun 2006 19:18:24 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Thu, 15 Jun 2006 20:55:10 -0300
 
 kiwi (1.9.8-3) unstable; urgency=low
 

Modified: packages/kiwi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/control?rev=866&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/control (original)
+++ packages/kiwi/trunk/debian/control Fri Jun 16 00:05:11 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)
-Build-Depends-Indep: python, python-gtk2, python-dev, python-setuptools (>= 0.6a9-1)
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), python-setuptools (>= 0.6a9-1)
+Build-Depends-Indep: python-dev, python-gtk2, python-support (>= 0.2.3)
 Standards-Version: 3.7.2
+XS-Python-Version: >= 2.4
 
 Package: python-kiwi
 Architecture: all
-Depends: python (>= 2.4) | python2.4, python (<< 2.5) | python2.4, python2.4-gtk2, python2.4-setuptools (>= 0.6a9-1), python-support
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python2.4-gtk2, python2.4-setuptools (>= 0.6a9-1)
+Provides: ${python:Provides}
 Enhances: gazpacho
 Description: a graphical framework to construct simple UI
  Kiwi is a framework and a set of enhanced PyGTK widgets designed to

Modified: packages/kiwi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/rules?rev=866&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/rules (original)
+++ packages/kiwi/trunk/debian/rules Fri Jun 16 00:05:11 2006
@@ -1,14 +1,16 @@
 #!/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-kiwi
+# hack to workaround CDBS bug -- see #373678
+DEB_PYTHON_INSTALL_ARGS := ${DEB_PYTHON_INSTALL_ARGS_ALL}
 UPSTREAM_VERSION=$(shell head -n 1 debian/changelog | cut -d '(' -f 2 | cut -d ')' -f 1 | cut -d '-' -f 1)
 PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
 
@@ -20,8 +22,6 @@
 	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 \
-		debian/python-kiwi/usr/share/python-support/python-kiwi/.version
 	for file in debian/python-kiwi/usr/bin/*; do \
 		sed -i 's,/usr/bin/python,/usr/bin/python2.4,g' "$$file"; \
 	done