r14674 - in packages/trunk/dnt/debian: . patches

[Vincent Prat]

Author: vivicoder-guest
Date: 2013-12-04 19:21:30 +0000 (Wed, 04 Dec 2013)
New Revision: 14674

Modified:
   packages/trunk/dnt/debian/dnt-data.install
   packages/trunk/dnt/debian/patches/data_path
Log:
Data directory replaced by /usr/share/games/dnt


Modified: packages/trunk/dnt/debian/dnt-data.install
===================================================================
--- packages/trunk/dnt/debian/dnt-data.install	2013-12-03 13:33:57 UTC (rev 14673)
+++ packages/trunk/dnt/debian/dnt-data.install	2013-12-04 19:21:30 UTC (rev 14674)
@@ -1,2 +1,2 @@
-debian/tmp/usr/local/share/dnt/data/* usr/share/dnt/data/
+debian/tmp/usr/local/share/dnt/data/* usr/share/games/dnt/
 debian/tmp/usr/local/share/locale/* usr/share/locale/

Modified: packages/trunk/dnt/debian/patches/data_path
===================================================================
--- packages/trunk/dnt/debian/patches/data_path	2013-12-03 13:33:57 UTC (rev 14673)
+++ packages/trunk/dnt/debian/patches/data_path	2013-12-04 19:21:30 UTC (rev 14674)
@@ -2,14 +2,16 @@
 Description: Modification of the CMAKE_INSTALL_PREFIX so that the executable finds the data directory
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -32,6 +32,7 @@
+@@ -32,7 +32,8 @@
  endif(${VERSION_PATCH})
  
  # Set directories
+-set(DATADIR ${CMAKE_INSTALL_PREFIX}/share)
 +set(CMAKE_INSTALL_PREFIX /usr)
- set(DATADIR ${CMAKE_INSTALL_PREFIX}/share)
++set(DATADIR ${CMAKE_INSTALL_PREFIX}/share/games)
  set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
  set(LOCALE_DIR share/locale)
+ set(INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
 --- a/src/app/partEditor/editor.cpp
 +++ b/src/app/partEditor/editor.cpp
 @@ -202,7 +202,7 @@
@@ -17,7 +19,7 @@
     fileWindow = gui->insertWindow(200,100,460,285,"File");
     fileSelector = fileWindow->getObjectsList()->insertFileSel(5,18,load,
 -                                                          "../data/particles/");
-+                                                          "/usr/share/dnt/data/particles/");
++                                                           "/usr/share/games/dnt/particles/");
     fileSelector->setFilter(".par");
     if( (!fileLoading) && (!curFileName.empty()) )
     {
@@ -28,7 +30,28 @@
     textureWindow = gui->insertWindow(200,100,460,285,"File");
     fileSelector = textureWindow->getObjectsList()->insertFileSel(5,18, true,
 -         "../data/particles/");
-+         "/usr/share/dnt/data/particles/");
++         "/usr/share/games/dnt/particles/");
     fileSelector->setFilter(".png");
     /*fileSelector->setFileName(part->getTextureFileName());*/
     textureWindow->setAttributes(false,true,false,false);
+--- a/src/etc/dirs.cpp
++++ b/src/etc/dirs.cpp
+@@ -43,7 +43,6 @@
+ #else
+    dataDir += "/";
+    dataDir += PACKAGE;
+-   dataDir += "/data";
+ #endif
+    
+ #if defined (__amigaos4__)
+--- a/src/app/mapEditor/guiIO.cpp
++++ b/src/app/mapEditor/guiIO.cpp
+@@ -115,7 +115,7 @@
+    fileLoading = load;
+    fileWindow = gui->insertWindow(200,100,460,285,"File");
+    fileSelector = fileWindow->getObjectsList()->insertFileSel(5,18,load,
+-         dir.getRealFile("../data/mapas/"));
++         dir.getRealFile("mapas/"));
+    fileSelector->setFilter(".map");
+    if( (!fileLoading) && (!curFileName.empty()) )
+    {