Merge lp:~mitya57/ubuntu/trusty/pillow/2.2.1-2ubuntu1 into lp:ubuntu/trusty/pillow

[Dmitry Shachnev]

  * Merge with Debian unstable, remaining changes:
    - Add PngImagePlugin.py to PILcompat directory.
    - Add autopkgtests.
    - Provide transitional packages.

[Barry Warsaw (barry)]

LGTM, however I can't merge this automagically:

% bzr merge lp:~mitya57/ubuntu/trusty/pillow/2.2.1-2ubuntu1
Unapplying quilt patches to prevent spurious conflicts
bzr: ERROR: Unable to unapply quilt patches for 'other' tree: None

I'll have to try to do it by hand.

review: Approve

[Dmitry Shachnev (mitya57)]

Why do you need to merge it at all? Just bzr branch && bzr bd && upload.

Anyway, thanks for sponsoring!

[Barry Warsaw (barry)]

On Dec 11, 2013, at 05:10 AM, Dmitry Shachnev wrote:

>Why do you need to merge it at all? Just bzr branch && bzr bd && upload.

Mostly, I wanted to verify the mp and do a test build of the results.

>Anyway, thanks for sponsoring!

You're welcome! Thanks for all your great help. I'm glad to see your PPU
application, hopefully as a stepping stone to even more applications :).

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-11-11 23:48:20 +0000
+++ .pc/applied-patches	2013-12-07 11:35:45 +0000
@@ -1,2 +1,3 @@
 no-lib64-hack.diff
 toplevel-setup.py
+freetype-includes.diff

=== modified file '_imagingft.c'
--- _imagingft.c	2013-11-11 23:48:20 +0000
+++ _imagingft.c	2013-12-07 11:35:45 +0000
@@ -59,7 +59,7 @@
     const char* message;
 } ft_errors[] =
 
-#include <freetype/fterrors.h>
+#include FT_ERRORS_H
 
 /* -------------------------------------------------------------------- */
 /* font objects */

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-25 20:44:46 +0000
+++ debian/changelog	2013-12-07 11:35:45 +0000
@@ -1,3 +1,19 @@
+pillow (2.2.1-2ubuntu1) trusty; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    - Add PngImagePlugin.py to PILcompat directory.
+    - Add autopkgtests.
+    - Provide transitional packages.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 07 Dec 2013 15:25:49 +0400
+
+pillow (2.2.1-2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix build failure with new freetype header layout.
+
+ -- Matthias Klose <[e-mail]>  Mon, 02 Dec 2013 18:54:44 +0100
+
 pillow (2.2.1-1ubuntu2) trusty; urgency=low
 
   * Fix autopkgtests by running them from $ADTTMP.

=== added file 'debian/patches/freetype-includes.diff'
--- debian/patches/freetype-includes.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/freetype-includes.diff	2013-12-07 11:35:45 +0000
@@ -0,0 +1,13 @@
+Index: b/_imagingft.c
+===================================================================
+--- a/_imagingft.c
++++ b/_imagingft.c
+@@ -59,7 +59,7 @@
+     const char* message;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-11-11 23:48:20 +0000
+++ debian/patches/series	2013-12-07 11:35:45 +0000
@@ -1,3 +1,4 @@
 no-lib64-hack.diff
 #lcms2.diff
 toplevel-setup.py
+freetype-includes.diff