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

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Jun 20 02:21:51 2006
New Revision: 956

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=956
Log:
make sure we use already new-policy-compliant packages when
building and running

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=956&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Tue Jun 20 02:21:51 2006
@@ -6,8 +6,13 @@
     so simply disabling (Closes: #372660)
   * debian/control, debian/rules:
   - support the new Python Policy (Closes: #373560)
+  - update build-deps and deps to have already new-policy-compliant
+    packages for python-setuptools and python-gtk2
   * debian/python-kiwi.{postinst,prerm}, debian/python-support.version:
   - removed; will be created automatically from now on
+  * debian/rules:
+  - make sure the shebang is modified before the install target is run,
+    so dh_python will have python:Depends right
 
  -- Gustavo Noronha Silva <kov at debian.org>  Thu, 15 Jun 2006 20:55:10 -0300
 

Modified: packages/kiwi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/control?rev=956&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/control (original)
+++ packages/kiwi/trunk/debian/control Tue Jun 20 02:21:51 2006
@@ -3,16 +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 (>= 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)
+Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.1), python, python-setuptools (>= 0.6b3-1)
+Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.2.3)
 Standards-Version: 3.7.2
-XS-Python-Version: >= 2.4
+XS-Python-Standards-Version: 0.4
+XS-Python-Version: all, >= 2.4
 
 Package: python-kiwi
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python2.4-gtk2, python2.4-setuptools (>= 0.6a9-1)
-Provides: ${python:Provides}
+Depends: ${python:Depends}, python-gtk2 (>= 2.8.2-3.1), python-setuptools (>= 0.6b3-1)
 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=956&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/rules (original)
+++ packages/kiwi/trunk/debian/rules Tue Jun 20 02:21:51 2006
@@ -9,12 +9,17 @@
 
 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)
+PYVER=$(shell pyversions -vr 'current')
 
-common-binary-post-install-indep::
+common-install-prehook-indep::
+	test "${PYVER}" = "2.3" && \
+	for file in build/scripts-2.3/*; do \
+		sed -i 's,/usr/bin/python,/usr/bin/python2.4,g' "$$file"; \
+	done
+
+common-binary-post-install/python-kiwi::
 	mv debian/python-kiwi/usr/share/python-support/python-kiwi/kiwi-${UPSTREAM_VERSION}-py${PYVER}.egg-info \
 		debian/python-kiwi/usr/share/python-support/python-kiwi/kiwi-${UPSTREAM_VERSION}.egg-info
 
@@ -22,11 +27,7 @@
 	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
-	for file in debian/python-kiwi/usr/bin/*; do \
-		sed -i 's,/usr/bin/python,/usr/bin/python2.4,g' "$$file"; \
-	done
 
 clean::
-	# hack (CDBS bug -- see #300149)
-	-rm -rf build kiwi.egg-info
+	-rm -rf kiwi.egg-info
 	-find . -name \*.mo -exec rm {} \;