r15302 - in packages/trunk/pink-pony/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2014-10-16 08:33:56 +0000 (Thu, 16 Oct 2014)
New Revision: 15302

Modified:
   packages/trunk/pink-pony/debian/changelog
   packages/trunk/pink-pony/debian/patches/datadir.patch
Log:
* Team upload.
* Extend datadir.patch to fall back to /u/s/g/pink-pony if no
  resource_dir variable is set in ~/.config/pony.options.
  Thanks Matijs van Zuijlen, Closes: #765489.

Modified: packages/trunk/pink-pony/debian/changelog
===================================================================
--- packages/trunk/pink-pony/debian/changelog	2014-10-16 04:38:29 UTC (rev 15301)
+++ packages/trunk/pink-pony/debian/changelog	2014-10-16 08:33:56 UTC (rev 15302)
@@ -1,3 +1,12 @@
+pink-pony (1.4.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Extend datadir.patch to fall back to /u/s/g/pink-pony if no
+    resource_dir variable is set in ~/.config/pony.options.
+    Thanks Matijs van Zuijlen, Closes: #765489.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 16 Oct 2014 10:31:21 +0200
+
 pink-pony (1.4.1-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/pink-pony/debian/patches/datadir.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/datadir.patch	2014-10-16 04:38:29 UTC (rev 15301)
+++ packages/trunk/pink-pony/debian/patches/datadir.patch	2014-10-16 08:33:56 UTC (rev 15302)
@@ -1,11 +1,9 @@
 # Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game (GPL3+). See debian/copyright
 
-Index: pink-pony-1.4.1/pony.options
-===================================================================
---- 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 @@
+--- a/pony.options
++++ b/pony.options
+@@ -9,7 +9,7 @@ polygon_mode = fill;
  
  // Resource directory
  
@@ -14,11 +12,9 @@
  
  // Particles
  
-Index: pink-pony-1.4.1/src/main.cc
-===================================================================
---- 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 @@
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -20,7 +20,7 @@ Config config;
  
  int main(int argc, char** argv)
  {
@@ -27,3 +23,14 @@
      bool running = true;
      
      if (argc > 1) {
+--- a/src/Config.cc
++++ b/src/Config.cc
+@@ -8,7 +8,7 @@ Config::Config()
+       fsaa_samples(4),
+       swap_interval(1),
+       polygon_mode(GL_FILL),
+-      resource_dir("resources/"),
++      resource_dir("/usr/share/games/pink-pony/"),
+       levels_file("levels.xml"),
+       selected_level(0),
+       heightmap_file("levels/heightmap-heart.exr"),