Author: miriam Date: 2009-08-21 00:47:38 +0000 (Fri, 21 Aug 2009) New Revision: 10160
Added: packages/trunk/pink-pony/debian/README.source packages/trunk/pink-pony/debian/patches/pony_options.patch Modified: packages/trunk/pink-pony/debian/changelog packages/trunk/pink-pony/debian/control packages/trunk/pink-pony/debian/patches/build.patch packages/trunk/pink-pony/debian/patches/datadir.patch packages/trunk/pink-pony/debian/patches/series packages/trunk/pink-pony/debian/pink-pony.install packages/trunk/pink-pony/debian/rules Log: New Upstream Release Added: packages/trunk/pink-pony/debian/README.source =================================================================== --- packages/trunk/pink-pony/debian/README.source (rev 0) +++ packages/trunk/pink-pony/debian/README.source 2009-08-21 00:47:38 UTC (rev 10160) @@ -0,0 +1 @@ +See /usr/share/doc/quilt/README.source Modified: packages/trunk/pink-pony/debian/changelog =================================================================== --- packages/trunk/pink-pony/debian/changelog 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/changelog 2009-08-21 00:47:38 UTC (rev 10160) @@ -1,3 +1,11 @@ +pink-pony (1.2.1-1) UNRELEASED; urgency=low + + * New Upstream Release + * Added protobuf-compiler, libsigc++-2.0-dev and libftgl-dev + to build dependencies + + -- Miriam Ruiz <[email protected]> Fri, 21 Aug 2009 02:01:53 +0200 + pink-pony (1.0-1) UNRELEASED; urgency=low * Initial release. Modified: packages/trunk/pink-pony/debian/control =================================================================== --- packages/trunk/pink-pony/debian/control 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/control 2009-08-21 00:47:38 UTC (rev 10160) @@ -5,8 +5,9 @@ Uploaders: Miriam Ruiz <[email protected]> Build-Depends: debhelper (>= 7), quilt, scons, pkg-config, dh-buildinfo, mesa-common-dev, libglu1-mesa-dev, libglfw-dev, libxrandr-dev, - libprotobuf-dev, libilmbase-dev, libdevil-dev, libaudiere-dev -Standards-Version: 3.8.2 + libilmbase-dev, libdevil-dev, libaudiere-dev, libftgl-dev, libsigc++-2.0-dev, + libprotobuf-dev (>= 2.1.0), protobuf-compiler (>= 2.1.0) +Standards-Version: 3.8.3 Homepage: http://code.google.com/p/pink-pony/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pink-pony/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pink-pony/?op=log Modified: packages/trunk/pink-pony/debian/patches/build.patch =================================================================== --- packages/trunk/pink-pony/debian/patches/build.patch 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/patches/build.patch 2009-08-21 00:47:38 UTC (rev 10160) @@ -1,14 +1,14 @@ # Copyright (C) 2009 Miriam Ruiz <[email protected]> # Distributed under the same license as the game (GPL3+). See debian/copyright ---- pink-pony-1.0.orig/SConstruct -+++ pink-pony-1.0/SConstruct +--- pink-pony.orig/SConstruct ++++ pink-pony/SConstruct @@ -2,7 +2,7 @@ env = Environment() env['CC'] = 'g++' --env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O0 -ggdb -msse3 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML' -+env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -g -msse3 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML' +-env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML' ++env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -g -I/usr/include/OpenEXR -I./lib -I./external/tinyXML' env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL', 'ILUT', 'audiere'] env.ParseConfig("pkg-config IlmBase --cflags --libs") env.ParseConfig("pkg-config libglfw --cflags --libs") Modified: packages/trunk/pink-pony/debian/patches/datadir.patch =================================================================== --- packages/trunk/pink-pony/debian/patches/datadir.patch 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/patches/datadir.patch 2009-08-21 00:47:38 UTC (rev 10160) @@ -1,43 +1,14 @@ # Copyright (C) 2009 Miriam Ruiz <[email protected]> # 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 @@ +@@ -18,16 +18,16 @@ - // Level properties - --heightmap_file = "levels/ring.png"; -+heightmap_file = "/usr/share/games/pink-pony/levels/ring.png"; + levels_file = "levels.xml"; + selected_level = 1; +-heightmap_file = "levels/heart.png"; ++heightmap_file = "/usr/share/games/pink-pony/levels/heart.png"; level_size = (1500 90 1500); water_level = 30; heightmap_specular = (1 1 1 1); @@ -50,13 +21,13 @@ +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; + pony_start[0] = (98.1826 -166.452); + pony_start_angle[0] = 353.63; + pony_start[1] = (360.84 228.471); +@@ -91,18 +91,18 @@ - // General appearance properties + // General appearance + -digit_one = "textures/one.png"; -digit_two = "textures/two.png"; -digit_three = "textures/three.png"; @@ -82,16 +53,16 @@ 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), +@@ -10,7 +10,7 @@ polygon_mode(GL_FILL), + levels_file("levels.xml"), + selected_level(0), - 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 @@ +@@ -18,9 +18,9 @@ heightmap_diffuse(1,1,1,1), heightmap_shininess(50.0), heightmap_velvet_coeff(1.5), @@ -104,7 +75,7 @@ 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 @@ +@@ -49,16 +49,16 @@ randomize_start_positions(false), min_start_distance(200), use_particles(true), @@ -127,11 +98,11 @@ + 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) - { + pony_explosion_particles(50000), + background_music("music/To be happy.mp3") --- pink-pony.orig/lib/ParticleSystem.cc +++ pink-pony/lib/ParticleSystem.cc -@@ -44,18 +44,18 @@ +@@ -253,18 +253,18 @@ TransformFeedbackParticleSystem::TransformFeedbackParticleSystem (GLuint max_particles, Config* config) : last_stat_print(glfwGetTime()), calculating(false), @@ -200,12 +171,12 @@ sand_texture(sand.c_str()), --- pink-pony.orig/lib/PonyGame.cc +++ pink-pony/lib/PonyGame.cc -@@ -15,7 +15,7 @@ - skydome(skydome), +@@ -17,7 +17,7 @@ + music(music), heart(), heart_drawer(&heart), - heart_shader("GLSL/heart") + heart_shader("/usr/share/games/pink-pony/GLSL/heart") { - // Init OpenGL states - + int human_count = m_config->player_count - m_config->ai_count; + if (human_count == 0) human_count = m_config->player_count; Added: packages/trunk/pink-pony/debian/patches/pony_options.patch =================================================================== --- packages/trunk/pink-pony/debian/patches/pony_options.patch (rev 0) +++ packages/trunk/pink-pony/debian/patches/pony_options.patch 2009-08-21 00:47:38 UTC (rev 10160) @@ -0,0 +1,14 @@ +# Copyright (C) 2009 Miriam Ruiz <[email protected]> +# Distributed under the same license as the game (GPL3+). See debian/copyright + +--- pink-pony.orig/Pony.cc ++++ pink-pony/Pony.cc +@@ -14,7 +14,7 @@ + + int main(int argc, char** argv) + { +- string config_file = "pony.options"; ++ string config_file = "/usr/share/games/pink-pony/pony.options"; + bool running = true; + + Config config; Modified: packages/trunk/pink-pony/debian/patches/series =================================================================== --- packages/trunk/pink-pony/debian/patches/series 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/patches/series 2009-08-21 00:47:38 UTC (rev 10160) @@ -1,2 +1,3 @@ build.patch datadir.patch +pony_options.patch Modified: packages/trunk/pink-pony/debian/pink-pony.install =================================================================== --- packages/trunk/pink-pony/debian/pink-pony.install 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/pink-pony.install 2009-08-21 00:47:38 UTC (rev 10160) @@ -4,4 +4,4 @@ levels /usr/share/games/pink-pony/ GLSL /usr/share/games/pink-pony/ music /usr/share/games/pink-pony/ -sounds /usr/share/games/pink-pony/ +#sounds /usr/share/games/pink-pony/ Modified: packages/trunk/pink-pony/debian/rules =================================================================== --- packages/trunk/pink-pony/debian/rules 2009-08-20 18:41:19 UTC (rev 10159) +++ packages/trunk/pink-pony/debian/rules 2009-08-21 00:47:38 UTC (rev 10160) @@ -13,6 +13,7 @@ build: build-stamp build-stamp: config dh_testdir + protoc mesh.proto --cpp_out=lib/ scons \ prefix=/usr \ resources_dir=/usr/share/pink-pony \ @@ -25,6 +26,7 @@ rm -f build-stamp config-stamp -scons -c rm -f config.log options.cache + rm -f lib/mesh.pb.cc lib/mesh.pb.h rm -rf .sconf_temp build rm -rf .sconsign.dblite screen0.tga [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
