[SCM] Packaging for TooHardForYou branch, master, updated. debian/1.3-1-28-g793f7e6

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 3df60f8d408d90a72ad160a2493b4b96d285e776
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Fri Jul 11 01:30:21 2008 +0200

    patch 02_config-and-scores-in-home: store config and scores in ~

diff --git a/debian/changelog b/debian/changelog
index 689a531..079b029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,6 @@
     initial configuration selection, though tweaking the config file works.
   * Added the following patches:
     - 01_absolute-data-path: use absolute path for data file references
+    - 02_config-and-scores-in-home: store config and scores in ~
 
- -- Gerfried Fuchs <rhonda at debian.at>  Fri, 11 Jul 2008 00:40:43 +0200
+ -- Gerfried Fuchs <rhonda at debian.at>  Fri, 11 Jul 2008 01:30:02 +0200
diff --git a/debian/patches/02_config-and-scores-in-home b/debian/patches/02_config-and-scores-in-home
new file mode 100644
index 0000000..729f7c1
--- /dev/null
+++ b/debian/patches/02_config-and-scores-in-home
@@ -0,0 +1,24 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: store config and scores in ~
+
+Index: VCS/sources/main.cpp
+===================================================================
+--- VCS.orig/sources/main.cpp
++++ VCS/sources/main.cpp
+@@ -127,13 +127,14 @@ int main(int argc, char* argv[])
+ //Appellé par Init.
+ void CMyEngine::ParamInit(int iWidth,int iHeight)
+ {
++    const char* home_str = getenv("HOME");
+ 
+     SetIcon("/usr/share/games/2h4u/images/icone.png");
+ 
+     //Dans un premier temps, on charge le fichier de paramètres.
+-    m_Param.initParam("data/config.dat");
++    m_Param.initParam(home_str + "/.2h4u.config");
+ 
+-    m_Highscore.loadHighscore("data/HighScores.dat");
++    m_Highscore.loadHighscore(home_str + "/.2h4u.scores");
+ 
+         //Puis on fait plein écran ou fenetre suivant le cas.
+         if (m_Param.getFullscreen()==0)
diff --git a/debian/patches/series b/debian/patches/series
index 84f3fb4..73b5bb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_absolute-data-path
+02_config-and-scores-in-home
diff --git a/debian/rules b/debian/rules
index a89a5f2..6bbaf53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,12 +46,14 @@ install: build
 	$(checkroot)
 	-rm -rf $(TMP) debian/substvars
 	$(INSTALL_DIR) $(TMP)
-	cd $(TMP) && $(INSTALL_DIR) usr/games usr/share/doc/$(PKG)/html/images
+	cd $(TMP) && $(INSTALL_DIR) usr/games usr/share/games \
+		usr/share/doc/$(PKG)/html/images
 	$(INSTALL_PROGRAM) 2H4U $(TMP)/usr/games/2h4u
 	$(INSTALL_FILE) LISEZ-MOI.txt README.txt \
 		$(TMP)/usr/share/doc/$(PKG)
 	$(INSTALL_FILE) help/*.htm $(TMP)/usr/share/doc/$(PKG)/html
 	$(INSTALL_FILE) help/images/* $(TMP)/usr/share/doc/$(PKG)/html/images
+	cp -r data $(TMP)/usr/share/games/$(PKG)
 	$(INSTALL_FILE) debian/copyright $(TMP)/usr/share/doc/$(PKG)
 
 

-- 
Packaging for TooHardForYou