Author: j-jorge-guest
Date: 2009-10-16 20:45:28 +0000 (Fri, 16 Oct 2009)
New Revision: 10419
Modified:
packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff
Log:
editors-default-dir.diff was not refreshed in previous commit.
Modified: packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff
2009-10-16 20:34:49 UTC (rev 10418)
+++ packages/trunk/plee-the-bear/debian/patches/editors-default-dir.diff
2009-10-16 20:45:28 UTC (rev 10419)
@@ -1,19 +1,20 @@
-Index:
plee-the-bear-0.4/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
+Index:
plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
===================================================================
----
plee-the-bear-0.4.orig/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
2009-08-27 00:45:41.000000000 +0200
-+++
plee-the-bear-0.4/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
2009-08-27 00:56:54.000000000 +0200
-@@ -235,6 +235,14 @@
- it!=config.field_end(s_data_directory_field); ++it)
+---
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 @@
data_path.push_back(*it);
}
-+ else
-+ {
-+ item_class_path.clear();
-+
item_class_path.push_back("/usr/share/bear-factory/item-description");
-+
item_class_path.push_back("/usr/share/bear-factory/plee-the-bear/item-description");
-+ data_path.clear();
-+ data_path.push_back("/usr/share/games/plee-the-bear/");
-+ }
}
++
++ if ( item_class_path.empty() )
++ {
++ item_class_path.push_back("/usr/share/bear-factory/item-description");
++
item_class_path.push_back("/usr/share/bear-factory/plee-the-bear/item-description");
++ }
++
++ if ( data_path.empty() )
++ data_path.push_back("/usr/share/games/plee-the-bear/");
} // path_configuration::load()
+
/*----------------------------------------------------------------------------*/
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
