tags 547853 + patch
thanks

I have fixed this bug, to the best of my knowledge. However, I would
request a review from those who are more knowledgeable.

Please find attached a patch.

Thanks!

Kumar
diff -Nru --exclude changelog python-setuptools-0.6c9/debian/control python-setuptools-0.6c9/debian/control
--- python-setuptools-0.6c9/debian/control	2009-10-14 18:54:13.000000000 -0500
+++ python-setuptools-0.6c9/debian/control	2009-10-14 18:54:13.000000000 -0500
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Matthias Klose <d...@debian.org>
 Build-Depends-Indep: debhelper (>= 5.0.37.1), python-all-dev, python2.5-dev, python-central (>= 0.4.10)
-XS-Python-Version: 2.4, 2.5
+XS-Python-Version: 2.5, 2.6
 Standards-Version: 3.7.3
 
 Package: python-setuptools
diff -Nru --exclude changelog python-setuptools-0.6c9/debian/rules python-setuptools-0.6c9/debian/rules
--- python-setuptools-0.6c9/debian/rules	2009-10-14 18:54:13.000000000 -0500
+++ python-setuptools-0.6c9/debian/rules	2009-10-14 18:54:13.000000000 -0500
@@ -20,11 +20,13 @@
 export LC_ALL=C
 
 PYVERS	:= 2.3 2.5 $(shell pyversions -vr debian/control)
-PYVERS	:= 2.5 2.4
+PYVERS	:= 2.5 2.6
 PYVER   := $(shell python -c 'import sys; print sys.version[:3]')
 SETUPTOOLSVER=$(shell dpkg-parsechangelog | grep 'Version:' | sed 's,Version: \(.*\)-.*,\1,g')
 export PYVERS
 
+include /usr/share/python/python.mk
+
 d = debian/python-setuptools
 d2 = debian/python-pkg-resources
 
@@ -72,16 +74,15 @@
 	dh_clean -k
 
 install-python%:
-	dh_installdirs -A usr/bin usr/lib/python$*/site-packages
-	python$* setup.py install --root=$(CURDIR)/$(d)
-
-	mv $(d)/usr/lib/python$*/site-packages/pkg_resources.py \
-	  $(d2)/usr/lib/python$*/site-packages/
+	dh_installdirs -A usr/bin usr/lib/python$*/$(call py_sitename_sh, $*)
+	python$* setup.py install --root=$(CURDIR)/$(d) --install-layout=deb
 
-	mv $(d)/usr/lib/python$*/site-packages/setuptools-$(SETUPTOOLSVER)-py$*.egg-info \
-	  $(d)/usr/lib/python$*/site-packages/setuptools.egg-info
+	mv $(d)/usr/lib/python$*/$(call py_sitename_sh, $*)/pkg_resources.py \
+	  $(d2)/usr/lib/python$*/$(call py_sitename_sh, $*)/
+	mv $(d)/usr/lib/python$*/$(call py_sitename_sh, $*)/setuptools-$(SETUPTOOLSVER)-py$*.egg-info \
+	  $(d)/usr/lib/python$*/$(call py_sitename_sh, $*)/setuptools.egg-info
 	echo setuptools-$(SETUPTOOLSVER).egg-info \
-	  > $(d)/usr/lib/python$*/site-packages/setuptools.pth
+	  > $(d)/usr/lib/python$*/$(call py_sitename_sh, $*)/setuptools.pth
 
 binary-arch:
 
@@ -98,9 +99,9 @@
 	DH_PYCENTRAL=noprepare dh_pycentral -i
 	cat $(d).substvars
 	( \
-	  echo 'python:Versions=2.4, 2.5'; \
-	  echo 'python:Provides=python2.4-setuptools, python2.5-setuptools'; \
-	  echo 'python:Depends=python (>= 2.4), python (<< 2.6), python-central (>= 0.5.7)'; \
+	  echo 'python:Versions=2.5, 2.6'; \
+	  echo 'python:Provides=python2.5-setuptools, python2.6-setuptools'; \
+	  echo 'python:Depends=python (>= 2.5), python (<< 2.7), python-central (>= 0.5.7)'; \
 	) > $(d).substvars
 	cat $(d).substvars
 

Reply via email to