Bug#732735: performous: FTBFS: Required library Freetype NOT FOUND.

[Markus Koschany]

Control: tags -1 confirmed patch

Hello,

performous currently FTBFS because the software ships a local cmake
module, FindFreeType.cmake, instead of using Debian's system default
module for cmake. However simply removing the local module did not help
(normally cmake falls back to the system's default then), thus I have
created a small patch to address this problem.

The debdiff is attached. I have also committed the changes to the svn
repository of the Debian Games Team.

Regards,

Markus

-------------- next part --------------
diff -Nru performous-0.7.0/debian/changelog performous-0.7.0/debian/changelog
--- performous-0.7.0/debian/changelog	2013-06-30 12:24:19.000000000 +0200
+++ performous-0.7.0/debian/changelog	2013-12-21 12:37:33.000000000 +0100
@@ -1,3 +1,12 @@
+performous (0.7.0-3) unstable; urgency=medium
+
+  * 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.
+
+ -- Markus Koschany <apo at gambaru.de>  Sat, 21 Dec 2013 11:58:02 +0100
+
 performous (0.7.0-2) unstable; urgency=low
 
   * Team upload.
diff -Nru performous-0.7.0/debian/control performous-0.7.0/debian/control
--- performous-0.7.0/debian/control	2013-06-30 12:24:19.000000000 +0200
+++ performous-0.7.0/debian/control	2013-12-21 12:37:33.000000000 +0100
@@ -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/
diff -Nru performous-0.7.0/debian/patches/FindFreetype.patch performous-0.7.0/debian/patches/FindFreetype.patch
--- performous-0.7.0/debian/patches/FindFreetype.patch	1970-01-01 01:00:00.000000000 +0100
+++ performous-0.7.0/debian/patches/FindFreetype.patch	2013-12-21 12:37:33.000000000 +0100
@@ -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
+ )
diff -Nru performous-0.7.0/debian/patches/series performous-0.7.0/debian/patches/series
--- performous-0.7.0/debian/patches/series	2013-06-30 12:24:19.000000000 +0200
+++ performous-0.7.0/debian/patches/series	2013-12-21 12:37:33.000000000 +0100
@@ -1,3 +1,4 @@
 desktop.patch
 libav0.8.patch
 use-Boost-TIME_UTC_-constant-unconditionally.patch
+FindFreetype.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 966 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-games-devel/attachments/20131221/5aa83b52/attachment.sig>