r6802 - in packages/branches/neverball/experimental/debian: . patches

[Jordà Polo]

Author: jorda-guest
Date: 2008-04-26 18:12:59 +0000 (Sat, 26 Apr 2008)
New Revision: 6802

Removed:
   packages/branches/neverball/experimental/debian/patches/putt_scores.patch
   packages/branches/neverball/experimental/debian/patches/stereo_sound.patch
Modified:
   packages/branches/neverball/experimental/debian/changelog
   packages/branches/neverball/experimental/debian/patches/data_path.patch
   packages/branches/neverball/experimental/debian/patches/series
Log:
Update patches to match upstream's svn trunk.

Modified: packages/branches/neverball/experimental/debian/changelog
===================================================================
--- packages/branches/neverball/experimental/debian/changelog	2008-04-26 18:12:20 UTC (rev 6801)
+++ packages/branches/neverball/experimental/debian/changelog	2008-04-26 18:12:59 UTC (rev 6802)
@@ -1,3 +1,12 @@
+neverball (1.4.0+svn2098-1) UNRELEASED; urgency=low
+
+  * Experimental package based on upstream's development version.
+  * debian/patches:
+    + data_path.patch: Updated; redefine path to locales.
+    + Remove obsolete patches (stereo_sound.patch and putt_scores.patch).
+
+ -- Jordà Polo <jorda at ettin.org>  Sat, 26 Apr 2008 19:43:24 +0200
+
 neverball (1.4.0-6) unstable; urgency=low
 
   * The issue with not having any text in the menu is already fixed by the

Modified: packages/branches/neverball/experimental/debian/patches/data_path.patch
===================================================================
--- packages/branches/neverball/experimental/debian/patches/data_path.patch	2008-04-26 18:12:20 UTC (rev 6801)
+++ packages/branches/neverball/experimental/debian/patches/data_path.patch	2008-04-26 18:12:59 UTC (rev 6802)
@@ -1,11 +1,16 @@
---- neverball-1.4.0.orig/share/config.h
-+++ neverball-1.4.0/share/config.h
-@@ -20,7 +20,7 @@
+--- neverball-1.4.0+svn2098.orig/share/base_config.h
++++ neverball-1.4.0+svn2098/share/base_config.h
+@@ -30,11 +30,11 @@
+ #endif
  
- /*---------------------------------------------------------------------------*/
+ #ifndef CONFIG_DATA
+-#define CONFIG_DATA   "./data"        /* Game data directory */
++#define CONFIG_DATA   "/usr/share/games/neverball"   /* Game data directory */
+ #endif
  
--#define CONFIG_DATA "./data"
-+#define CONFIG_DATA "/usr/share/games/neverball"
- #define CONFIG_USER ".neverball"
+ #ifndef CONFIG_LOCALE
+-#define CONFIG_LOCALE "./locale"      /* Game localisation */
++#define CONFIG_LOCALE "/usr/share/locale"   /* Game localisation */
+ #endif
  
- /*
+ /* User config directory */

Deleted: packages/branches/neverball/experimental/debian/patches/putt_scores.patch
===================================================================
--- packages/branches/neverball/experimental/debian/patches/putt_scores.patch	2008-04-26 18:12:20 UTC (rev 6801)
+++ packages/branches/neverball/experimental/debian/patches/putt_scores.patch	2008-04-26 18:12:59 UTC (rev 6802)
@@ -1,34 +0,0 @@
---- neverball-1.4.0.orig/putt/hole.c
-+++ neverball-1.4.0/putt/hole.c
-@@ -134,7 +134,7 @@
- 
-     if (p <= party)
-     {
--        for (h = 1; h <= hole && h <= 18; h++)
-+        for (h = 1; h <= hole && h < count; h++)
-             T += score_v[h][p];
- 
-         sprintf(str, "%d", T);
-@@ -152,7 +152,7 @@
- 
-     if (p <= party)
-     {
--        for (h = 1; h <= hole && h <= 9; h++)
-+        for (h = 1; h <= hole && h <= (count / 2); h++)
-             T += score_v[h][p];
- 
-         sprintf(str, "%d", T);
-@@ -167,10 +167,11 @@
-     static char str[MAXSTR];
- 
-     int h, T = 0;
-+    int out = count / 2;
- 
--    if (hole > 9 && p <= party)
-+    if (hole > out && p <= party)
-     {
--        for (h = 10; h <= hole && h <= 18; h++)
-+        for (h = out + 1; h <= hole && h < count; h++)
-             T += score_v[h][p];
- 
-         sprintf(str, "%d", T);

Modified: packages/branches/neverball/experimental/debian/patches/series
===================================================================
--- packages/branches/neverball/experimental/debian/patches/series	2008-04-26 18:12:20 UTC (rev 6801)
+++ packages/branches/neverball/experimental/debian/patches/series	2008-04-26 18:12:59 UTC (rev 6802)
@@ -1,3 +1 @@
 data_path.patch
-stereo_sound.patch
-putt_scores.patch

Deleted: packages/branches/neverball/experimental/debian/patches/stereo_sound.patch
===================================================================
--- packages/branches/neverball/experimental/debian/patches/stereo_sound.patch	2008-04-26 18:12:20 UTC (rev 6801)
+++ packages/branches/neverball/experimental/debian/patches/stereo_sound.patch	2008-04-26 18:12:59 UTC (rev 6802)
@@ -1,19 +0,0 @@
---- neverball-1.4.0.orig/share/audio.c
-+++ neverball-1.4.0/share/audio.c
-@@ -47,7 +47,7 @@
- 
-     if (audio_state == 0)
-     {
--        if (Mix_OpenAudio(r, MIX_DEFAULT_FORMAT, 1, b) == 0)
-+        if (Mix_OpenAudio(r, MIX_DEFAULT_FORMAT, 2, b) == 0)
-         {
-             for (i = 0; i < MAXSND; i++)
-                 if (chan[i])
-@@ -60,6 +60,7 @@
-         }
-         else
-         {
-+            printf("Mix_OpenAudio: %s\n", Mix_GetError());
-             fprintf(stderr, "Sound disabled\n");
-             audio_state = 0;
-         }