merge 735746 735803
block 731168 by 735746
tags 735746 + patch
quit
Hi Matthias,
Roland Stigge wrote:
> pillow FTBFS like this:
[...]
> abitag=.$(python3.3 -c "import sysconfig;
> print(sysconfig.get_config_var('SOABI'))"); \
> dh_movefiles -ppython3-pil.imagetk \
> --sourcedir=debian/python3-pil \
> usr/lib/python3/$(basename $(_py_=3.3; python${_py_#python*} -c
> 'from distutils import sysconfig;
> print(sysconfig.get_python_lib())'))/PIL/_imagingtk$abitag.so \
> usr/lib/python3/$(basename $(_py_=3.3; python${_py_#python*} -c
> 'from distutils import sysconfig;
> print(sysconfig.get_python_lib())'))/PIL/ImageTk.py
> dh_movefiles:
> debian/python3-pil/usr/lib/python3/dist-packages/PIL/_imagingtk.cpython-33m.so
> not found (supposed to put it in python3-pil.imagetk)
> make: *** [install3-python3.3] Error 1
Yes, I can reproduce this. Some files that do exist:
debian/python3-pil/usr/lib/python3/dist-packages/PIL/_imagingtk.cpython-33m-x86_64-linux-gnu.so
build/lib.linux-x86_64-3.3/PIL/_imagingtk.cpython-33m.so
This is fallout from the python 3.3.3-5 update ("On installation with
--install-layout=deb, rename extensions to include the multiarch
tag"). This patch fixes it.
---
Thoughts?
Thanks,
Jonathan
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/rules | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f921140..e16d960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pillow (2.2.1-3.1) local; urgency=medium
+
+ * Adjust installation rules for python3 extensions to include multiarch
+ tag. Closes: #735746.
+ * Build-conflict on python3.3 (<< 3.3.3-5).
+
+ -- Jonathan Nieder <[email protected]> Fri, 24 Jan 2014 14:45:35 -0800
+
pillow (2.2.1-3) unstable; urgency=low
* Add PngImagePlugin.py to PILcompat directory.
diff --git a/debian/control b/debian/control
index 8ddd2e7..5b9f8d2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper, tk8.5-dev, dpkg-dev (>= 1.16.1~),
python-tk, python-tk-dbg, python3-tk, python3-tk-dbg (>= 3.3),
libsane-dev, libfreetype6-dev, libjpeg8-dev, zlib1g-dev, liblcms2-dev,
libwebp-dev
-Build-Conflicts: python-numarray
+Build-Conflicts: python-numarray, python3.3 (<< 3.3.3-5)
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
diff --git a/debian/rules b/debian/rules
index f7eb159..8bd84e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,6 +145,7 @@ install3-python%:
debian/python3-pil/$$incdir
abitag=.$$(python$* -c "import sysconfig;
print(sysconfig.get_config_var('SOABI'))"); \
+ abitag=$$abitag-$$(python$* -c "import sysconfig;
print(sysconfig.get_config_var('MULTIARCH'))"); \
dh_movefiles -ppython3-pil.imagetk \
--sourcedir=debian/python3-pil \
usr/lib/python3/$(call py_sitename_sh,
$*)/PIL/_imagingtk$$abitag.so \
@@ -169,6 +170,7 @@ install3-python%:
find debian/python3-pil*-dbg -depth -empty -exec rmdir {} \;
abitag=.$$(python$*-dbg -c "import sysconfig;
print(sysconfig.get_config_var('SOABI'))"); \
+ abitag=$$abitag-$$(python$* -c "import sysconfig;
print(sysconfig.get_config_var('MULTIARCH'))"); \
dh_movefiles -ppython3-pil.imagetk-dbg \
--sourcedir=debian/python3-pil-dbg \
usr/lib/python3/$(call py_sitename_sh,
$*)/PIL/_imagingtk$$abitag.so
--
1.8.5.3
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
