r15457 - in packages/trunk/garden-of-coloured-lights/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2015-06-29 05:06:17 +0000 (Mon, 29 Jun 2015)
New Revision: 15457

Removed:
   packages/trunk/garden-of-coloured-lights/debian/patches/configure-ac.patch
Modified:
   packages/trunk/garden-of-coloured-lights/debian/changelog
   packages/trunk/garden-of-coloured-lights/debian/patches/garden-desktop.patch
   packages/trunk/garden-of-coloured-lights/debian/patches/series
   packages/trunk/garden-of-coloured-lights/debian/patches/windowed.patch
Log:
garden-of-coloured-lights: refresh patches


Modified: packages/trunk/garden-of-coloured-lights/debian/changelog
===================================================================
--- packages/trunk/garden-of-coloured-lights/debian/changelog	2015-06-29 05:00:40 UTC (rev 15456)
+++ packages/trunk/garden-of-coloured-lights/debian/changelog	2015-06-29 05:06:17 UTC (rev 15457)
@@ -1,6 +1,8 @@
 garden-of-coloured-lights (1.0.9-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Drop configure-ac.patch, applied upstream.
+    - Refresh remaining patches.
   * Update watch file.
 
  -- Vincent Cheng <vcheng at debian.org>  Sun, 28 Jun 2015 21:57:23 -0700

Deleted: packages/trunk/garden-of-coloured-lights/debian/patches/configure-ac.patch
===================================================================
--- packages/trunk/garden-of-coloured-lights/debian/patches/configure-ac.patch	2015-06-29 05:00:40 UTC (rev 15456)
+++ packages/trunk/garden-of-coloured-lights/debian/patches/configure-ac.patch	2015-06-29 05:06:17 UTC (rev 15457)
@@ -1,28 +0,0 @@
-Patch to fix linker error and FTBFS.
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,7 +5,6 @@
- AC_INIT([GARDEN], 
- 	[1.0.8], 
- 	[bubla at users.sourceforge.net])
--AS_INIT
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall])
- AC_CONFIG_SRCDIR([src/input.h])
-@@ -91,7 +90,7 @@
- try_link_allegro "$allegro_LIBS"
- AS_IF([test "x$?" == "x0"],
-       [[LIBS="$LIBS $allegro_LIBS"
--       ALLEGRO_LIB=`echo $allegro_LIBS | sed -e 's/-l\([^[:blank:]]*\).*/\1/'`
-+       ALLEGRO_LIB=`echo $allegro_LIBS | sed -e 's/.*-l\([^[:blank:]]*\).*/\1/'`
-        have_allegro="yes"]])
- 
- ALLEGRO_RELEASE_LIBS="alleg alleg42 alleg44"
-@@ -117,6 +116,7 @@
- 
- # Checks for header files.
- AC_CHECK_HEADERS([string.h sys/stat.h])
-+AC_CHECK_LIB(m, sin)
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE

Modified: packages/trunk/garden-of-coloured-lights/debian/patches/garden-desktop.patch
===================================================================
--- packages/trunk/garden-of-coloured-lights/debian/patches/garden-desktop.patch	2015-06-29 05:00:40 UTC (rev 15456)
+++ packages/trunk/garden-of-coloured-lights/debian/patches/garden-desktop.patch	2015-06-29 05:06:17 UTC (rev 15457)
@@ -1,16 +1,12 @@
 Various tweaks to Garden of Coloured Lights' desktop file.
 --- a/resources/garden.desktop
 +++ b/resources/garden.desktop
-@@ -1,8 +1,8 @@
+@@ -1,6 +1,6 @@
  [Desktop Entry]
 -Name=garden
 -Comment=Garden of coloured lights shoot-em-up
--Exec=garden
--Icon=garden
 +Name=Garden of Coloured Lights
 +Comment=Abstract vertical shooter with music elements
-+Exec=/usr/games/garden
-+Icon=/usr/share/pixmaps/garden.svg
+ Exec=garden
+ Icon=garden
  Terminal=false
- X-MultipleArgs=false
- Type=Application

Modified: packages/trunk/garden-of-coloured-lights/debian/patches/series
===================================================================
--- packages/trunk/garden-of-coloured-lights/debian/patches/series	2015-06-29 05:00:40 UTC (rev 15456)
+++ packages/trunk/garden-of-coloured-lights/debian/patches/series	2015-06-29 05:06:17 UTC (rev 15457)
@@ -1,3 +1,2 @@
 garden-desktop.patch
-configure-ac.patch
 windowed.patch

Modified: packages/trunk/garden-of-coloured-lights/debian/patches/windowed.patch
===================================================================
--- packages/trunk/garden-of-coloured-lights/debian/patches/windowed.patch	2015-06-29 05:00:40 UTC (rev 15456)
+++ packages/trunk/garden-of-coloured-lights/debian/patches/windowed.patch	2015-06-29 05:06:17 UTC (rev 15457)
@@ -1,6 +1,6 @@
 Default to windowed mode on first startup.
---- garden-1.0.8.orig/src/main.c
-+++ garden-1.0.8/src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -212,7 +212,7 @@
  	int randseed = get_config_int("Misc", "Seed", 0);
  	srand(randseed);
@@ -10,9 +10,9 @@
  
  
  	int windowed;
---- garden-of-coloured-lights-1.0.8.orig/data/init.txt
-+++ garden-of-coloured-lights-1.0.8/data/init.txt
-@@ -3,4 +3,4 @@ Easy = 40
+--- a/data/init.txt
++++ b/data/init.txt
+@@ -3,4 +3,4 @@
  Normal = 0
  Hard = 0
  [Misc]