r15624 - in packages/trunk/rrootage/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2015-12-16 10:09:17 +0000 (Wed, 16 Dec 2015)
New Revision: 15624

Added:
   packages/trunk/rrootage/debian/patches/09_rootage_make_highres_default.patch
Removed:
   packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch
Modified:
   packages/trunk/rrootage/debian/changelog
   packages/trunk/rrootage/debian/patches/series
   packages/trunk/rrootage/debian/rrootage.6
Log:
Release 0.23a-12


Modified: packages/trunk/rrootage/debian/changelog
===================================================================
--- packages/trunk/rrootage/debian/changelog	2015-12-13 16:16:26 UTC (rev 15623)
+++ packages/trunk/rrootage/debian/changelog	2015-12-16 10:09:17 UTC (rev 15624)
@@ -1,3 +1,12 @@
+rrootage (0.23a-12) unstable; urgency=medium
+
+  * Team upload.
+  * Rebase 09_rrootage_make_highres_default.patch and enable it.
+  * rrootage.6: Mention that high resolution mode is the default now.
+    Thanks to Ivy Foster for the report.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 16 Dec 2015 10:58:26 +0100
+
 rrootage (0.23a-11) unstable; urgency=medium
 
   * Team upload.

Added: packages/trunk/rrootage/debian/patches/09_rootage_make_highres_default.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/09_rootage_make_highres_default.patch	                        (rev 0)
+++ packages/trunk/rrootage/debian/patches/09_rootage_make_highres_default.patch	2015-12-16 10:09:17 UTC (rev 15624)
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 12 Dec 2015 17:24:29 +0100
+Subject: 09_rootage_make_highres_default
+
+Forwarded: no
+---
+ src/screen.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/screen.c b/src/screen.c
+index 1c83309..303ae49 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -128,7 +128,7 @@ static GLuint smokeTexture;
+ static GLuint titleTexture;
+ #define TITLE_BMP "title.bmp"
+ 
+-int resolution = MEDIUM_RESOLUTION;
++int resolution = HIGH_RESOLUTION;
+ int windowMode = 1;
+ int brightness = DEFAULT_BRIGHTNESS;
+ Uint8 *keys;

Deleted: packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch	2015-12-13 16:16:26 UTC (rev 15623)
+++ packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch	2015-12-16 10:09:17 UTC (rev 15624)
@@ -1,13 +0,0 @@
-Index: rrootage-0.23a/src/screen.c
-===================================================================
---- rrootage-0.23a.orig/src/screen.c	2007-08-29 19:50:14.000000000 +0000
-+++ rrootage-0.23a/src/screen.c	2007-08-29 19:50:14.000000000 +0000
-@@ -128,7 +128,7 @@
- static GLuint titleTexture;
- #define TITLE_BMP "title.bmp"
- 
--int resolution = MEDIUM_RESOLUTION;
-+int resolution = HIGH_RESOLUTION;
- int windowMode = 0;
- int brightness = DEFAULT_BRIGHTNESS;
- Uint8 *keys;

Modified: packages/trunk/rrootage/debian/patches/series
===================================================================
--- packages/trunk/rrootage/debian/patches/series	2015-12-13 16:16:26 UTC (rev 15623)
+++ packages/trunk/rrootage/debian/patches/series	2015-12-16 10:09:17 UTC (rev 15624)
@@ -6,5 +6,5 @@
 06_rrootage_highres.patch
 07_use_system_bulletml.patch
 08_windowed_mode.patch
-#09_rrootage_make_highres_default.patch
 10_deg_out_of_range.patch
+09_rootage_make_highres_default.patch

Modified: packages/trunk/rrootage/debian/rrootage.6
===================================================================
--- packages/trunk/rrootage/debian/rrootage.6	2015-12-13 16:16:26 UTC (rev 15623)
+++ packages/trunk/rrootage/debian/rrootage.6	2015-12-16 10:09:17 UTC (rev 15624)
@@ -80,10 +80,10 @@
 Low resolution mode.
 .TP
 .B \-mediumres
-Medium resolution mode (default).
+Medium resolution mode.
 .TP
 .B \-highres
-High resolution mode.
+High resolution mode (default).
 .TP
 .B \-nosound
 Disable sound.