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

[Evgeni Golov]

Author: evgeni
Date: 2011-05-11 11:56:00 +0000 (Wed, 11 May 2011)
New Revision: 12331

Added:
   packages/trunk/performous/debian/patches/boost_filesystem_v2.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/patches/series
Log:
Set BOOST_FILESYSTEM_VERSION=2 to prevent FTBFS with boost >= 1.46
Closes: #625109


Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2011-05-11 11:20:27 UTC (rev 12330)
+++ packages/trunk/performous/debian/changelog	2011-05-11 11:56:00 UTC (rev 12331)
@@ -1,3 +1,11 @@
+performous (0.6.1-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Set BOOST_FILESYSTEM_VERSION=2 to prevent FTBFS with boost >= 1.46
+    Closes: #625109
+
+ -- Evgeni Golov <evgeni at debian.org>  Wed, 11 May 2011 13:54:58 +0200
+
 performous (0.6.1-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Added: packages/trunk/performous/debian/patches/boost_filesystem_v2.patch
===================================================================
--- packages/trunk/performous/debian/patches/boost_filesystem_v2.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/boost_filesystem_v2.patch	2011-05-11 11:56:00 UTC (rev 12331)
@@ -0,0 +1,17 @@
+Description: Set BOOST_FILESYSTEM_VERSION=2
+ This prevents FTBFS with boost >= 1.46, which sets
+ BOOST_FILESYSTEM_VERSION=3 by default.
+Author: Evgeni Golov <evgeni at debian.org>
+Bug-Debian: http://bugs.debian.org/625109
+
+--- performous-0.6.1.orig/CMakeLists.txt
++++ performous-0.6.1/CMakeLists.txt
+@@ -12,6 +12,8 @@ include(cmake/performous-packaging.cmake
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+ 
++add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
++
+ # Add a sensible build type default and warning because empty means no optimization and no debug info.
+ if(NOT CMAKE_BUILD_TYPE)
+ 	message("WARNING: CMAKE_BUILD_TYPE is not defined!\n         Defaulting to CMAKE_BUILD_TYPE=RelWithDebInfo. Use ccmake to set a proper value.")

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2011-05-11 11:20:27 UTC (rev 12330)
+++ packages/trunk/performous/debian/patches/series	2011-05-11 11:56:00 UTC (rev 12331)
@@ -1 +1,2 @@
 desktop.patch
+boost_filesystem_v2.patch