r14704 - in packages/trunk/performous/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2013-12-21 11:33:14 +0000 (Sat, 21 Dec 2013)
New Revision: 14704

Added:
   packages/trunk/performous/debian/patches/FindFreetype.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/series
Log:
Debian release 0.7.0-3. Fix #732735


Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2013-12-21 00:44:23 UTC (rev 14703)
+++ packages/trunk/performous/debian/changelog	2013-12-21 11:33:14 UTC (rev 14704)
@@ -1,9 +1,11 @@
-performous (0.7.0-3) UNRELEASED; urgency=low
+performous (0.7.0-3) unstable; urgency=medium
 
-  * debian/control: Add Suggests: fretsonfire-songs-sectoid, 
-                                  fretsonfire-songs-muldjord
+  * Team upload.
+  * Update the local FindFreeType.cmake file to detect the latest version of
+    FreeType2 and make the software compile again. (Closes: #732735)
+  * Bump Standards-Version to 3.9.5, no changes.
 
- -- Jackson Doak <noskcaj at ubuntu.com>  Sat, 28 Sep 2013 10:28:30 +1000
+ -- Markus Koschany <apo at gambaru.de>  Sat, 21 Dec 2013 11:58:02 +0100
 
 performous (0.7.0-2) unstable; urgency=low
 

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2013-12-21 00:44:23 UTC (rev 14703)
+++ packages/trunk/performous/debian/control	2013-12-21 11:33:14 UTC (rev 14704)
@@ -13,7 +13,7 @@
  libmagick++-dev, libsamplerate0-dev, libxml++2.6-dev,
  libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
  libgstreamer0.10-dev, libglew1.5-dev, libpango1.0-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/performous/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/performous/
 Homepage: http://performous.org/
@@ -26,7 +26,6 @@
 Conflicts: ultrastar-ng (<< 0.3.0)
 Replaces: ultrastar-ng (<< 0.3.0)
 Provides: ultrastar-ng
-Suggests: fretsonfire-songs-sectoid, fretsonfire-songs-muldjord
 Description: karaoke game that allows user supplied songs
  A karaoke, band and dancing game where one or more players perform a song
  and the game scores their performances. Supports songs in UltraStar,

Added: packages/trunk/performous/debian/patches/FindFreetype.patch
===================================================================
--- packages/trunk/performous/debian/patches/FindFreetype.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/FindFreetype.patch	2013-12-21 11:33:14 UTC (rev 14704)
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 21 Dec 2013 11:48:00 +0100
+Subject: FindFreetype
+
+---
+ cmake/Modules/FindFreetype.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/FindFreetype.cmake b/cmake/Modules/FindFreetype.cmake
+index b4c1685..6511b90 100644
+--- a/cmake/Modules/FindFreetype.cmake
++++ b/cmake/Modules/FindFreetype.cmake
+@@ -12,7 +12,7 @@ libfind_pkg_check_modules(Freetype_PKGCONF freetype2)
+ 
+ # Include dir
+ find_path(Freetype_INCLUDE_DIR
+-  NAMES freetype/freetype.h
++  NAMES freetype2/freetype.h
+   PATHS ${Freetype_PKGCONF_INCLUDE_DIRS}
+   PATH_SUFFIXES freetype2
+ )

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2013-12-21 00:44:23 UTC (rev 14703)
+++ packages/trunk/performous/debian/patches/series	2013-12-21 11:33:14 UTC (rev 14704)
@@ -1,3 +1,4 @@
 desktop.patch
 libav0.8.patch
 use-Boost-TIME_UTC_-constant-unconditionally.patch
+FindFreetype.patch