r14867 - in packages/trunk/plee-the-bear/debian: . patches
Vincent Cheng
vcheng at moszumanska.debian.org
Thu Jan 23 21:28:17 UTC 2014
Author: vcheng
Date: 2014-01-23 21:28:16 +0000 (Thu, 23 Jan 2014)
New Revision: 14867
Modified:
packages/trunk/plee-the-bear/debian/changelog
packages/trunk/plee-the-bear/debian/patches/do-not-install-authors-files.diff
packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff
packages/trunk/plee-the-bear/debian/patches/full-path-menu-icon.diff
packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff
packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff
Log:
plee-the-bear: Refresh patches
Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog 2014-01-23 21:25:12 UTC (rev 14866)
+++ packages/trunk/plee-the-bear/debian/changelog 2014-01-23 21:28:16 UTC (rev 14867)
@@ -17,6 +17,7 @@
(closes: #726853)
[ Vincent Cheng ]
+ * Refresh patches.
* Update to Standards version 3.9.5.
* Update to source format "3.0 (quilt)".
Modified: packages/trunk/plee-the-bear/debian/patches/do-not-install-authors-files.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/do-not-install-authors-files.diff 2014-01-23 21:25:12 UTC (rev 14866)
+++ packages/trunk/plee-the-bear/debian/patches/do-not-install-authors-files.diff 2014-01-23 21:28:16 UTC (rev 14867)
@@ -1,12 +1,10 @@
-Index: plee-the-bear-0.4/plee-the-bear/data/CMakeLists.txt
-===================================================================
---- plee-the-bear-0.4.orig/plee-the-bear/data/CMakeLists.txt 2009-09-01 23:21:16.000000000 +0200
-+++ plee-the-bear-0.4/plee-the-bear/data/CMakeLists.txt 2009-09-01 23:24:04.000000000 +0200
-@@ -23,6 +23,7 @@
- PATTERN "*.flac" EXCLUDE
+--- a/plee-the-bear/data/CMakeLists.txt
++++ b/plee-the-bear/data/CMakeLists.txt
+@@ -25,6 +25,7 @@
+ PATTERN "*.gz" EXCLUDE
PATTERN "*.bz2" EXCLUDE
PATTERN "README" EXCLUDE
+ PATTERN "AUTHORS" EXCLUDE
)
- INSTALL(
+ install(
Modified: packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff 2014-01-23 21:25:12 UTC (rev 14866)
+++ packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff 2014-01-23 21:28:16 UTC (rev 14867)
@@ -1,8 +1,6 @@
-Index: plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
-===================================================================
---- plee-the-bear-0.4.1.orig/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2009-10-16 22:06:17.000000000 +0200
-+++ plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2009-10-16 22:23:21.000000000 +0200
-@@ -236,6 +236,15 @@
+--- a/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
++++ b/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
+@@ -256,6 +256,15 @@
data_path.push_back(*it);
}
}
Modified: packages/trunk/plee-the-bear/debian/patches/full-path-menu-icon.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/full-path-menu-icon.diff 2014-01-23 21:25:12 UTC (rev 14866)
+++ packages/trunk/plee-the-bear/debian/patches/full-path-menu-icon.diff 2014-01-23 21:28:16 UTC (rev 14867)
@@ -1,37 +1,29 @@
-Index: plee-the-bear-0.6.0/plee-the-bear/desktop/menu/plee-the-bear
-===================================================================
---- plee-the-bear-0.6.0.orig/plee-the-bear/desktop/menu/plee-the-bear 2013-10-20 09:17:40.193780323 +0200
-+++ plee-the-bear-0.6.0/plee-the-bear/desktop/menu/plee-the-bear 2013-10-20 09:17:40.189780323 +0200
+--- a/plee-the-bear/desktop/menu/plee-the-bear
++++ b/plee-the-bear/desktop/menu/plee-the-bear
@@ -2,4 +2,4 @@
title="Plee the Bear" \
command="plee-the-bear" \
hints="Catch your son, he ate all your honey and ran away." \
- icon="ptb.xpm"
+ icon="/usr/share/pixmaps/ptb.xpm"
-Index: plee-the-bear-0.6.0/bear-factory/desktop/menu/bf-animation-editor
-===================================================================
---- plee-the-bear-0.6.0.orig/bear-factory/desktop/menu/bf-animation-editor 2010-11-19 09:10:55.000000000 +0100
-+++ plee-the-bear-0.6.0/bear-factory/desktop/menu/bf-animation-editor 2013-10-20 09:32:47.173815090 +0200
+--- a/bear-factory/desktop/menu/bf-animation-editor
++++ b/bear-factory/desktop/menu/bf-animation-editor
@@ -2,4 +2,4 @@
title="Bear Factory — Animation Editor" \
command="bf-animation-editor" \
hints="Animation editor for the Bear Engine." \
- icon="bear-factory.xpm"
+ icon="/usr/share/pixmaps/bear-factory.xpm"
-Index: plee-the-bear-0.6.0/bear-factory/desktop/menu/bf-level-editor
-===================================================================
---- plee-the-bear-0.6.0.orig/bear-factory/desktop/menu/bf-level-editor 2010-11-19 09:10:55.000000000 +0100
-+++ plee-the-bear-0.6.0/bear-factory/desktop/menu/bf-level-editor 2013-10-20 09:32:42.561814914 +0200
+--- a/bear-factory/desktop/menu/bf-level-editor
++++ b/bear-factory/desktop/menu/bf-level-editor
@@ -2,4 +2,4 @@
title="Bear Factory — Level Editor" \
command="bf-level-editor" \
hints="Level editor for the Bear Engine." \
- icon="bear-factory.xpm"
+ icon="/usr/share/pixmaps/bear-factory.xpm"
-Index: plee-the-bear-0.6.0/bear-factory/desktop/menu/bf-model-editor
-===================================================================
---- plee-the-bear-0.6.0.orig/bear-factory/desktop/menu/bf-model-editor 2010-11-19 09:10:55.000000000 +0100
-+++ plee-the-bear-0.6.0/bear-factory/desktop/menu/bf-model-editor 2013-10-20 09:32:38.245814748 +0200
+--- a/bear-factory/desktop/menu/bf-model-editor
++++ b/bear-factory/desktop/menu/bf-model-editor
@@ -2,4 +2,4 @@
title="Bear Factory — Model Editor" \
command="bf-model-editor" \
Modified: packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff 2014-01-23 21:25:12 UTC (rev 14866)
+++ packages/trunk/plee-the-bear/debian/patches/ptb-filesystem-v3.diff 2014-01-23 21:28:16 UTC (rev 14867)
@@ -1,6 +1,5 @@
-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
+--- a/bear-engine/CMakeLists.txt
++++ b/bear-engine/CMakeLists.txt
@@ -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)" )
@@ -9,9 +8,8 @@
#-------------------------------------------------------------------------------
# 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
+--- a/bear-engine/core/src/engine/code/game_local_client.cpp
++++ b/bear-engine/core/src/engine/code/game_local_client.cpp
@@ -368,7 +368,7 @@
if ( !result.empty() )
@@ -45,9 +43,8 @@
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
+--- a/bear-engine/core/src/engine/code/resource_pool.cpp
++++ b/bear-engine/core/src/engine/code/resource_pool.cpp
@@ -131,19 +131,13 @@
for (it=m_path.begin(); (it!=m_path.end()) && !result; ++it)
@@ -70,9 +67,8 @@
}
}
-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
+--- a/bear-factory/animation-editor/src/bf/code/configuration.cpp
++++ b/bear-factory/animation-editor/src/bf/code/configuration.cpp
@@ -116,10 +116,9 @@
{
bool result = false;
@@ -86,9 +82,8 @@
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
+--- a/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
++++ b/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
@@ -130,7 +130,7 @@
*/
bool bf::path_configuration::get_full_path( std::string& p ) const
@@ -133,7 +128,7 @@
}
}
-@@ -268,8 +264,7 @@
+@@ -277,8 +273,7 @@
{
bool result = false;
@@ -143,7 +138,7 @@
if ( boost::filesystem::exists( path ) )
result = boost::filesystem::is_directory( path );
-@@ -291,8 +286,7 @@
+@@ -300,8 +295,7 @@
if ( create_config_directory() )
{
boost::filesystem::path path
@@ -153,7 +148,7 @@
if ( !boost::filesystem::exists( path ) )
{
-@@ -389,7 +383,7 @@
+@@ -398,7 +392,7 @@
for (it=data_path.begin(); (it!=data_path.end()) && (candidates.size() < m);
++it)
{
@@ -162,7 +157,7 @@
if ( boost::filesystem::exists( dirpath ) )
if ( boost::filesystem::is_directory( dirpath ) )
-@@ -436,7 +430,7 @@
+@@ -445,7 +439,7 @@
( const std::string& dirname, const std::string& pattern, std::size_t offset,
std::size_t m, std::list<std::string>& result ) const
{
@@ -171,7 +166,7 @@
CLAW_PRECOND( boost::filesystem::is_directory(path) );
-@@ -444,13 +438,17 @@
+@@ -453,13 +447,17 @@
const boost::filesystem::directory_iterator eit;
for ( ; (it!=eit) && (result.size() < m); ++it )
@@ -196,9 +191,8 @@
} // 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
+--- a/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp
++++ b/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp
@@ -46,7 +46,7 @@
( const std::string& dir, Func& f, Iterator first_ext, Iterator last_ext )
{
@@ -224,9 +218,8 @@
}
} // 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
+--- a/bear-factory/CMakeLists.txt
++++ b/bear-factory/CMakeLists.txt
@@ -59,7 +59,6 @@
message( FATAL_ERROR
"You must have boost::system and boost::filesystem libraries installed (at least 1.35)" )
@@ -235,9 +228,8 @@
#-------------------------------------------------------------------------------
# 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
+--- a/bear-factory/level-editor/src/bf/code/configuration.cpp
++++ b/bear-factory/level-editor/src/bf/code/configuration.cpp
@@ -151,10 +151,9 @@
{
bool result = false;
@@ -251,9 +243,8 @@
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
+--- a/bear-factory/model-editor/src/bf/code/configuration.cpp
++++ b/bear-factory/model-editor/src/bf/code/configuration.cpp
@@ -124,10 +124,9 @@
{
bool result = false;
@@ -267,9 +258,8 @@
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
+--- a/plee-the-bear/CMakeLists.txt
++++ b/plee-the-bear/CMakeLists.txt
@@ -68,7 +68,7 @@
#-------------------------------------------------------------------------------
@@ -287,9 +277,8 @@
#-------------------------------------------------------------------------------
# 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
+--- a/plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp
++++ b/plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp
@@ -68,7 +68,7 @@
{
boost::filesystem::path path
@@ -299,9 +288,8 @@
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
+--- a/plee-the-bear/src/ptb/frame/code/frame_profiles.cpp
++++ b/plee-the-bear/src/ptb/frame/code/frame_profiles.cpp
@@ -73,7 +73,7 @@
{
boost::filesystem::path path
Modified: packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff 2014-01-23 21:25:12 UTC (rev 14866)
+++ packages/trunk/plee-the-bear/debian/patches/ptb-signals-v2.diff 2014-01-23 21:28:16 UTC (rev 14867)
@@ -1,6 +1,5 @@
-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
+--- a/bear-engine/core/src/engine/code/game.cpp
++++ b/bear-engine/core/src/engine/code/game.cpp
@@ -407,7 +407,7 @@
* \param name The name of the variable.
* \param f The listener.
@@ -46,9 +45,8 @@
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
+--- a/bear-engine/core/src/engine/code/game_local_client.cpp
++++ b/bear-engine/core/src/engine/code/game_local_client.cpp
@@ -463,7 +463,7 @@
* \param name The name of the variable.
* \param f The listener.
@@ -103,9 +101,8 @@
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
+--- a/bear-engine/core/src/engine/game.hpp
++++ b/bear-engine/core/src/engine/game.hpp
@@ -104,20 +104,20 @@
void save_game_variables
( std::ostream& os, const std::string& pattern = ".*" );
@@ -132,9 +129,8 @@
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
+--- a/bear-engine/core/src/engine/game_local_client.hpp
++++ b/bear-engine/core/src/engine/game_local_client.hpp
@@ -137,20 +137,20 @@
bool game_variable_exists( const base_variable& val ) const;
void get_all_game_variables( var_map& vars ) const;
@@ -170,9 +166,8 @@
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
+--- a/bear-engine/core/src/engine/variable/code/var_map.cpp
++++ b/bear-engine/core/src/engine/variable/code/var_map.cpp
@@ -36,7 +36,7 @@
*/
template<typename T>
@@ -200,9 +195,8 @@
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
+--- a/bear-engine/core/src/engine/variable/impl/var_map.tpp
++++ b/bear-engine/core/src/engine/variable/impl/var_map.tpp
@@ -37,10 +37,10 @@
* \param name The name of the variable to listen.
*/
@@ -225,9 +219,8 @@
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
+--- a/bear-engine/core/src/engine/variable/var_map.hpp
++++ b/bear-engine/core/src/engine/variable/var_map.hpp
@@ -36,7 +36,7 @@
#include <claw/meta/type_list.hpp>
@@ -268,9 +261,8 @@
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
+--- a/plee-the-bear/src/ptb/item/code/power_effect.cpp
++++ b/plee-the-bear/src/ptb/item/code/power_effect.cpp
@@ -127,12 +127,12 @@
/*----------------------------------------------------------------------------*/
@@ -287,9 +279,8 @@
} // 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
+--- a/plee-the-bear/src/ptb/item/power_effect.hpp
++++ b/plee-the-bear/src/ptb/item/power_effect.hpp
@@ -35,7 +35,7 @@
#include "universe/forced_movement/forced_rotation.hpp"
@@ -317,9 +308,8 @@
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
+--- a/plee-the-bear/src/ptb/layer/status_layer.hpp
++++ b/plee-the-bear/src/ptb/layer/status_layer.hpp
@@ -181,7 +181,7 @@
const static double s_bar_length;
@@ -338,9 +328,8 @@
}; // 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
+--- a/plee-the-bear/src/ptb/player_signals.hpp
++++ b/plee-the-bear/src/ptb/player_signals.hpp
@@ -29,7 +29,7 @@
#ifndef __PTB_PLAYER_SIGNALS_HPP__
#define __PTB_PLAYER_SIGNALS_HPP__
@@ -399,9 +388,8 @@
}; // 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
+--- a/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
++++ b/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
@@ -32,7 +32,7 @@
#include "ptb/throwable_item/throwable_item.hpp"
#include "universe/types.hpp"
More information about the Pkg-games-commits
mailing list