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

[Felix Geyer]

Author: debfx-guest
Date: 2012-01-31 14:21:15 +0000 (Tue, 31 Jan 2012)
New Revision: 13192

Added:
   packages/trunk/performous/debian/patches/jpeg-detection.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/patches/series
Log:
Check for jpeglib.h which is actually included instead of jconfig.h.

Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2012-01-30 23:42:45 UTC (rev 13191)
+++ packages/trunk/performous/debian/changelog	2012-01-31 14:21:15 UTC (rev 13192)
@@ -1,3 +1,11 @@
+performous (0.6.1-5) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Check for jpeglib.h which is actually included instead of jconfig.h.
+    The latter is installed in multiarch location. Patch from Ilya Barygin.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 31 Jan 2012 13:24:23 +0100
+
 performous (0.6.1-4) unstable; urgency=low
 
   * Team upload.

Added: packages/trunk/performous/debian/patches/jpeg-detection.patch
===================================================================
--- packages/trunk/performous/debian/patches/jpeg-detection.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/jpeg-detection.patch	2012-01-31 14:21:15 UTC (rev 13192)
@@ -0,0 +1,16 @@
+Description: fix jpeg library detection
+ Check for jpeglib.h which is actually included instead of jconfig.h.
+ The latter is installed in multiarch location.
+Author: Ilya Barygin <randomaction at ubuntu.com>
+
+--- performous-0.6.1.orig/cmake/Modules/FindJpeg.cmake
++++ performous-0.6.1/cmake/Modules/FindJpeg.cmake
+@@ -13,7 +13,7 @@ include(LibFindMacros)
+ libfind_pkg_check_modules(Jpeg_PKGCONF jpeg)
+ 
+ find_path(Jpeg_INCLUDE_DIR
+-  NAMES jconfig.h
++  NAMES jpeglib.h
+   PATHS ${Jpeg_PKGCONF_INCLUDE_DIRS}
+ )
+ 

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2012-01-30 23:42:45 UTC (rev 13191)
+++ packages/trunk/performous/debian/patches/series	2012-01-31 14:21:15 UTC (rev 13192)
@@ -2,3 +2,4 @@
 boost_filesystem_v2.patch
 libav_api_change.patch
 libav0.8.diff
+jpeg-detection.patch