r16020 - in packages/trunk/fretsonfire/debian: . patches

[Markus Koschany]

Author: apo
Date: 2017-08-23 00:33:23 +0000 (Wed, 23 Aug 2017)
New Revision: 16020

Added:
   packages/trunk/fretsonfire/debian/patches/python-pil-compatibility.patch
Modified:
   packages/trunk/fretsonfire/debian/changelog
   packages/trunk/fretsonfire/debian/control
   packages/trunk/fretsonfire/debian/patches/series
Log:
Release fretsonfire 1.3.110.dfsg2-5


Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog	2017-08-20 15:30:51 UTC (rev 16019)
+++ packages/trunk/fretsonfire/debian/changelog	2017-08-23 00:33:23 UTC (rev 16020)
@@ -1,3 +1,12 @@
+fretsonfire (1.3.110.dfsg2-5) unstable; urgency=medium
+
+  * Team upload.
+  * Add python-pil-compatibility.patch and fix startup error.
+    Thanks to Hans Joachim Desserud for the report. (Closes: #872934)
+  * Declare compliance with Debian Policy 4.1.0.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 23 Aug 2017 02:19:32 +0200
+
 fretsonfire (1.3.110.dfsg2-4) unstable; urgency=medium
 
   * Team upload.

Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control	2017-08-20 15:30:51 UTC (rev 16019)
+++ packages/trunk/fretsonfire/debian/control	2017-08-23 00:33:23 UTC (rev 16020)
@@ -10,7 +10,7 @@
 Build-Depends-Indep:
  docbook-to-man,
  python
-Standards-Version: 4.0.0
+Standards-Version: 4.1.0
 Homepage: http://fretsonfire.sourceforge.net/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/fretsonfire/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/fretsonfire/

Added: packages/trunk/fretsonfire/debian/patches/python-pil-compatibility.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/python-pil-compatibility.patch	                        (rev 0)
+++ packages/trunk/fretsonfire/debian/patches/python-pil-compatibility.patch	2017-08-23 00:33:23 UTC (rev 16020)
@@ -0,0 +1,30 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 23 Aug 2017 02:07:29 +0200
+Subject: python-pil compatibility
+
+Python-imaging will be removed from Debian and imports should use python-pil
+instead.
+
+Bug-Debian: https://bugs.debian.org/872934
+Forwarded: no
+---
+ src/Texture.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Texture.py b/src/Texture.py
+index 9b3b6de..c028d9b 100644
+--- a/src/Texture.py
++++ b/src/Texture.py
+@@ -24,10 +24,10 @@ from __future__ import division
+ 
+ import Log
+ import Config
+-import Image
++from PIL import Image
+ import pygame
+ import StringIO
+-import PngImagePlugin
++from PIL import PngImagePlugin
+ from OpenGL.GL import *
+ from OpenGL.GLU import *
+ from Queue import Queue, Empty

Modified: packages/trunk/fretsonfire/debian/patches/series
===================================================================
--- packages/trunk/fretsonfire/debian/patches/series	2017-08-20 15:30:51 UTC (rev 16019)
+++ packages/trunk/fretsonfire/debian/patches/series	2017-08-23 00:33:23 UTC (rev 16020)
@@ -6,3 +6,4 @@
 keep_sound_when_failed.patch
 credits_music.patch
 python-PIL-tobytes-error.patch
+python-pil-compatibility.patch