r10162 - in packages/trunk/pink-pony/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Fri Aug 21 01:31:46 UTC 2009
Author: miriam
Date: 2009-08-21 01:31:46 +0000 (Fri, 21 Aug 2009)
New Revision: 10162
Modified:
packages/trunk/pink-pony/debian/patches/datadir.patch
packages/trunk/pink-pony/debian/rules
Log:
Missing relative directories
Modified: packages/trunk/pink-pony/debian/patches/datadir.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/datadir.patch 2009-08-21 01:07:11 UTC (rev 10161)
+++ packages/trunk/pink-pony/debian/patches/datadir.patch 2009-08-21 01:31:46 UTC (rev 10162)
@@ -81,7 +81,7 @@
light_specular(1,1,1,1),
light_diffuse(1,1,1,1),
light_ambient(0.05,0.05,0.05,1),
-@@ -49,16 +49,16 @@
+@@ -49,19 +49,19 @@
randomize_start_positions(false),
min_start_distance(200),
use_particles(true),
@@ -105,14 +105,20 @@
+ pony_mesh("/usr/share/games/pink-pony/models/Pony.pmesh"),
pony_particle_rate(100.0),
pony_explosion_particles(50000),
- background_music("music/To be happy.mp3")
+- background_music("music/To be happy.mp3")
++ background_music("/usr/share/games/pink-pony/music/To be happy.mp3")
+ {
+ pony_up[0] = GLFW_KEY_UP;
+ pony_down[0] = GLFW_KEY_DOWN;
--- pink-pony.orig/lib/ParticleSystem.cc
+++ pink-pony/lib/ParticleSystem.cc
-@@ -46,7 +46,7 @@
+@@ -45,8 +45,8 @@
+ CPUParticleSystem::CPUParticleSystem
(GLuint max_particles, Config* config)
: last_stat_print(glfwGetTime()),
- draw_shader("GLSL/draw_particles_cpu"),
+- draw_shader("GLSL/draw_particles_cpu"),
- particle_tex("textures/heart-particle.png"),
++ draw_shader("/usr/share/games/pink-pony/GLSL/draw_particles_cpu"),
+ particle_tex("/usr/share/games/pink-pony/textures/heart-particle.png"),
heightmap(config->heightmap_file.c_str()),
level_size(config->level_size),
@@ -299,3 +305,20 @@
{
up_button.on_click()
.connect(sigc::bind(sigc::mem_fun(this, &Slider::change), 1));
+--- pink-pony.orig/levels.xml
++++ pink-pony/levels.xml
+@@ -1,8 +1,8 @@
+ <levels>
+- <level name="Lagoon" file="levels/heart.png" size="(1500 90 1500)" water_level="45"/>
+- <level name="Heart" file="levels/heart.png" size="(1500 90 1500)" water_level="30"/>
+- <level name="Ring" file="levels/ring.png" size="(1500 90 1500)" water_level="30"/>
+- <level name="Long" file="levels/long.png" size="(1500 90 1500)" water_level="30"/>
+- <level name="Skull" file="levels/skull.png" size="(1500 90 1500)" water_level="30"/>
+- <level name="Strange" file="levels/strange.png" size="(1500 90 1500)" water_level="30"/>
++ <level name="Lagoon" file="/usr/share/games/pink-pony/levels/heart.png" size="(1500 90 1500)" water_level="45"/>
++ <level name="Heart" file="/usr/share/games/pink-pony/levels/heart.png" size="(1500 90 1500)" water_level="30"/>
++ <level name="Ring" file="/usr/share/games/pink-pony/levels/ring.png" size="(1500 90 1500)" water_level="30"/>
++ <level name="Long" file="/usr/share/games/pink-pony/levels/long.png" size="(1500 90 1500)" water_level="30"/>
++ <level name="Skull" file="/usr/share/games/pink-pony/levels/skull.png" size="(1500 90 1500)" water_level="30"/>
++ <level name="Strange" file="/usr/share/games/pink-pony/levels/strange.png" size="(1500 90 1500)" water_level="30"/>
+ </levels>
Modified: packages/trunk/pink-pony/debian/rules
===================================================================
--- packages/trunk/pink-pony/debian/rules 2009-08-21 01:07:11 UTC (rev 10161)
+++ packages/trunk/pink-pony/debian/rules 2009-08-21 01:31:46 UTC (rev 10162)
@@ -7,6 +7,18 @@
config-stamp:
dh_testdir
[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
+
+# # Look for unpatched relative directories
+# grep -r \"models/ * | grep -v debian/
+# grep -r \"textures/ * | grep -v debian/
+# grep -r \"levels/ * | grep -v debian/
+# grep -r \"GLSL/ * | grep -v debian/
+# grep -r \"fonts/ * | grep -v debian/
+# grep -r \"music/ * | grep -v debian/
+# grep -r \"sounds/ * | grep -v debian/
+# grep -r \"pony.options\" * | grep -v debian/
+# grep -r \"levels.xml\" * | grep -v debian/
+
sed -e 's/:CFLAGS:/$(CFLAGS)/' < debian/options.cache > options.cache
touch $@
More information about the Pkg-games-commits
mailing list