tag 537003 pending thanks Jakub Wilk <uba...@users.sf.net> (09/08/2009): > The attached patch fixes the problem. It also makes parallel builds > reliable.
ACK for the first part. NACK for the latter. If one wants to do a parallel build, one sets DEB_BUILD_OPTIONS accordingly. Forcingly setting -jN isn't the way to go, so I'm not keen on merging the .NOTPARALLEL part in my NMU. Source debdiff attached, uploading to DELAYED/1, just in case the maintainer wants to say something? Mraw, KiBi.
diff -Nru python-imaging-1.1.6/debian/changelog python-imaging-1.1.6/debian/changelog
--- python-imaging-1.1.6/debian/changelog 2008-06-23 21:58:25.000000000 +0200
+++ python-imaging-1.1.6/debian/changelog 2009-09-03 05:12:45.000000000 +0200
@@ -1,3 +1,19 @@
+python-imaging (1.1.6-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Switch from Tcl/Tk 8.4 to 8.5, following the move initiated in
+ python-tk 2.5.2-1.1 (See: #521078):
+ - Build-Depends on tk8.5-dev rather than tk8.4-dev.
+ - Build-Depends on python-tk-dbg (>= 2.5.2-1.1) rather than
+ python-tk-dbg (>= 2.4.3).
+ - Depends on/Recommends python-tk (>= 2.5.2-1.1) rathen than
+ python-tk (>= 2.4.3).
+ - Use /usr/include/tcl8.5 in setup.py, instead of …/tcl8.4
+ Thanks to Jakub Wilk for the patch on which this is based, which fixes
+ the FTBFS (Closes: #537003).
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 03 Sep 2009 05:04:46 +0200
+
python-imaging (1.1.6-3) unstable; urgency=low
* Do not build-depend on python-numarray, it's deprecated. Closes: #478466.
diff -Nru python-imaging-1.1.6/debian/control python-imaging-1.1.6/debian/control
--- python-imaging-1.1.6/debian/control 2008-06-23 22:00:50.000000000 +0200
+++ python-imaging-1.1.6/debian/control 2009-09-03 05:13:55.000000000 +0200
@@ -2,7 +2,7 @@
Section: python
Priority: optional
Maintainer: Matthias Klose <d...@debian.org>
-Build-Depends: tk8.4-dev, python-all-dev, python-all-dbg, python-central (>= 0.4.12), python-tk-dbg (>= 2.4.3), libsane-dev, libfreetype6-dev, libjpeg62-dev, zlib1g-dev, debhelper (>= 5.0.37.1)
+Build-Depends: tk8.5-dev, python-all-dev, python-all-dbg, python-central (>= 0.4.12), python-tk-dbg (>= 2.5.2-1.1), libsane-dev, libfreetype6-dev, libjpeg62-dev, zlib1g-dev, debhelper (>= 5.0.37.1)
Build-Conflicts: python-numarray
XS-Python-Version: all
Standards-Version: 3.8.0
@@ -51,7 +51,7 @@
Package: python-imaging-tk
Architecture: any
-Depends: python-imaging (= ${Source-Version}), python-tk (>= 2.4.3), ${python:Depends}, ${shlibs:Depends}
+Depends: python-imaging (= ${Source-Version}), python-tk (>= 2.5.2-1.1), ${python:Depends}, ${shlibs:Depends}
Conflicts: python-imaging (<< 1.0.1-3), python2.3-imaging-tk, python2.4-imaging-tk
Replaces: python-imaging (<< 1.0.1-3), python2.3-imaging-tk, python2.4-imaging-tk
Suggests: python-imaging-doc, python-imaging-tk-dbg
@@ -74,7 +74,7 @@
Depends: python-imaging (= ${Source-Version}), ${python:Depends}, ${shlibs:Depends}
Conflicts: python2.3-imaging-sane, python2.4-imaging-sane
Replaces: python2.3-imaging-sane, python2.4-imaging-sane
-Recommends: python-tk
+Recommends: python-tk (>= 2.5.2-1.1)
Suggests: python-imaging-doc, python-imaging-sane-dbg
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
diff -Nru python-imaging-1.1.6/setup.py python-imaging-1.1.6/setup.py
--- python-imaging-1.1.6/setup.py 2006-12-12 17:13:47.000000000 +0100
+++ python-imaging-1.1.6/setup.py 2009-09-03 05:14:06.000000000 +0200
@@ -196,7 +196,7 @@
#
# add Tcl include directory
- add_directory(include_dirs, "/usr/include/tcl8.4")
+ add_directory(include_dirs, "/usr/include/tcl8.5")
#
# insert new dirs *before* default libs, to avoid conflicts
signature.asc
Description: Digital signature
