r14551 - in packages/trunk/plee-the-bear/debian: . patches
Gonéri Le Bouder
goneri at alioth.debian.org
Mon Sep 9 07:57:51 UTC 2013
Author: goneri
Date: 2013-09-09 07:57:51 +0000 (Mon, 09 Sep 2013)
New Revision: 14551
Added:
packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff
packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff
Modified:
packages/trunk/plee-the-bear/debian/changelog
packages/trunk/plee-the-bear/debian/control
packages/trunk/plee-the-bear/debian/patches/series
Log:
* import patches by Julien Jorge to fix a FTBFS with the current
Boost.FileSystem (closes: #720819)
* Add myself in Uploaders
* Indent the B-D
The patchs are broken. A mail has been sent to Julien.
Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog 2013-09-07 22:33:37 UTC (rev 14550)
+++ packages/trunk/plee-the-bear/debian/changelog 2013-09-09 07:57:51 UTC (rev 14551)
@@ -1,7 +1,14 @@
-plee-the-bear (0.6.0-2) UNRELEASED; urgency=low
+plee-the-bear (0.6.0-2) unstable; urgency=low
+ [ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
+ [ Gonéri Le Bouder ]
+ * import patches by Julien Jorge to fix a FTBFS with the current
+ Boost.FileSystem (closes: #720819)
+ * Add myself in Uploaders
+ * Indent the B-D
+
-- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:57 +0200
plee-the-bear (0.6.0-1) unstable; urgency=low
Modified: packages/trunk/plee-the-bear/debian/control
===================================================================
--- packages/trunk/plee-the-bear/debian/control 2013-09-07 22:33:37 UTC (rev 14550)
+++ packages/trunk/plee-the-bear/debian/control 2013-09-09 07:57:51 UTC (rev 14551)
@@ -2,7 +2,10 @@
Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Julien Jorge <julien.jorge at gamned.org>, Barry deFreese <bdefreese at debian.org>
+Uploaders:
+ Julien Jorge <julien.jorge at gamned.org>,
+ Barry deFreese <bdefreese at debian.org>,
+ Gonéri Le Bouder <goneri at rulezlan.org>
Build-Depends: quilt, docbook-to-man, debhelper (>= 5.0.51), cmake (>= 2.8),
libsdl-mixer1.2-dev (>= 1.2.8), libboost-filesystem-dev (>= 1.45),
libboost-regex-dev (>= 1.45), libboost-thread-dev (>= 1.45),
Added: packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff 2013-09-09 07:57:51 UTC (rev 14551)
@@ -0,0 +1,345 @@
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/CMakeLists.txt plee-the-bear-0.6.0-light/bear-engine/CMakeLists.txt
+--- plee-the-bear-0.6.0-light.orig/bear-engine/CMakeLists.txt 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/CMakeLists.txt 2013-09-08 11:54:48.422122596 +0200
+@@ -56,7 +56,6 @@
+ message( FATAL_ERROR
+ "You must have boost::filesystem, boost::signals, boost::thread and boost::regex libraries installed (at least 1.35)" )
+ endif( NOT Boost_FOUND )
+-add_definitions(-D BOOST_FILESYSTEM_VERSION=2)
+
+ #-------------------------------------------------------------------------------
+ # Include directories for Boost
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/CMakeLists.txt.rej plee-the-bear-0.6.0-light/bear-engine/CMakeLists.txt.rej
+--- plee-the-bear-0.6.0-light.orig/bear-engine/CMakeLists.txt.rej 1970-01-01 01:00:00.000000000 +0100
++++ plee-the-bear-0.6.0-light/bear-engine/CMakeLists.txt.rej 2013-09-08 11:56:42.150126955 +0200
+@@ -0,0 +1,10 @@
++--- bear-engine/CMakeLists.txt
+++++ bear-engine/CMakeLists.txt
++@@ -43,7 +43,6 @@
++ message( FATAL_ERROR
++ "You must have boost::filesystem, boost::signals, boost::thread and boost::regex libraries installed (at least 1.42)" )
++ endif( NOT Boost_FOUND )
++-add_definitions(-D BOOST_FILESYSTEM_VERSION=2)
++
++ #-------------------------------------------------------------------------------
++ # Include directories for Boost
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/game_local_client.cpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/game_local_client.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/game_local_client.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/game_local_client.cpp 2013-09-08 12:24:12.870190232 +0200
+@@ -368,7 +368,7 @@
+
+ if ( !result.empty() )
+ {
+- boost::filesystem::path path( result, boost::filesystem::native );
++ boost::filesystem::path path( result );
+ path /= name;
+ result = path.string();
+ }
+@@ -624,12 +624,12 @@
+ std::string bear::engine::game_local_client::get_game_directory() const
+ {
+ boost::filesystem::path dir
+- (claw::system_info::get_user_directory(), boost::filesystem::native);
++ ( claw::system_info::get_user_directory() );
+
+ std::string result;
+ std::string subdir = '.' + get_game_name_as_filename();
+
+- dir /= boost::filesystem::path(subdir, boost::filesystem::native);
++ dir /= boost::filesystem::path(subdir);
+
+ if ( create_game_directory(dir.string()) )
+ result = dir.string();
+@@ -649,7 +649,7 @@
+ ( const std::string& dir ) const
+ {
+ bool result = false;
+- boost::filesystem::path path( dir, boost::filesystem::native );
++ boost::filesystem::path path( dir );
+
+ if ( boost::filesystem::exists( path ) )
+ result = boost::filesystem::is_directory( path );
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/resource_pool.cpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/resource_pool.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/resource_pool.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/resource_pool.cpp 2013-09-08 11:56:42.166126956 +0200
+@@ -131,19 +131,13 @@
+
+ for (it=m_path.begin(); (it!=m_path.end()) && !result; ++it)
+ {
+-#if BOOST_VERSION / 100 % 1000 < 34
+- const std::string filepath = *it + '/' + name;
+-#else
+- const std::string filepath =
+- *it + boost::filesystem::slash<boost::filesystem::path>::value + name;
+-#endif
+- const boost::filesystem::path path( filepath, boost::filesystem::native );
++ const boost::filesystem::path path( boost::filesystem::path(*it) / name );
+
+ if ( boost::filesystem::exists( path ) )
+ if ( !boost::filesystem::is_directory( path ) )
+ {
+ result = true;
+- name = filepath;
++ name = path.string();
+ }
+ }
+
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-factory/animation-editor/src/bf/code/configuration.cpp plee-the-bear-0.6.0-light/bear-factory/animation-editor/src/bf/code/configuration.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-factory/animation-editor/src/bf/code/configuration.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-factory/animation-editor/src/bf/code/configuration.cpp 2013-09-08 11:56:54.426127426 +0200
+@@ -116,10 +116,9 @@
+ {
+ bool result = false;
+
+- boost::filesystem::path path
++ const boost::filesystem::path path
+ ( path_configuration::get_instance().get_config_directory()
+- + s_config_file_name,
+- boost::filesystem::native );
++ + s_config_file_name );
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-factory/bear-editor/src/bf/code/path_configuration.cpp plee-the-bear-0.6.0-light/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2013-09-08 11:56:54.426127426 +0200
+@@ -130,7 +130,7 @@
+ */
+ bool bf::path_configuration::get_full_path( std::string& p ) const
+ {
+- boost::filesystem::path path( p, boost::filesystem::native );
++ boost::filesystem::path path( p );
+ bool result = boost::filesystem::exists( path );
+ std::list<std::string>::const_reverse_iterator it;
+
+@@ -191,14 +191,14 @@
+ */
+ bool bf::path_configuration::get_relative_path( std::string& p ) const
+ {
+- boost::filesystem::path path( p, boost::filesystem::native );
++ boost::filesystem::path path( p );
+ bool result = false;
+ std::list<std::string>::const_reverse_iterator it;
+
+ for (it=data_path.rbegin(); !result && (it!=data_path.rend()); ++it)
+ {
+ bool stop(false);
+- boost::filesystem::path data( *it, boost::filesystem::native );
++ boost::filesystem::path data( *it );
+ boost::filesystem::path::iterator pit = path.begin();
+ boost::filesystem::path::iterator dit = data.begin();
+
+@@ -214,14 +214,10 @@
+ if ( dit == data.end() )
+ {
+ result = true;
+- p = *pit;
++ p = pit->string();
++
+ for ( ++pit; pit!=path.end(); ++pit )
+-#if BOOST_VERSION / 100 % 1000 < 34
+- p += '/' + *pit;
+-#else
+- p +=
+- boost::filesystem::slash<boost::filesystem::path>::value + *pit;
+-#endif
++ p = (boost::filesystem::path(p) / *pit).string();
+ }
+ }
+
+@@ -268,8 +264,7 @@
+ {
+ bool result = false;
+
+- boost::filesystem::path path
+- ( get_config_directory(), boost::filesystem::native );
++ boost::filesystem::path path( get_config_directory() );
+
+ if ( boost::filesystem::exists( path ) )
+ result = boost::filesystem::is_directory( path );
+@@ -291,8 +286,7 @@
+ if ( create_config_directory() )
+ {
+ boost::filesystem::path path
+- ( get_config_directory() + s_config_file_name,
+- boost::filesystem::native );
++ ( get_config_directory() + s_config_file_name );
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+@@ -389,7 +383,7 @@
+ for (it=data_path.begin(); (it!=data_path.end()) && (candidates.size() < m);
+ ++it)
+ {
+- const boost::filesystem::path dirpath( *it, boost::filesystem::native );
++ const boost::filesystem::path dirpath( *it );
+
+ if ( boost::filesystem::exists( dirpath ) )
+ if ( boost::filesystem::is_directory( dirpath ) )
+@@ -436,7 +430,7 @@
+ ( const std::string& dirname, const std::string& pattern, std::size_t offset,
+ std::size_t m, std::list<std::string>& result ) const
+ {
+- const boost::filesystem::path path( dirname, boost::filesystem::native );
++ const boost::filesystem::path path( dirname );
+
+ CLAW_PRECOND( boost::filesystem::is_directory(path) );
+
+@@ -444,13 +438,17 @@
+ const boost::filesystem::directory_iterator eit;
+
+ for ( ; (it!=eit) && (result.size() < m); ++it )
+- if ( boost::filesystem::is_directory(*it) )
+- {
+- if ( glob_potential_match(pattern, it->string(), offset) )
+- find_all_files_in_dir(it->string(), pattern, offset, m, result);
+- }
+- else if ( glob_match(pattern, it->string(), offset) )
+- result.push_back(it->string());
++ {
++ const std::string entry_path( it->path().string() );
++
++ if ( boost::filesystem::is_directory(*it) )
++ {
++ if ( glob_potential_match(pattern, entry_path, offset) )
++ find_all_files_in_dir(entry_path, pattern, offset, m, result);
++ }
++ else if ( glob_match(pattern, entry_path, offset) )
++ result.push_back( entry_path );
++ }
+ } // path_configuration::find_all_files_in_dir()
+
+ /*----------------------------------------------------------------------------*/
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp plee-the-bear-0.6.0-light/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp
+--- plee-the-bear-0.6.0-light.orig/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2013-09-08 11:56:54.438127426 +0200
+@@ -46,7 +46,7 @@
+ ( const std::string& dir, Func& f, Iterator first_ext, Iterator last_ext )
+ {
+ std::queue<boost::filesystem::path> pending;
+- boost::filesystem::path path(dir, boost::filesystem::native);
++ boost::filesystem::path path(dir);
+
+ if ( !boost::filesystem::exists(path) )
+ return;
+@@ -64,8 +64,13 @@
+ for ( ; it!=eit; ++it)
+ if ( boost::filesystem::is_directory(*it) )
+ pending.push(*it);
+- else if (supported_extension( it->string(), first_ext, last_ext ))
+- f(it->string());
++ else
++ {
++ const std::string file_name( it->path().string() );
++
++ if ( supported_extension( file_name, first_ext, last_ext ) )
++ f( file_name );
++ }
+ }
+ } // scan_dir::operator()
+
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-factory/CMakeLists.txt plee-the-bear-0.6.0-light/bear-factory/CMakeLists.txt
+--- plee-the-bear-0.6.0-light.orig/bear-factory/CMakeLists.txt 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-factory/CMakeLists.txt 2013-09-08 11:56:54.426127426 +0200
+@@ -59,7 +59,6 @@
+ message( FATAL_ERROR
+ "You must have boost::system and boost::filesystem libraries installed (at least 1.35)" )
+ endif( NOT Boost_FOUND )
+-add_definitions(-D BOOST_FILESYSTEM_VERSION=2)
+
+ #-------------------------------------------------------------------------------
+ # Link directories for Boost
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-factory/level-editor/src/bf/code/configuration.cpp plee-the-bear-0.6.0-light/bear-factory/level-editor/src/bf/code/configuration.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-factory/level-editor/src/bf/code/configuration.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-factory/level-editor/src/bf/code/configuration.cpp 2013-09-08 11:56:54.438127426 +0200
+@@ -151,10 +151,9 @@
+ {
+ bool result = false;
+
+- boost::filesystem::path path
++ const boost::filesystem::path path
+ ( path_configuration::get_instance().get_config_directory()
+- + s_config_file_name,
+- boost::filesystem::native );
++ + s_config_file_name );
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-factory/model-editor/src/bf/code/configuration.cpp plee-the-bear-0.6.0-light/bear-factory/model-editor/src/bf/code/configuration.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-factory/model-editor/src/bf/code/configuration.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-factory/model-editor/src/bf/code/configuration.cpp 2013-09-08 11:56:54.450127427 +0200
+@@ -124,10 +124,9 @@
+ {
+ bool result = false;
+
+- boost::filesystem::path path
++ const boost::filesystem::path path
+ ( path_configuration::get_instance().get_config_directory()
+- + s_config_file_name,
+- boost::filesystem::native );
++ + s_config_file_name );
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/CMakeLists.txt plee-the-bear-0.6.0-light/plee-the-bear/CMakeLists.txt
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/CMakeLists.txt 2011-08-25 00:23:00.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/CMakeLists.txt 2013-09-08 11:54:53.566122793 +0200
+@@ -68,7 +68,7 @@
+
+ #-------------------------------------------------------------------------------
+ # Claw
+-FIND_SVN_CLAW()
++find_package( libclaw 1.7.0 )
+
+ #-------------------------------------------------------------------------------
+ # Include directories for Claw
+@@ -94,7 +94,6 @@
+ message( FATAL_ERROR
+ "You must have boost::filesystem and boost::thread libraries installed (at least 1.35)" )
+ endif( NOT Boost_FOUND )
+-add_definitions(-D BOOST_FILESYSTEM_VERSION=2)
+
+ #-------------------------------------------------------------------------------
+ # Include directories for Boost
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp 2013-09-08 12:29:17.522201911 +0200
+@@ -68,7 +68,7 @@
+ {
+ boost::filesystem::path path
+ ( bear::engine::game::get_instance().get_custom_game_file
+- (PTB_PROFILES_FOLDER) + name , boost::filesystem::native );
++ (PTB_PROFILES_FOLDER) + name );
+
+ if ( !boost::filesystem::exists(path) )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/frame/code/frame_profiles.cpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/frame/code/frame_profiles.cpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/frame/code/frame_profiles.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/frame/code/frame_profiles.cpp 2013-09-08 12:27:23.430197537 +0200
+@@ -73,7 +73,7 @@
+ {
+ boost::filesystem::path path
+ ( bear::engine::game::get_instance().get_custom_game_file
+- (PTB_PROFILES_FOLDER) + profile , boost::filesystem::native );
++ (PTB_PROFILES_FOLDER) + profile);
+
+ if ( boost::filesystem::exists(path) )
+ {
+@@ -283,7 +283,7 @@
+ unsigned int i = 0;
+ boost::filesystem::path path
+ ( bear::engine::game::get_instance().get_custom_game_file
+- (PTB_PROFILES_FOLDER), boost::filesystem::native );
++ (PTB_PROFILES_FOLDER) );
+
+ if ( !boost::filesystem::exists(path) )
+ boost::filesystem::create_directory( path );
+@@ -297,7 +297,7 @@
+ if ( boost::filesystem::is_directory(*it) &&
+ (i < PTB_NUMBER_OF_PROFILES) )
+ {
+- std::string dir(it->string());
++ std::string dir(it->path().string());
+ std::string name(dir, path.string().size(),
+ dir.size() - path.string().size());
+
Added: packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff 2013-09-09 07:57:51 UTC (rev 14551)
@@ -0,0 +1,426 @@
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/game.cpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/game.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/game.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/game.cpp 2013-09-08 12:46:00.314240351 +0200
+@@ -407,7 +407,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game::listen_int_variable_change
+ ( const std::string& name, const boost::function<void (int)>& f )
+ {
+@@ -421,7 +421,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game::listen_uint_variable_change
+ ( const std::string& name, const boost::function<void (unsigned int)>& f )
+ {
+@@ -434,7 +434,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game::listen_bool_variable_change
+ ( const std::string& name, const boost::function<void (bool)>& f )
+ {
+@@ -447,7 +447,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game::listen_double_variable_change
+ ( const std::string& name, const boost::function<void (double)>& f )
+ {
+@@ -460,7 +460,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game::listen_string_variable_change
+ ( const std::string& name, const boost::function<void (std::string)>& f )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/game_local_client.cpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/game_local_client.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/code/game_local_client.cpp 2013-09-08 12:35:32.030216267 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/code/game_local_client.cpp 2013-09-08 12:46:00.314240351 +0200
+@@ -463,7 +463,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game_local_client::listen_int_variable_change
+ ( const std::string& name, const boost::function<void (int)>& f )
+ {
+@@ -477,7 +477,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game_local_client::listen_uint_variable_change
+ ( const std::string& name, const boost::function<void (unsigned int)>& f )
+ {
+@@ -490,7 +490,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game_local_client::listen_bool_variable_change
+ ( const std::string& name, const boost::function<void (bool)>& f )
+ {
+@@ -503,7 +503,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game_local_client::listen_double_variable_change
+ ( const std::string& name, const boost::function<void (double)>& f )
+ {
+@@ -516,7 +516,7 @@
+ * \param name The name of the variable.
+ * \param f The listener.
+ */
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game_local_client::listen_string_variable_change
+ ( const std::string& name, const boost::function<void (std::string)>& f )
+ {
+@@ -1183,7 +1183,7 @@
+ * \param f The function to call when the value of the variable change.
+ */
+ template<typename T>
+-boost::signals::connection
++boost::signals2::connection
+ bear::engine::game_local_client::listen_variable_change
+ ( const std::string& name, boost::function<void (T)> f )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/game.hpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/game.hpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/game.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/game.hpp 2013-09-08 12:46:00.310240351 +0200
+@@ -104,20 +104,20 @@
+ void save_game_variables
+ ( std::ostream& os, const std::string& pattern = ".*" );
+
+- boost::signals::connection
++ boost::signals2::connection
+ listen_int_variable_change
+ ( const std::string& name, const boost::function<void (int)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_uint_variable_change
+ ( const std::string& name,
+ const boost::function<void (unsigned int)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_bool_variable_change
+ ( const std::string& name, const boost::function<void (bool)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_double_variable_change
+ ( const std::string& name, const boost::function<void (double)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_string_variable_change
+ ( const std::string& name,
+ const boost::function<void (const std::string)>& f );
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/game_local_client.hpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/game_local_client.hpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/game_local_client.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/game_local_client.hpp 2013-09-08 12:46:00.318240351 +0200
+@@ -137,20 +137,20 @@
+ bool game_variable_exists( const base_variable& val ) const;
+ void get_all_game_variables( var_map& vars ) const;
+
+- boost::signals::connection
++ boost::signals2::connection
+ listen_int_variable_change
+ ( const std::string& name, const boost::function<void (int)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_uint_variable_change
+ ( const std::string& name,
+ const boost::function<void (unsigned int)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_bool_variable_change
+ ( const std::string& name, const boost::function<void (bool)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_double_variable_change
+ ( const std::string& name, const boost::function<void (double)>& f );
+- boost::signals::connection
++ boost::signals2::connection
+ listen_string_variable_change
+ ( const std::string& name,
+ const boost::function<void (std::string)>& f );
+@@ -201,7 +201,7 @@
+ ( const std::list<std::string>& args, const char sep );
+
+ template<typename T>
+- boost::signals::connection
++ boost::signals2::connection
+ listen_variable_change
+ ( const std::string& name, boost::function<void (T)> f );
+
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/variable/code/var_map.cpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/variable/code/var_map.cpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/variable/code/var_map.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/variable/code/var_map.cpp 2013-09-08 12:50:29.258250660 +0200
+@@ -36,7 +36,7 @@
+ */
+ template<typename T>
+ void bear::engine::var_map::delete_signal::operator()
+- ( const std::string& name, boost::signal<void (T)>* value ) const
++ ( const std::string& name, boost::signals2::signal<void (T)>* value ) const
+ {
+ delete value;
+ } // var_map::delete_signal::operator()()
+@@ -65,7 +65,7 @@
+ void bear::engine::var_map::trigger_signal::operator()
+ ( const std::string& name, const T& value ) const
+ {
+- typedef boost::signal<void (T)>* signal_type;
++ typedef boost::signals2::signal<void (T)>* signal_type;
+
+ if ( m_signals.exists<signal_type>(name) )
+ (*m_signals.get<signal_type>(name))(value);
+@@ -102,7 +102,7 @@
+ {
+ if ( !m_map.exists<T>(name) )
+ {
+- typedef boost::signal<void (T)>* signal_type;
++ typedef boost::signals2::signal<void (T)>* signal_type;
+
+ if ( m_signals.exists<signal_type>(name) )
+ {
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/variable/impl/var_map.tpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/variable/impl/var_map.tpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/variable/impl/var_map.tpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/variable/impl/var_map.tpp 2013-09-08 12:50:29.254250660 +0200
+@@ -37,10 +37,10 @@
+ * \param name The name of the variable to listen.
+ */
+ template<typename T>
+-boost::signal<void (T)>&
++boost::signals2::signal<void (T)>&
+ bear::engine::var_map::variable_changed( const std::string& name )
+ {
+- typedef boost::signal<void (T)> signal_type;
++ typedef boost::signals2::signal<void (T)> signal_type;
+
+ if ( !m_signals.exists<signal_type*>(name) )
+ m_signals.set<signal_type*>( name, new signal_type() );
+@@ -69,7 +69,7 @@
+ else
+ super::set<T>(k, v);
+
+- typedef boost::signal<void (T)> signal_type;
++ typedef boost::signals2::signal<void (T)> signal_type;
+
+ if ( signal && m_signals.exists<signal_type*>(k) )
+ (*m_signals.get<signal_type*>(k))(v);
+diff -Nur plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/variable/var_map.hpp plee-the-bear-0.6.0-light/bear-engine/core/src/engine/variable/var_map.hpp
+--- plee-the-bear-0.6.0-light.orig/bear-engine/core/src/engine/variable/var_map.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/bear-engine/core/src/engine/variable/var_map.hpp 2013-09-08 12:50:29.254250660 +0200
+@@ -36,7 +36,7 @@
+ #include <claw/meta/type_list.hpp>
+
+ #include <string>
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ namespace bear
+ {
+@@ -59,9 +59,9 @@
+
+ /** \brief The types of the signals used to observe the variables. */
+ typedef claw::meta::type_list_maker
+- < boost::signal<void (int)>*, boost::signal<void (unsigned int)>*,
+- boost::signal<void (bool)>*, boost::signal<void (double)>*,
+- boost::signal<void (std::string)>* >::result signal_types;
++ < boost::signals2::signal<void (int)>*, boost::signals2::signal<void (unsigned int)>*,
++ boost::signals2::signal<void (bool)>*, boost::signals2::signal<void (double)>*,
++ boost::signals2::signal<void (std::string)>* >::result signal_types;
+
+ /**
+ * \brief The map containing the signals associated with the variables.
+@@ -78,7 +78,7 @@
+ public:
+ template<typename T>
+ void operator()
+- ( const std::string& name, boost::signal<void (T)>* value ) const;
++ ( const std::string& name, boost::signals2::signal<void (T)>* value ) const;
+
+ }; // class delete_signal
+
+@@ -133,7 +133,7 @@
+ var_map& operator=( const var_map& that );
+
+ template<typename T>
+- boost::signal<void (T)>& variable_changed( const std::string& name );
++ boost::signals2::signal<void (T)>& variable_changed( const std::string& name );
+
+ template<typename T>
+ void set( const std::string& k, const T& v );
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/item/code/power_effect.cpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/item/code/power_effect.cpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/item/code/power_effect.cpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/item/code/power_effect.cpp 2013-09-08 12:46:00.318240351 +0200
+@@ -127,12 +127,12 @@
+
+ /*----------------------------------------------------------------------------*/
+ /**
+- * \brief Add a connection to a boost::signals instance.
++ * \brief Add a connection to a boost::signals2 instance.
+ * \param c The connection to follow.
+ */
+-void ptb::power_effect::connect( const boost::signals::connection& c )
++void ptb::power_effect::connect( const boost::signals2::connection& c )
+ {
+- m_signals.push_back( new boost::signals::scoped_connection(c) );
++ m_signals.push_back( new boost::signals2::scoped_connection(c) );
+ } // power_effect::connect()
+
+ /*----------------------------------------------------------------------------*/
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/item/power_effect.hpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/item/power_effect.hpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/item/power_effect.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/item/power_effect.hpp 2013-09-08 12:48:55.662247073 +0200
+@@ -35,7 +35,7 @@
+ #include "universe/forced_movement/forced_rotation.hpp"
+
+ #include <claw/smart_ptr.hpp>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ namespace ptb
+ {
+@@ -59,7 +59,7 @@
+
+ private:
+ typedef
+- std::list< claw::memory::smart_ptr<boost::signals::scoped_connection> >
++ std::list< claw::memory::smart_ptr<boost::signals2::scoped_connection> >
+ signal_connection_list;
+
+ public:
+@@ -72,7 +72,7 @@
+ ( std::list<bear::universe::physical_item*>& d ) const;
+
+ private:
+- void connect( const boost::signals::connection& c );
++ void connect( const boost::signals2::connection& c );
+
+ std::size_t get_powers_count() const;
+
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/layer/status_layer.hpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/layer/status_layer.hpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/layer/status_layer.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/layer/status_layer.hpp 2013-09-08 12:46:00.318240351 +0200
+@@ -181,7 +181,7 @@
+ const static double s_bar_length;
+
+ /** \brief The connections to various signals. */
+- std::list<boost::signals::connection> m_signals;
++ std::list<boost::signals2::connection> m_signals;
+
+ }; // class player_status
+
+@@ -283,7 +283,7 @@
+ const static unsigned int s_margin;
+
+ /** \brief The connections to various signals. */
+- std::list<boost::signals::connection> m_signals;
++ std::list<boost::signals2::connection> m_signals;
+
+ }; // class status_layer
+ } // namespace ptb
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/player_signals.hpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/player_signals.hpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/player_signals.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/player_signals.hpp 2013-09-08 12:50:29.258250660 +0200
+@@ -29,7 +29,7 @@
+ #ifndef __PTB_PLAYER_SIGNALS_HPP__
+ #define __PTB_PLAYER_SIGNALS_HPP__
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ namespace ptb
+ {
+@@ -41,37 +41,37 @@
+ {
+ public:
+ /** \brief The signal when the player enters in the water. */
+- boost::signal<void ()> enters_water_zone;
++ boost::signals2::signal<void ()> enters_water_zone;
+
+ /** \brief The signal when the player leaves the water. */
+- boost::signal<void ()> leaves_water_zone;
++ boost::signals2::signal<void ()> leaves_water_zone;
+
+ /** \brief The signal when the the oxygen gauge changes. */
+- boost::signal<void (double)> oxygen_gauge_changed;
++ boost::signals2::signal<void (double)> oxygen_gauge_changed;
+
+ /** \brief The signal when the player enters in a cold zone. */
+- boost::signal<void ()> enters_cold_zone;
++ boost::signals2::signal<void ()> enters_cold_zone;
+
+ /** \brief The signal when the player gos in a cold zone. */
+- boost::signal<void ()> leaves_cold_zone;
++ boost::signals2::signal<void ()> leaves_cold_zone;
+
+ /** \brief The signal when the the ice gauge changes. */
+- boost::signal<void (double)> cold_gauge_changed;
++ boost::signals2::signal<void (double)> cold_gauge_changed;
+
+ /** \brief The signal when the player enters in a heat zone. */
+- boost::signal<void ()> enters_heat_zone;
++ boost::signals2::signal<void ()> enters_heat_zone;
+
+ /** \brief The signal when the player leaves in a heat zone. */
+- boost::signal<void ()> leaves_heat_zone;
++ boost::signals2::signal<void ()> leaves_heat_zone;
+
+ /** \brief The signal when the the heat gauge changes. */
+- boost::signal<void (double)> heat_gauge_changed;
++ boost::signals2::signal<void (double)> heat_gauge_changed;
+
+ /** \brief The signal when the player wins energy. */
+- boost::signal<void (double)> energy_added;
++ boost::signals2::signal<void (double)> energy_added;
+
+ /** \brief The signal when the player loses energy. */
+- boost::signal<void (double)> energy_removed;
++ boost::signals2::signal<void (double)> energy_removed;
+ }; // class player_signals
+ } // namespace ptb
+
+diff -Nur plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
+--- plee-the-bear-0.6.0-light.orig/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp 2011-08-25 00:22:53.000000000 +0200
++++ plee-the-bear-0.6.0-light/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp 2013-09-08 12:50:29.258250660 +0200
+@@ -32,7 +32,7 @@
+ #include "ptb/throwable_item/throwable_item.hpp"
+ #include "universe/types.hpp"
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+ #include <map>
+
+ namespace ptb
+@@ -80,10 +80,10 @@
+
+ public:
+ /** \brief The signal when the selected throwable item changes. */
+- boost::signal<void (const std::string&)> throwable_item_changed;
++ boost::signals2::signal<void (const std::string&)> throwable_item_changed;
+
+ /** \brief The signal when stock of current throwable item changes. */
+- boost::signal<void (unsigned int)> throwable_item_stock_changed;
++ boost::signals2::signal<void (unsigned int)> throwable_item_stock_changed;
+ }; // class throwable_items_container
+ } // namespace ptb
+
Modified: packages/trunk/plee-the-bear/debian/patches/series
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/series 2013-09-07 22:33:37 UTC (rev 14550)
+++ packages/trunk/plee-the-bear/debian/patches/series 2013-09-09 07:57:51 UTC (rev 14551)
@@ -1,2 +1,4 @@
do-not-install-authors-files.diff
editors-default-dir.diff
+ptb-filesystem-v3.diff
+ptb-signals-v2.diff
More information about the Pkg-games-commits
mailing list