[Python-modules-commits] r1071 - in /packages/kiwi/trunk/debian: changelog control patches/01_python2.3_install.diff pycompat pyversions rules

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Jun 27 00:51:26 UTC 2006 

Author: kov
Date: Tue Jun 27 00:51:25 2006
New Revision: 1071

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1071
Log:
  * debian/01_python2.3_install.diff:
  - removed; no longer needed
  * debian/control, debian/rules, debian/pyversions, debian/pycompat:
  - use python-support 0.3 and newer cdbs, that builds using the
    minor version required by the package; also make the build system
    more robust (Closes: #375270)

Added:
    packages/kiwi/trunk/debian/pycompat
    packages/kiwi/trunk/debian/pyversions
Removed:
    packages/kiwi/trunk/debian/patches/01_python2.3_install.diff
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=1071&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Tue Jun 27 00:51:25 2006
@@ -1,6 +1,11 @@
 kiwi (1.9.8-5) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * debian/01_python2.3_install.diff:
+  - removed; no longer needed
+  * debian/control, debian/rules, debian/pyversions, debian/pycompat:
+  - use python-support 0.3 and newer cdbs, that builds using the
+    minor version required by the package; also make the build system
+    more robust (Closes: #375270)
 
  -- Gustavo Noronha Silva <kov at debian.org>  Mon, 19 Jun 2006 23:37:54 -0300
 

Modified: packages/kiwi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/control?rev=1071&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/control (original)
+++ packages/kiwi/trunk/debian/control Tue Jun 27 00:51:25 2006
@@ -3,15 +3,12 @@
 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.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)
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), 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.3)
 Standards-Version: 3.7.2
-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}, python-gtk2 (>= 2.8.2-3.1), python-setuptools (>= 0.6b3-1)
 Enhances: gazpacho
 Description: a graphical framework to construct simple UI

Added: packages/kiwi/trunk/debian/pycompat
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/pycompat?rev=1071&op=file
==============================================================================
--- packages/kiwi/trunk/debian/pycompat (added)
+++ packages/kiwi/trunk/debian/pycompat Tue Jun 27 00:51:25 2006
@@ -1,0 +1,1 @@
+2

Added: packages/kiwi/trunk/debian/pyversions
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/pyversions?rev=1071&op=file
==============================================================================
--- packages/kiwi/trunk/debian/pyversions (added)
+++ packages/kiwi/trunk/debian/pyversions Tue Jun 27 00:51:25 2006
@@ -1,0 +1,1 @@
+2.4-

Modified: packages/kiwi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/rules?rev=1071&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/rules (original)
+++ packages/kiwi/trunk/debian/rules Tue Jun 27 00:51:25 2006
@@ -7,27 +7,24 @@
 include /usr/share/cdbs/1/class/python-distutils.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
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
-UPSTREAM_VERSION=$(shell head -n 1 debian/changelog | cut -d '(' -f 2 | cut -d ')' -f 1 | cut -d '-' -f 1)
-PYVER=$(shell pyversions -vr 'current')
-
-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
+PYCURVER := $(shell pyversions -d | sed s,python,,g)
+VERSIONOK := $(shell dpkg --compare-versions ${PYCURVER} ge 2.4 ; echo $${?})
 
 binary-post-install/python-kiwi::
-	pyversions -vr '>= 2.4' | tr ' ' ',' > debian/python-kiwi/usr/share/python-support/python-kiwi/.version
-	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
+	mv debian/python-kiwi/usr/share/python-support/python-kiwi/kiwi-${DEB_UPSTREAM_VERSION}-py*.egg-info \
+		debian/python-kiwi/usr/share/python-support/python-kiwi/kiwi-${DEB_UPSTREAM_VERSION}.egg-info
 
-	mkdir -p debian/python-kiwi/usr/share/python-support/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
+#	mkdir -p debian/python-kiwi/usr/share/python-support/gazpacho
+ifeq (1, ${VERSIONOK})
+	for file in debian/python-kiwi/usr/bin/*; do \
+		sed -i 's,/usr/bin/python,/usr/bin/python2.4,g' $$file ;\
+	done
+endif
+#	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
 
 clean::
 	-rm -rf kiwi.egg-info

More information about the Python-modules-commits mailing list