r10027 - in packages/trunk/pink-pony/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Sun Jul 12 17:20:28 UTC 2009
Author: miriam
Date: 2009-07-12 17:20:28 +0000 (Sun, 12 Jul 2009)
New Revision: 10027
Added:
packages/trunk/pink-pony/debian/patches/datadir.patch
Modified:
packages/trunk/pink-pony/debian/patches/series
packages/trunk/pink-pony/debian/rules
Log:
Patch the code to get the data from the proper absolute directories
Added: packages/trunk/pink-pony/debian/patches/datadir.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/datadir.patch (rev 0)
+++ packages/trunk/pink-pony/debian/patches/datadir.patch 2009-07-12 17:20:28 UTC (rev 10027)
@@ -0,0 +1,211 @@
+# Copyright (C) 2009 Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game (GPL3+). See debian/copyright
+
+--- pink-pony.orig/PinkPony.cc
++++ pink-pony/PinkPony.cc
+@@ -11,7 +11,7 @@
+
+ int main(int argc, char** argv)
+ {
+- string config_file = "pony.options";
++ string config_file = "/usr/share/games/pink-pony/pony.options";
+ bool run_game = true;
+
+ Config config;
+@@ -49,7 +49,7 @@
+ config.grass_texture,
+ config.noise_texture);
+
+- Skydome skydome("textures/sky.png");
++ Skydome skydome("/usr/share/games/pink-pony/textures/sky.png");
+
+ PonyPoints points(config.player_count);
+
+@@ -58,7 +58,7 @@
+ cerr << "Could not open audio device. :<" << endl;
+ }
+
+- OutputStreamPtr music(OpenSound(device, "music/To be happy.mp3", true));
++ OutputStreamPtr music(OpenSound(device, "/usr/share/games/pink-pony/music/To be happy.mp3", true));
+
+ if (!music) {
+ cerr << "Could not load music file. :<" << endl;
+--- pink-pony.orig/pony.options
++++ pink-pony/pony.options
+@@ -32,16 +32,16 @@
+
+ // Level properties
+
+-heightmap_file = "levels/ring.png";
++heightmap_file = "/usr/share/games/pink-pony/levels/ring.png";
+ level_size = (1500 90 1500);
+ water_level = 30;
+ heightmap_specular = (1 1 1 1);
+ heightmap_diffuse = (0 0 0 0);
+ heightmap_shininess = 50;
+ heightmap_velvet_coeff = 1.5;
+-sand_texture = "textures/sand.png";
+-grass_texture = "textures/grass.png";
+-noise_texture = "textures/noise.png";
++sand_texture = "/usr/share/games/pink-pony/textures/sand.png";
++grass_texture = "/usr/share/games/pink-pony/textures/grass.png";
++noise_texture = "/usr/share/games/pink-pony/textures/noise.png";
+ pony_start[0] = (0 15);
+ pony_start_angle[0] = 0;
+ pony_start[1] = (0 -15);
+@@ -97,18 +97,18 @@
+ pony_right[3] = 76;
+
+ // General appearance properties
+-digit_one = "textures/one.png";
+-digit_two = "textures/two.png";
+-digit_three = "textures/three.png";
+-digit_four = "textures/four.png";
+-heart_mesh = "models/Heart.pmesh";
++digit_one = "/usr/share/games/pink-pony/textures/one.png";
++digit_two = "/usr/share/games/pink-pony/textures/two.png";
++digit_three = "/usr/share/games/pink-pony/textures/three.png";
++digit_four = "/usr/share/games/pink-pony/textures/four.png";
++heart_mesh = "/usr/share/games/pink-pony/models/Heart.pmesh";
+
+ // Pony appearance
+
+-pony_shader = "GLSL/pony";
++pony_shader = "/usr/share/games/pink-pony/GLSL/pony";
+ pony_velvet_coeff = 2;
+-pony_texture = "textures/pony.png";
+-pony_mesh = "models/Pony-animated.pmesh";
++pony_texture = "/usr/share/games/pink-pony/textures/pony.png";
++pony_mesh = "/usr/share/games/pink-pony/models/Pony-animated.pmesh";
+ pony_color[0] = (1 0.75 0.792968 1);
+ pony_color[1] = (0.25 0.875 0.8125 1);
+ pony_color[2] = (1 0.839844 0 1);
+--- pink-pony.orig/lib/Config.cc
++++ pink-pony/lib/Config.cc
+@@ -8,7 +8,7 @@
+ fsaa_samples(4),
+ swap_interval(1),
+ polygon_mode(GL_FILL),
+- heightmap_file("levels/heightmap-heart.exr"),
++ heightmap_file("/usr/share/games/pink-pony/levels/heightmap-heart.exr"),
+ level_size(V3f(-500, 0,-500),
+ V3f( 500,60, 500)),
+ water_level(15),
+@@ -16,9 +16,9 @@
+ heightmap_diffuse(1,1,1,1),
+ heightmap_shininess(50.0),
+ heightmap_velvet_coeff(1.5),
+- sand_texture("textures/sand.png"),
+- grass_texture("textures/grass.png"),
+- noise_texture("textures/noise.png"),
++ sand_texture("/usr/share/games/pink-pony/textures/sand.png"),
++ grass_texture("/usr/share/games/pink-pony/textures/grass.png"),
++ noise_texture("/usr/share/games/pink-pony/textures/noise.png"),
+ light_specular(1,1,1,1),
+ light_diffuse(1,1,1,1),
+ light_ambient(0.05,0.05,0.05,1),
+@@ -45,16 +45,16 @@
+ randomize_start_positions(false),
+ min_start_distance(200),
+ use_particles(true),
+- digit_one("textures/one.png"),
+- digit_two("textures/two.png"),
+- digit_three("textures/three.png"),
+- digit_four("textures/four.png"),
+- heart_mesh("models/Heart.pmesh"),
++ digit_one("/usr/share/games/pink-pony/textures/one.png"),
++ digit_two("/usr/share/games/pink-pony/textures/two.png"),
++ digit_three("/usr/share/games/pink-pony/textures/three.png"),
++ digit_four("/usr/share/games/pink-pony/textures/four.png"),
++ heart_mesh("/usr/share/games/pink-pony/models/Heart.pmesh"),
+ heart_explosion_particles(10000),
+- pony_shader("GLSL/pony"),
++ pony_shader("/usr/share/games/pink-pony/GLSL/pony"),
+ pony_velvet_coeff(2.0),
+- pony_texture("textures/pony.png"),
+- pony_mesh("models/Pony.pmesh"),
++ pony_texture("/usr/share/games/pink-pony/textures/pony.png"),
++ pony_mesh("/usr/share/games/pink-pony/models/Pony.pmesh"),
+ pony_particle_rate(100.0),
+ pony_explosion_particles(50000)
+ {
+--- pink-pony.orig/lib/ParticleSystem.cc
++++ pink-pony/lib/ParticleSystem.cc
+@@ -44,18 +44,18 @@
+ TransformFeedbackParticleSystem::TransformFeedbackParticleSystem
+ (GLuint max_particles, Config* config)
+ : last_stat_print(glfwGetTime()), calculating(false),
+- step_shader("GLSL/step_particles",
+- "GLSL/step_particles",
+- "GLSL/step_particles",
++ step_shader("/usr/share/games/pink-pony/GLSL/step_particles",
++ "/usr/share/games/pink-pony/GLSL/step_particles",
++ "/usr/share/games/pink-pony/GLSL/step_particles",
+ GL_POINTS, GL_POINTS, 1),
+- draw_shader("GLSL/draw_particles",
+- "GLSL/draw_particles",
+- "GLSL/draw_particles",
++ draw_shader("/usr/share/games/pink-pony/GLSL/draw_particles",
++ "/usr/share/games/pink-pony/GLSL/draw_particles",
++ "/usr/share/games/pink-pony/GLSL/draw_particles",
+ GL_POINTS, GL_TRIANGLE_STRIP, 4),
+ feedback(step_shader, GL_POINTS,
+ "out_pos out_color out_vel out_life",
+ max_particles, true),
+- particle_tex("textures/heart-particle.png"),
++ particle_tex("/usr/share/games/pink-pony/textures/heart-particle.png"),
+ heightmap(config->heightmap_file.c_str())
+ {
+ heightmap.normalize();
+--- pink-pony.orig/lib/Pony.cc
++++ pink-pony/lib/Pony.cc
+@@ -16,7 +16,7 @@
+ right(right),
+ shader(config->pony_shader),
+ mesh(),
+- animation("models/Pony-animated.pskeleton"),
++ animation("/usr/share/games/pink-pony/models/Pony-animated.pskeleton"),
+ mesh_drawer(&mesh),
+ texture(config->pony_texture.c_str()),
+ out(false), out_delay(false), particle_source(particle_system)
+--- pink-pony.orig/lib/PonyPoints.cc
++++ pink-pony/lib/PonyPoints.cc
+@@ -68,10 +68,10 @@
+ PonyPoints::PonyPoints(int i) : points(i)
+ {
+
+- digits.push_back(new Texture2D("textures/one.png"));
+- digits.push_back(new Texture2D("textures/two.png"));
+- digits.push_back(new Texture2D("textures/three.png"));
+- digits.push_back(new Texture2D("textures/four.png"));
++ digits.push_back(new Texture2D("/usr/share/games/pink-pony/textures/one.png"));
++ digits.push_back(new Texture2D("/usr/share/games/pink-pony/textures/two.png"));
++ digits.push_back(new Texture2D("/usr/share/games/pink-pony/textures/three.png"));
++ digits.push_back(new Texture2D("/usr/share/games/pink-pony/textures/four.png"));
+ }
+
+ PonyPoints::~PonyPoints()
+--- pink-pony.orig/lib/Heightmap.cc
++++ pink-pony/lib/Heightmap.cc
+@@ -6,8 +6,8 @@
+ string sand, string grass, string noise)
+ : mesh(),
+ mesh_drawer(&mesh),
+- terrain_shader("GLSL/heightmap"),
+- water_shader("GLSL/water"),
++ terrain_shader("/usr/share/games/pink-pony/GLSL/heightmap"),
++ water_shader("/usr/share/games/pink-pony/GLSL/water"),
+ heightmap(filename.c_str(),
+ GL_CLAMP, GL_CLAMP, GL_LINEAR, GL_LINEAR),
+ sand_texture(sand.c_str()),
+--- pink-pony.orig/lib/PonyGame.cc
++++ pink-pony/lib/PonyGame.cc
+@@ -15,7 +15,7 @@
+ skydome(skydome),
+ heart(),
+ heart_drawer(&heart),
+- heart_shader("GLSL/heart")
++ heart_shader("/usr/share/games/pink-pony/GLSL/heart")
+ {
+ // Init OpenGL states
+
Modified: packages/trunk/pink-pony/debian/patches/series
===================================================================
--- packages/trunk/pink-pony/debian/patches/series 2009-07-12 16:08:30 UTC (rev 10026)
+++ packages/trunk/pink-pony/debian/patches/series 2009-07-12 17:20:28 UTC (rev 10027)
@@ -1 +1,2 @@
build.patch
+datadir.patch
Modified: packages/trunk/pink-pony/debian/rules
===================================================================
--- packages/trunk/pink-pony/debian/rules 2009-07-12 16:08:30 UTC (rev 10026)
+++ packages/trunk/pink-pony/debian/rules 2009-07-12 17:20:28 UTC (rev 10027)
@@ -35,6 +35,8 @@
dh_testroot
dh_prep
dh_installdirs
+ mkdir -p "$(CURDIR)"/debian/pink-pony/usr/games
+ cp Pony "$(CURDIR)"/debian/pink-pony/usr/games/pink-pony
# Build architecture-independent files here.
binary-indep: install
@@ -48,17 +50,8 @@
dh_installexamples
dh_install
# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=pink-pony-dbg
dh_compress
More information about the Pkg-games-commits
mailing list