tags 547844 + patch
thanks

Hi!

Please find attached a patch to make python-imaging build with Python
2.6. I have tested the build in a current sid chroot as well as a
special python 2.6 chroot based on packages from experimental, along
with a custom built python-numpy.

HTH, and thanks.

Kumar
-- 
Kumar Appaiah
diff -Nru --exclude changelog python-imaging-1.1.6/debian/control python-imaging-1.1.6/debian/control
--- python-imaging-1.1.6/debian/control	2009-09-02 22:24:01.000000000 -0500
+++ python-imaging-1.1.6/debian/control	2009-10-17 16:50:36.000000000 -0500
@@ -42,6 +42,7 @@
 Priority: extra
 Architecture: any
 Depends: python-imaging (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Python Imaging Library (debug extension)
  The Python Imaging Library (PIL) adds an image object to your Python
  interpreter. You can load images from a variety of file formats, and
@@ -64,6 +65,7 @@
 Priority: extra
 Architecture: any
 Depends: python-imaging-tk (= ${Source-Version}), python-imaging-dbg (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Python Imaging Library - ImageTk Module (debug extension)
  Tk dependent python-imaging module.
  .
@@ -87,6 +89,7 @@
 Priority: extra
 Architecture: any
 Depends: python-imaging-sane (= ${Source-Version}), python-imaging-dbg (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Python Imaging Library - SANE interface (debug extension)
  The imaging-sane module is a Python interface to the SANE (Scanner
  Access is Now Easy) library, which provides access to various raster
diff -Nru --exclude changelog python-imaging-1.1.6/debian/rules python-imaging-1.1.6/debian/rules
--- python-imaging-1.1.6/debian/rules	2008-06-23 14:59:23.000000000 -0500
+++ python-imaging-1.1.6/debian/rules	2009-10-17 17:02:56.000000000 -0500
@@ -6,6 +6,8 @@
 PYVERS	:= $(shell pyversions -vr)
 PYVER   := $(shell python -c 'import sys; print sys.version[:3]')
 
+include /usr/share/python/python.mk
+
 build: build-stamp
 build-stamp: $(PYVERS:%=build-stamp-python%)
 	touch $@
@@ -58,9 +60,9 @@
 	dh_clean -k
 
 install-python%:
-	python$* setup.py install --root $(CURDIR)/debian/python-imaging
+	python$* setup.py install --root $(CURDIR)/debian/python-imaging $(py_setup_install_args)
 	cd Sane && python$* setup.py install \
-		--root $(CURDIR)/debian/python-imaging-sane
+		--root $(CURDIR)/debian/python-imaging-sane  $(py_setup_install_args)
 	mkdir -p debian/python-imaging/usr/include/python$*
 	install -o root -g root -m 644 \
 		libImaging/Imaging.h \
@@ -70,17 +72,17 @@
 
 	dh_movefiles -ppython-imaging-tk \
 	    --sourcedir=debian/python-imaging \
-		usr/lib/python$*/site-packages/PIL/_imagingtk.so \
-		usr/lib/python$*/site-packages/PIL/ImageTk.py
+		usr/lib/python$*/$(call py_sitename_sh, $*)/PIL/_imagingtk.so \
+		usr/lib/python$*/$(call py_sitename_sh, $*)/PIL/ImageTk.py
 
-	python$*-dbg setup.py install --root $(CURDIR)/debian/python-imaging-dbg
+	python$*-dbg setup.py install --root $(CURDIR)/debian/python-imaging-dbg $(py_setup_install_args)
 	mkdir -p debian/python-imaging-dbg/usr/include/python$*_d
 	for i in Imaging.h ImPlatform.h ImDib.h; do \
 	  ln -sf ../python$*/$$i \
 	    debian/python-imaging-dbg/usr/include/python$*_d/$$i; \
 	done
 	cd Sane && python$*-dbg setup.py install \
-		--root $(CURDIR)/debian/python-imaging-sane-dbg
+		--root $(CURDIR)/debian/python-imaging-sane-dbg  $(py_setup_install_args)
 
 	find debian/python-imaging*-dbg \
 		! -type d ! \( -name '*_d.so' -o -name '*.h' \) | xargs rm -f
@@ -88,7 +90,7 @@
 
 	dh_movefiles -ppython-imaging-tk-dbg \
 	    --sourcedir=debian/python-imaging-dbg \
-		usr/lib/python$*/site-packages/PIL/_imagingtk_d.so
+		usr/lib/python$*/$(call py_sitename_sh, $*)/PIL/_imagingtk_d.so
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.

Attachment: signature.asc
Description: Digital signature

Reply via email to