Author: miriam Date: 2014-01-19 01:34:52 +0000 (Sun, 19 Jan 2014) New Revision: 14846
Modified: packages/trunk/pink-pony/debian/SConstruct packages/trunk/pink-pony/debian/changelog packages/trunk/pink-pony/debian/patches/datadir.patch packages/trunk/pink-pony/debian/patches/script.patch packages/trunk/pink-pony/debian/patches/tinyxml.patch packages/trunk/pink-pony/debian/rules Log: New upstream release Modified: packages/trunk/pink-pony/debian/SConstruct =================================================================== --- packages/trunk/pink-pony/debian/SConstruct 2014-01-18 06:37:01 UTC (rev 14845) +++ packages/trunk/pink-pony/debian/SConstruct 2014-01-19 01:34:52 UTC (rev 14846) @@ -2,10 +2,10 @@ env = Environment() env['CC'] = 'g++' -env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter :CFLAGS:' +env['CCFLAGS'] = '-Wall -Wextra -Wno-reorder -Wno-unused-parameter :CFLAGS:' env['LINKFLAGS'] = ':LDFLAGS:' env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL'] -env['CPPPATH'] = ['#/src', '#/flextGL/', '/usr/include/OpenEXR'] +env['CPPPATH'] = ['#', '#/src', '#/external/flextGL/', '/usr/include/OpenEXR'] env.ParseConfig("pkg-config IlmBase --cflags --libs") env.ParseConfig("pkg-config libglfw --cflags --libs") @@ -14,10 +14,8 @@ env.ParseConfig("pkg-config SDL_mixer --cflags --libs") env.ParseConfig("pkg-config tinyxml --cflags --libs") +env.Command(['src/mesh.pb.cc', 'src/mesh.pb.h'], 'src/mesh.proto', + 'protoc --cpp_out=. src/mesh.proto') -env.Command(['src/mesh.pb.cc', 'src/mesh.pb.h'], 'mesh.proto', - 'protoc --cpp_out=src mesh.proto') - env.Program('Pony', - ['Pony.cc', 'flextGL/flextGL.c'] - + Glob('src/*cc') + Glob('external/tinyXML/*cpp')) + Glob('src/*cc') + Glob('external/tinyXML/*cpp') + ['external/flextGL/flextGL.c']) Modified: packages/trunk/pink-pony/debian/changelog =================================================================== --- packages/trunk/pink-pony/debian/changelog 2014-01-18 06:37:01 UTC (rev 14845) +++ packages/trunk/pink-pony/debian/changelog 2014-01-19 01:34:52 UTC (rev 14846) @@ -1,11 +1,11 @@ -pink-pony (1.4-1) UNRELEASED; urgency=low +pink-pony (1.4.1-1) UNRELEASED; urgency=low [ Miriam Ruiz ] * New upstream release. * Upgraded Standards-Version from 3.9.4 to 3.9.5 * Refreshed patches. - -- Miriam Ruiz <mir...@debian.org> Mon, 23 Dec 2013 15:51:49 +0100 + -- Miriam Ruiz <mir...@debian.org> Sat, 18 Jan 2014 23:54:30 +0100 pink-pony (1.3.1-3) unstable; urgency=low Modified: packages/trunk/pink-pony/debian/patches/datadir.patch =================================================================== --- packages/trunk/pink-pony/debian/patches/datadir.patch 2014-01-18 06:37:01 UTC (rev 14845) +++ packages/trunk/pink-pony/debian/patches/datadir.patch 2014-01-19 01:34:52 UTC (rev 14846) @@ -1,10 +1,10 @@ # Copyright (C) 2009 Miriam Ruiz <little_m...@yahoo.es> # Distributed under the same license as the game (GPL3+). See debian/copyright -Index: pink-pony-1.4/pony.options +Index: pink-pony-1.4.1/pony.options =================================================================== ---- pink-pony-1.4.orig/pony.options 2013-12-23 16:03:39.000000000 +0100 -+++ pink-pony-1.4/pony.options 2013-12-23 16:03:39.000000000 +0100 +--- pink-pony-1.4.1.orig/pony.options 2014-01-19 00:11:44.297210972 +0100 ++++ pink-pony-1.4.1/pony.options 2014-01-19 00:11:44.293210963 +0100 @@ -9,7 +9,7 @@ // Resource directory @@ -14,10 +14,10 @@ // Particles -Index: pink-pony-1.4/Pony.cc +Index: pink-pony-1.4.1/src/main.cc =================================================================== ---- pink-pony-1.4.orig/Pony.cc 2013-12-23 16:03:39.000000000 +0100 -+++ pink-pony-1.4/Pony.cc 2013-12-23 16:03:39.000000000 +0100 +--- pink-pony-1.4.1.orig/src/main.cc 2014-01-19 00:11:44.297210972 +0100 ++++ pink-pony-1.4.1/src/main.cc 2014-01-19 00:11:44.293210963 +0100 @@ -20,7 +20,7 @@ int main(int argc, char** argv) Modified: packages/trunk/pink-pony/debian/patches/script.patch =================================================================== --- packages/trunk/pink-pony/debian/patches/script.patch 2014-01-18 06:37:01 UTC (rev 14845) +++ packages/trunk/pink-pony/debian/patches/script.patch 2014-01-19 01:34:52 UTC (rev 14846) @@ -1,7 +1,7 @@ -Index: pink-pony-1.4/install/pink-pony +Index: pink-pony-1.4.1/install/pink-pony =================================================================== ---- pink-pony-1.4.orig/install/pink-pony 2013-12-23 16:03:15.000000000 +0100 -+++ pink-pony-1.4/install/pink-pony 2013-12-23 16:03:15.000000000 +0100 +--- pink-pony-1.4.1.orig/install/pink-pony 2014-01-18 23:55:31.390941395 +0100 ++++ pink-pony-1.4.1/install/pink-pony 2014-01-18 23:55:31.386941386 +0100 @@ -1,14 +1,18 @@ #!/bin/sh @@ -31,10 +31,10 @@ +fi + +cd "$OLD_DIR" -Index: pink-pony-1.4/install/pink-pony.desktop +Index: pink-pony-1.4.1/install/pink-pony.desktop =================================================================== ---- pink-pony-1.4.orig/install/pink-pony.desktop 2013-12-23 16:03:15.000000000 +0100 -+++ pink-pony-1.4/install/pink-pony.desktop 2013-12-23 16:03:15.000000000 +0100 +--- pink-pony-1.4.1.orig/install/pink-pony.desktop 2014-01-18 23:55:31.390941395 +0100 ++++ pink-pony-1.4.1/install/pink-pony.desktop 2014-01-18 23:55:31.386941386 +0100 @@ -4,9 +4,9 @@ Version=1.0 Icon=/usr/share/pixmaps/pink-pony.png Modified: packages/trunk/pink-pony/debian/patches/tinyxml.patch =================================================================== --- packages/trunk/pink-pony/debian/patches/tinyxml.patch 2014-01-18 06:37:01 UTC (rev 14845) +++ packages/trunk/pink-pony/debian/patches/tinyxml.patch 2014-01-19 01:34:52 UTC (rev 14846) @@ -1,6 +1,6 @@ -Index: pink-pony-1.4/external/tinyXML/tinystr.cpp +Index: pink-pony-1.4.1/external/tinyXML/tinystr.cpp =================================================================== ---- pink-pony-1.4.orig/external/tinyXML/tinystr.cpp 2013-12-23 17:29:08.000000000 +0100 +--- pink-pony-1.4.1.orig/external/tinyXML/tinystr.cpp 2014-01-19 00:11:44.309211000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -/* @@ -119,9 +119,9 @@ - - -#endif // TIXML_USE_STL -Index: pink-pony-1.4/external/tinyXML/tinystr.h +Index: pink-pony-1.4.1/external/tinyXML/tinystr.h =================================================================== ---- pink-pony-1.4.orig/external/tinyXML/tinystr.h 2013-12-23 17:29:08.000000000 +0100 +--- pink-pony-1.4.1.orig/external/tinyXML/tinystr.h 2014-01-19 00:11:44.309211000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,319 +0,0 @@ -/* @@ -443,9 +443,9 @@ - -#endif // TIXML_STRING_INCLUDED -#endif // TIXML_USE_STL -Index: pink-pony-1.4/external/tinyXML/tinyxml.cpp +Index: pink-pony-1.4.1/external/tinyXML/tinyxml.cpp =================================================================== ---- pink-pony-1.4.orig/external/tinyXML/tinyxml.cpp 2013-12-23 17:29:08.000000000 +0100 +--- pink-pony-1.4.1.orig/external/tinyXML/tinyxml.cpp 2014-01-19 00:11:44.309211000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,1888 +0,0 @@ -/* @@ -2336,9 +2336,9 @@ - return true; -} - -Index: pink-pony-1.4/external/tinyXML/tinyxml.h +Index: pink-pony-1.4.1/external/tinyXML/tinyxml.h =================================================================== ---- pink-pony-1.4.orig/external/tinyXML/tinyxml.h 2013-12-23 17:29:08.000000000 +0100 +--- pink-pony-1.4.1.orig/external/tinyXML/tinyxml.h 2014-01-19 00:11:44.309211000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,1802 +0,0 @@ -/* @@ -4143,9 +4143,9 @@ - -#endif - -Index: pink-pony-1.4/external/tinyXML/tinyxmlerror.cpp +Index: pink-pony-1.4.1/external/tinyXML/tinyxmlerror.cpp =================================================================== ---- pink-pony-1.4.orig/external/tinyXML/tinyxmlerror.cpp 2013-12-23 17:29:08.000000000 +0100 +--- pink-pony-1.4.1.orig/external/tinyXML/tinyxmlerror.cpp 2014-01-19 00:11:44.309211000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* @@ -4201,9 +4201,9 @@ - "Error parsing CDATA.", - "Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.", -}; -Index: pink-pony-1.4/external/tinyXML/tinyxmlparser.cpp +Index: pink-pony-1.4.1/external/tinyXML/tinyxmlparser.cpp =================================================================== ---- pink-pony-1.4.orig/external/tinyXML/tinyxmlparser.cpp 2013-12-23 17:29:08.000000000 +0100 +--- pink-pony-1.4.1.orig/external/tinyXML/tinyxmlparser.cpp 2014-01-19 00:11:44.309211000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,1638 +0,0 @@ -/* @@ -4562,7 +4562,7 @@ - } - else - { -- while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' ) +- while ( (*p && IsWhiteSpace( *p )) || *p == '\n' || *p =='\r' ) - ++p; - } - @@ -5844,11 +5844,11 @@ - return true; -} - -Index: pink-pony-1.4/src/Menu.cc +Index: pink-pony-1.4.1/src/Menu.cc =================================================================== ---- pink-pony-1.4.orig/src/Menu.cc 2013-12-22 03:11:30.000000000 +0100 -+++ pink-pony-1.4/src/Menu.cc 2013-12-23 17:30:08.000000000 +0100 -@@ -284,7 +284,7 @@ +--- pink-pony-1.4.1.orig/src/Menu.cc 2014-01-19 00:11:44.309211000 +0100 ++++ pink-pony-1.4.1/src/Menu.cc 2014-01-19 00:11:44.305210992 +0100 +@@ -300,7 +300,7 @@ TiXmlNode* levels_node = doc.FirstChild(); @@ -5857,7 +5857,7 @@ string(levels_node->Value()) != "levels") { cerr << "Could not find 'levels' element in " << levels_file << endl; assert(0); -@@ -293,7 +293,7 @@ +@@ -309,7 +309,7 @@ for (TiXmlNode* level_node = levels_node->ToElement()->FirstChild(); level_node != NULL; level_node = level_node->NextSibling()) { Modified: packages/trunk/pink-pony/debian/rules =================================================================== --- packages/trunk/pink-pony/debian/rules 2014-01-18 06:37:01 UTC (rev 14845) +++ packages/trunk/pink-pony/debian/rules 2014-01-19 01:34:52 UTC (rev 14846) @@ -33,7 +33,7 @@ build-stamp: config dh_testdir - protoc mesh.proto --cpp_out=lib/ + protoc src/mesh.proto --cpp_out=lib/ scons -f SConstruct.Debian \ prefix=/usr \ resources_dir=/usr/share/pink-pony \ @@ -54,6 +54,7 @@ rm -fv SConstruct.Debian rm -fv config.log options.cache rm -fv lib/mesh.pb.cc lib/mesh.pb.h + rm -fv lib/src/mesh.pb.cc lib/src/mesh.pb.h rm -rfv .sconf_temp build rm -rfv .sconsign.dblite screen0.tga rm -fv `find . -name "*.o"` _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits