← Back to branch summary

~ubuntu-branches/ubuntu/karmic/plee-the-bear/karmic

« back to all changes in this revision

Viewing changes to debian/patches/editors-default-dir.diff

  • Committer: Bazaar Package Importer
  • Author(s): Julien Jorge, Julien Jorge
  • Date: 2009-10-08 16:27:44 UTC
  • Revision ID: james.westby@ubuntu.com-20091008162744-20z334mbe4kv7wed
Tags: 0.4.1-3
http://bugs.debian.org/550224
[ Julien Jorge ]
* Remove the 'Section' line in the control file for bear-factory.
  Thanks Ben Finney (Closes: #550224).
* Install the binaries of the editors in /usr/games/
* Add a patch to change section in menu files of the editors from
  Apps/Editors to Games/Tools.
* Bug fix in patch editors-default-dir.diff to effectively set the
  default paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/editors-default-dir.diff
1
 
Index: plee-the-bear-0.4/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
 
1
Index: plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
2
2
===================================================================
3
 
--- plee-the-bear-0.4.orig/bear-factory/bear-editor/src/bf/code/path_configuration.cpp  2009-08-27 00:45:41.000000000 +0200
4
 
+++ plee-the-bear-0.4/bear-factory/bear-editor/src/bf/code/path_configuration.cpp       2009-08-27 00:56:54.000000000 +0200
5
 
@@ -235,6 +235,14 @@
6
 
                it!=config.field_end(s_data_directory_field); ++it)
 
3
--- 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
 
4
+++ plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp     2009-10-16 22:23:21.000000000 +0200
 
5
@@ -236,6 +236,15 @@
7
6
             data_path.push_back(*it);
8
7
         }
9
 
+      else
10
 
+        {
11
 
+          item_class_path.clear();
12
 
+          item_class_path.push_back("/usr/share/bear-factory/item_description");
13
 
+          item_class_path.push_back("/usr/share/bear-factory/plee-the-bear/item_description");
14
 
+          data_path.clear();
15
 
+          data_path.push_back("/usr/share/games/plee-the-bear/");
16
 
+        }
17
8
     }
 
9
+
 
10
+    if ( item_class_path.empty() )
 
11
+      {
 
12
+        item_class_path.push_back("/usr/share/bear-factory/item-description");
 
13
+        item_class_path.push_back("/usr/share/bear-factory/plee-the-bear/item-description");
 
14
+      }
 
15
+
 
16
+    if ( data_path.empty() )
 
17
+      data_path.push_back("/usr/share/games/plee-the-bear/");
18
18
 } // path_configuration::load()
19
19
 
 
20
 /*----------------------------------------------------------------------------*/