tags 735746 + pending
quit

Hi Matthias,

Jonathan Nieder wrote:

> +  * Adjust installation rules for python3 extensions to include multiarch
> +    tag. Closes: #735746.
> +  * Build-conflict on python3.3 (<< 3.3.3-5).

I've uploaded this fix to DELAYED/2.  If I should cancel the upload or
move it to DELAYED/0, please don't hesitate to let me know.

Thanks,
Jonathan
diff -Nru pillow-2.2.1/debian/changelog pillow-2.2.1/debian/changelog
--- pillow-2.2.1/debian/changelog       2013-12-16 04:07:11.000000000 -0800
+++ pillow-2.2.1/debian/changelog       2014-01-26 14:39:11.000000000 -0800
@@ -1,3 +1,12 @@
+pillow (2.2.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Adjust installation rules for python3 extensions to include multiarch
+    tag. Closes: #735746.
+  * Build-conflict on python3.3 (<< 3.3.3-5).
+
+ -- Jonathan Nieder <jrnie...@gmail.com>  Sun, 26 Jan 2014 14:39:10 -0800
+
 pillow (2.2.1-3) unstable; urgency=low
 
   * Add PngImagePlugin.py to PILcompat directory.
diff -Nru pillow-2.2.1/debian/control pillow-2.2.1/debian/control
--- pillow-2.2.1/debian/control 2013-12-16 04:08:46.000000000 -0800
+++ pillow-2.2.1/debian/control 2014-01-26 14:34:29.000000000 -0800
@@ -8,7 +8,7 @@
   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 -Nru pillow-2.2.1/debian/rules pillow-2.2.1/debian/rules
--- pillow-2.2.1/debian/rules   2013-11-11 16:13:43.000000000 -0800
+++ pillow-2.2.1/debian/rules   2014-01-26 14:34:29.000000000 -0800
@@ -145,6 +145,7 @@
                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 @@
        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

Reply via email to