[SCM] Packaging for TooHardForYou branch, master, updated. debian/1.3-1-24-g7850e3d
Gerfried Fuchs
rhonda at debian.at
Thu Jul 10 22:41:57 UTC 2008
The following commit has been merged in the master branch:
commit 7850e3d9a3034a20543af1d0bfdf437445df7927
Author: Gerfried Fuchs <rhonda at debian.at>
Date: Fri Jul 11 00:40:47 2008 +0200
patch 01_absolute-data-path: use absolute path for data file references
diff --git a/debian/changelog b/debian/changelog
index f462c84..689a531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,7 @@
* Initial release (closes: #490231)
* Add a selfwritten German translation file. It isn't selectable through the
initial configuration selection, though tweaking the config file works.
+ * Added the following patches:
+ - 01_absolute-data-path: use absolute path for data file references
- -- Gerfried Fuchs <rhonda at debian.at> Fri, 11 Jul 2008 00:08:23 +0200
+ -- Gerfried Fuchs <rhonda at debian.at> Fri, 11 Jul 2008 00:40:43 +0200
diff --git a/debian/patches/01_absolute-data-path b/debian/patches/01_absolute-data-path
new file mode 100644
index 0000000..bfcde44
--- /dev/null
+++ b/debian/patches/01_absolute-data-path
@@ -0,0 +1,324 @@
+Author: Gerfried Fuchs <rhonda at debian.at> vim:ft=diff:
+Description: use absolute path for data file references
+
+Index: VCS/sources/Param.cpp
+===================================================================
+--- VCS.orig/sources/Param.cpp
++++ VCS/sources/Param.cpp
+@@ -61,7 +61,7 @@ void CParam::getTxtLang(char lang[MAX_LA
+ int l;
+ FILE* fichier = NULL;
+
+- sprintf(buffer,"data/lang/%d.txt",m_iLangue);
++ sprintf(buffer,"/usr/share/games/2h4u/lang/%d.txt",m_iLangue);
+
+ fichier = fopen(buffer, "r");
+ if (fichier != NULL)
+Index: VCS/sources/bonus.cpp
+===================================================================
+--- VCS.orig/sources/bonus.cpp
++++ VCS/sources/bonus.cpp
+@@ -31,7 +31,7 @@ void CBonus::initBonus()
+ //Chargement des images de Bonus.
+ for (int i=0;i<NB_BONUS;i++)
+ {
+- sprintf(buffer,"data/images/jeu/bonus/%d.png",i);
++ sprintf(buffer,"/usr/share/games/2h4u/images/jeu/bonus/%d.png",i);
+ m_pBonus[i]=IMG_Load(buffer);
+ }
+
+Index: VCS/sources/intro.cpp
+===================================================================
+--- VCS.orig/sources/intro.cpp
++++ VCS/sources/intro.cpp
+@@ -32,16 +32,16 @@ void CIntro::initIntro(char lang[MAX_LAN
+ SDL_Rect centrage;
+
+ //On écrit le texte grace à TTF.
+- TTF_Font *policeTxt = TTF_OpenFont("data/bgothm.ttf", 60);
++ TTF_Font *policeTxt = TTF_OpenFont("/usr/share/games/2h4u/bgothm.ttf", 60);
+ SDL_Color couleurTxt = { 0, 0, 0 };
+
+ //DOWN :
+
+- m_pMenu=IMG_Load("data/images/menu/menu.jpg");
++ m_pMenu=IMG_Load("/usr/share/games/2h4u/images/menu/menu.jpg");
+
+ //On charge les images sans texte à l'intérieur
+- gd=IMG_Load("data/images/menu/down_gd.png");
+- pt=IMG_Load("data/images/menu/down_pt.png");
++ gd=IMG_Load("/usr/share/games/2h4u/images/menu/down_gd.png");
++ pt=IMG_Load("/usr/share/games/2h4u/images/menu/down_pt.png");
+
+ tempSurf[0]=SDL_DisplayFormatAlpha(gd);
+ tempSurf[1]=SDL_DisplayFormatAlpha(pt);
+@@ -112,7 +112,7 @@ void CIntro::initIntro(char lang[MAX_LAN
+ SDL_FreeSurface(tempSurf[i]);
+
+
+- m_pTeam=IMG_Load("data/images/menu/team.jpg");
++ m_pTeam=IMG_Load("/usr/share/games/2h4u/images/menu/team.jpg");
+
+ SDL_Color couleurTxt2 = { 255, 255, 255 };
+ tempTxt = TTF_RenderText_Blended(policeTxt, lang[0], couleurTxt2);
+@@ -125,8 +125,8 @@ void CIntro::initIntro(char lang[MAX_LAN
+
+ TTF_CloseFont(policeTxt);
+
+- m_pJeu=IMG_Load("data/images/menu/jeu.jpg");
+- m_pNoir=IMG_Load("data/images/menu/noir.png");
++ m_pJeu=IMG_Load("/usr/share/games/2h4u/images/menu/jeu.jpg");
++ m_pNoir=IMG_Load("/usr/share/games/2h4u/images/menu/noir.png");
+
+ etape=69;
+ alpha=255;
+Index: VCS/sources/jeu.cpp
+===================================================================
+--- VCS.orig/sources/jeu.cpp
++++ VCS/sources/jeu.cpp
+@@ -33,10 +33,10 @@ void CJeu::initJeu(bool musiqueOn, bool
+ myTerrain.initTerrain(lang);
+
+ myRaquette.initRaquette(300,580,1,0.7);
+- surfTemp=IMG_Load("data/images/jeu/balle.png");
+- surfTemp2=IMG_Load("data/images/jeu/balle2.png");
++ surfTemp=IMG_Load("/usr/share/games/2h4u/images/jeu/balle.png");
++ surfTemp2=IMG_Load("/usr/share/games/2h4u/images/jeu/balle2.png");
+
+- m_pImgMasque=IMG_Load("data/images/jeu/masque.png");
++ m_pImgMasque=IMG_Load("/usr/share/games/2h4u/images/jeu/masque.png");
+
+ for (int i=0;i<MAX_BALLES;i++)
+ {
+@@ -76,7 +76,7 @@ void CJeu::initJeu(bool musiqueOn, bool
+ m_pSpriteOver=NULL;
+
+ //Chargement de la police d'écriture des chiffres :
+- policeChiffres = TTF_OpenFont("data/DS-DIGIB.TTF", 35);
++ policeChiffres = TTF_OpenFont("/usr/share/games/2h4u/DS-DIGIB.TTF", 35);
+
+ makeChiffre(m_pScore,m_iScore);
+
+@@ -99,11 +99,11 @@ void CJeu::pauseJeu(char lang[MAX_LANG][
+ drawJeu(m_pScreenshot);
+ if (m_pSpriteOver!=NULL) SDL_FreeSurface(m_pSpriteOver);
+
+- SDL_Surface* temp=IMG_Load("data/images/jeu/transparent.png");
++ SDL_Surface* temp=IMG_Load("/usr/share/games/2h4u/images/jeu/transparent.png");
+ m_pSpriteOver=SDL_DisplayFormat(temp);
+ SDL_FreeSurface(temp);
+
+- TTF_Font *policeTxt = TTF_OpenFont("data/bgothm.ttf", 60);
++ TTF_Font *policeTxt = TTF_OpenFont("/usr/share/games/2h4u/bgothm.ttf", 60);
+ SDL_Color couleurTxt = { 250, 130, 0 };
+ SDL_Surface* tempTxt=NULL;
+ SDL_Rect centrage;
+@@ -244,11 +244,11 @@ void CJeu::saveLastDisplay(char lang[MAX
+ drawJeu(m_pScreenshot);
+ if (m_pSpriteOver!=NULL) SDL_FreeSurface(m_pSpriteOver);
+
+- SDL_Surface* temp=IMG_Load("data/images/jeu/transparent.png");
++ SDL_Surface* temp=IMG_Load("/usr/share/games/2h4u/images/jeu/transparent.png");
+ m_pSpriteOver=SDL_DisplayFormat(temp);
+ SDL_FreeSurface(temp);
+
+- TTF_Font *policeTxt = TTF_OpenFont("data/bgothm.ttf", 60);
++ TTF_Font *policeTxt = TTF_OpenFont("/usr/share/games/2h4u/bgothm.ttf", 60);
+ SDL_Color couleurTxt = { 250, 130, 0 };
+
+ SDL_Surface* tempTxt=NULL;
+@@ -709,9 +709,9 @@ CRaquette::CRaquette(){}
+ void CRaquette::initRaquette(int posX,int posY,int prop,double adX)
+ {
+ properties=prop;
+- m_pRaqGauche = IMG_Load("data/images/jeu/raqGauche.png");
+- m_pRaqCentre = IMG_Load("data/images/jeu/raqCentre.png");
+- m_pRaqDroite = IMG_Load("data/images/jeu/raqDroite.png");
++ m_pRaqGauche = IMG_Load("/usr/share/games/2h4u/images/jeu/raqGauche.png");
++ m_pRaqCentre = IMG_Load("/usr/share/games/2h4u/images/jeu/raqCentre.png");
++ m_pRaqDroite = IMG_Load("/usr/share/games/2h4u/images/jeu/raqDroite.png");
+ myRectRaquette.x = posX;
+ myRectRaquette.y = posY;
+ largeur=3;
+Index: VCS/sources/launcher.cpp
+===================================================================
+--- VCS.orig/sources/launcher.cpp
++++ VCS/sources/launcher.cpp
+@@ -23,13 +23,13 @@ CLauncher::CLauncher() {}
+
+ void CLauncher::initLauncher()
+ {
+- m_pFond[0]=IMG_Load("data/images/launcher/langue.jpg");
+- m_pFond[1]=IMG_Load("data/images/launcher/clavier.jpg");
++ m_pFond[0]=IMG_Load("/usr/share/games/2h4u/images/launcher/langue.jpg");
++ m_pFond[1]=IMG_Load("/usr/share/games/2h4u/images/launcher/clavier.jpg");
+
+- m_pItem[0]=IMG_Load("data/images/launcher/francais.png");
+- m_pItem[1]=IMG_Load("data/images/launcher/english.png");
+- m_pItem[2]=IMG_Load("data/images/launcher/azerty.png");
+- m_pItem[3]=IMG_Load("data/images/launcher/qwerty.png");
++ m_pItem[0]=IMG_Load("/usr/share/games/2h4u/images/launcher/francais.png");
++ m_pItem[1]=IMG_Load("/usr/share/games/2h4u/images/launcher/english.png");
++ m_pItem[2]=IMG_Load("/usr/share/games/2h4u/images/launcher/azerty.png");
++ m_pItem[3]=IMG_Load("/usr/share/games/2h4u/images/launcher/qwerty.png");
+
+ m_iStep=0;
+ m_iChoice=0;
+Index: VCS/sources/main.cpp
+===================================================================
+--- VCS.orig/sources/main.cpp
++++ VCS/sources/main.cpp
+@@ -128,7 +128,7 @@ int main(int argc, char* argv[])
+ void CMyEngine::ParamInit(int iWidth,int iHeight)
+ {
+
+- SetIcon("data/images/icone.png");
++ 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");
+Index: VCS/sources/menu.cpp
+===================================================================
+--- VCS.orig/sources/menu.cpp
++++ VCS/sources/menu.cpp
+@@ -61,14 +61,14 @@ void CMenu::initMenu(char lang[MAX_LANG]
+ SDL_Rect centrage;
+
+ //On écrit le texte grace à TTF.
+- TTF_Font *policeTxt = TTF_OpenFont("data/bgothm.ttf", 60);
++ TTF_Font *policeTxt = TTF_OpenFont("/usr/share/games/2h4u/bgothm.ttf", 60);
+ SDL_Color couleurTxt = { 250, 60, 0 };
+ SDL_Color couleurTxt2 = { 0, 0, 0 };
+
+ //UP
+ //On charge les images sans texte à l'intérieur
+- gd=IMG_Load("data/images/menu/up_gd.png");
+- pt=IMG_Load("data/images/menu/up_pt.png");
++ gd=IMG_Load("/usr/share/games/2h4u/images/menu/up_gd.png");
++ pt=IMG_Load("/usr/share/games/2h4u/images/menu/up_pt.png");
+
+ tempSurf[0]=SDL_DisplayFormatAlpha(gd);
+ tempSurf[1]=SDL_DisplayFormatAlpha(pt);
+@@ -105,11 +105,11 @@ void CMenu::initMenu(char lang[MAX_LANG]
+
+ //DOWN :
+
+- m_pFond=IMG_Load("data/images/menu/menu.jpg");
++ m_pFond=IMG_Load("/usr/share/games/2h4u/images/menu/menu.jpg");
+
+ //On charge les images sans texte à l'intérieur
+- gd=IMG_Load("data/images/menu/down_gd.png");
+- pt=IMG_Load("data/images/menu/down_pt.png");
++ gd=IMG_Load("/usr/share/games/2h4u/images/menu/down_gd.png");
++ pt=IMG_Load("/usr/share/games/2h4u/images/menu/down_pt.png");
+
+ tempSurf[0]=SDL_DisplayFormatAlpha(gd);
+ tempSurf[1]=SDL_DisplayFormatAlpha(pt);
+@@ -179,7 +179,7 @@ void CMenu::initMenu(char lang[MAX_LANG]
+ for (int i=0;i<6;i++)
+ SDL_FreeSurface(tempSurf[i]);
+
+- m_pScores=IMG_Load("data/images/menu/scores.jpg");
++ m_pScores=IMG_Load("/usr/share/games/2h4u/images/menu/scores.jpg");
+
+ tempTxt = TTF_RenderText_Blended(policeTxt, lang[7], couleurTxt);
+ centrage.x=(m_pScores->w/2)-(tempTxt->w/2);
+@@ -192,9 +192,9 @@ void CMenu::initMenu(char lang[MAX_LANG]
+ TTF_CloseFont(policeTxt);
+
+
+- m_pChangeMusique=IMG_Load("data/images/menu/change_musique.png");
+- m_pChangeSons=IMG_Load("data/images/menu/change_sons.png");
+- m_pChangeAffichage=IMG_Load("data/images/menu/change_affichage.png");
++ m_pChangeMusique=IMG_Load("/usr/share/games/2h4u/images/menu/change_musique.png");
++ m_pChangeSons=IMG_Load("/usr/share/games/2h4u/images/menu/change_sons.png");
++ m_pChangeAffichage=IMG_Load("/usr/share/games/2h4u/images/menu/change_affichage.png");
+
+ if (m_pFond==NULL) {SDL_Quit();}
+
+@@ -284,7 +284,7 @@ void CMenu::makeScores(CHighscore m_High
+ {
+
+ SDL_Color couleurChiffres = { 255, 50, 0 };
+- TTF_Font *policeChiffres = TTF_OpenFont("data/DS-DIGIB.TTF", 60);
++ TTF_Font *policeChiffres = TTF_OpenFont("/usr/share/games/2h4u/DS-DIGIB.TTF", 60);
+ char buffer[256];
+
+ for (int i=0;i<5;i++)
+Index: VCS/sources/son.cpp
+===================================================================
+--- VCS.orig/sources/son.cpp
++++ VCS/sources/son.cpp
+@@ -31,7 +31,7 @@ CSon::CSon()
+ fprintf(stderr,"erreur init_sdl_mixer\n");
+ exit(0);
+ }
+- musique = Mix_LoadMUS( "data/sons/Musique.mp3" );
++ musique = Mix_LoadMUS( "/usr/share/games/2h4u/sons/Musique.mp3" );
+ //S'il y a eu une erreur au chargement de la musique
+ if( musique == NULL )
+ {
+@@ -58,17 +58,17 @@ void CSon::initSon(bool musiqueOn, bool
+ if (m_bSonOn==true)
+ {
+ //Chargement des différents effets.
+- effet[S_CASSE_BRIQUE] = Mix_LoadWAV( "data/sons/balle_brique.wav" );
+- effet[S_REBOND_RAQ] = Mix_LoadWAV( "data/sons/balle_raquette.wav" );
+- effet[S_CASSE_LIGNE] = Mix_LoadWAV( "data/sons/detruit_ligne.wav" );
+- effet[S_POSE_BRIQUE] = Mix_LoadWAV( "data/sons/pose_brique.wav" );
+- effet[S_REBOND_MUR] = Mix_LoadWAV( "data/sons/rebond_mur.wav" );
+- effet[S_ROTATION] = Mix_LoadWAV( "data/sons/rotation.wav" );
+- effet[S_STRAFE] = Mix_LoadWAV( "data/sons/deplacement.wav" );
+- effet[S_NIVEAU] = Mix_LoadWAV( "data/sons/niveau.wav" );
+- effet[S_GAME_OVER] = Mix_LoadWAV( "data/sons/game_over.wav" );
+- effet[S_PERDU_BALLE] = Mix_LoadWAV( "data/sons/perdu_balle.wav" );
+- effet[S_GAGNE_BONUS] = Mix_LoadWAV( "data/sons/bonus.wav" );
++ effet[S_CASSE_BRIQUE] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/balle_brique.wav" );
++ effet[S_REBOND_RAQ] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/balle_raquette.wav" );
++ effet[S_CASSE_LIGNE] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/detruit_ligne.wav" );
++ effet[S_POSE_BRIQUE] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/pose_brique.wav" );
++ effet[S_REBOND_MUR] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/rebond_mur.wav" );
++ effet[S_ROTATION] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/rotation.wav" );
++ effet[S_STRAFE] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/deplacement.wav" );
++ effet[S_NIVEAU] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/niveau.wav" );
++ effet[S_GAME_OVER] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/game_over.wav" );
++ effet[S_PERDU_BALLE] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/perdu_balle.wav" );
++ effet[S_GAGNE_BONUS] = Mix_LoadWAV( "/usr/share/games/2h4u/sons/bonus.wav" );
+
+ for (int i=0;i<MAX_SONS;i++)
+ {
+Index: VCS/sources/terrain.cpp
+===================================================================
+--- VCS.orig/sources/terrain.cpp
++++ VCS/sources/terrain.cpp
+@@ -51,9 +51,9 @@ CTerrain::CTerrain()
+
+ void CTerrain::initTerrain(char lang[MAX_LANG][256])
+ {
+- myImgTerrain=IMG_Load("data/images/jeu/terrain.jpg");
++ myImgTerrain=IMG_Load("/usr/share/games/2h4u/images/jeu/terrain.jpg");
+
+- TTF_Font *policeTxt = TTF_OpenFont("data/bgothm.ttf", 22);
++ TTF_Font *policeTxt = TTF_OpenFont("/usr/share/games/2h4u/bgothm.ttf", 22);
+ SDL_Color couleurTxt = { 250, 60, 0 };
+ SDL_Surface* tempTxt=NULL;
+ SDL_Rect centrage;
+@@ -84,15 +84,15 @@ void CTerrain::initTerrain(char lang[MAX
+ char buffer[256];
+ for (int i=0;i<7;i++)
+ {
+- sprintf(buffer,"data/images/jeu/briques/b%d0.png",i);
++ sprintf(buffer,"/usr/share/games/2h4u/images/jeu/briques/b%d0.png",i);
+ m_pImgCT[i]=IMG_Load(buffer);
+ }
+- m_pBriqueCassee=IMG_Load("data/images/jeu/briques/bgris.png");
++ m_pBriqueCassee=IMG_Load("/usr/share/games/2h4u/images/jeu/briques/bgris.png");
+
+ //Chargement des formes a montrer :
+ for (int i=0;i<7;i++)
+ {
+- sprintf(buffer,"data/images/jeu/formes/%d.png",i);
++ sprintf(buffer,"/usr/share/games/2h4u/images/jeu/formes/%d.png",i);
+ m_pImgFigure[i]=IMG_Load(buffer);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..84f3fb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_absolute-data-path
--
Packaging for TooHardForYou
More information about the Pkg-games-commits
mailing list