[Demudi-commits] r1042 - in bootsplash/trunk/debian: . patches

[Free Ekanayaka]

Author: free-guest
Date: 2007-01-25 11:37:43 +0100 (Thu, 25 Jan 2007)
New Revision: 1042

Modified:
   bootsplash/trunk/debian/README.Debian
   bootsplash/trunk/debian/bootsplash-default
   bootsplash/trunk/debian/changelog
   bootsplash/trunk/debian/patches/gcc-4.0.dpatch
Log:
releasing version 3.3-5

Modified: bootsplash/trunk/debian/README.Debian
===================================================================
--- bootsplash/trunk/debian/README.Debian	2007-01-25 10:37:34 UTC (rev 1041)
+++ bootsplash/trunk/debian/README.Debian	2007-01-25 10:37:43 UTC (rev 1042)
@@ -12,7 +12,7 @@
 file and:
 
 1) append "splash=silent" to your kernel's boot parameters.
-2) dd the correct "vga=???" boot parameter, depending on what
+2) add the correct "vga=???" boot parameter, depending on what
    resolution you want to use.
 
 For examle:
@@ -42,4 +42,4 @@
 These display modes can also be found in the FrameBuffer HOWTO.  Any
 16bit mode should work.
 
- -- Free Ekanayaka <free at 64studio.com>, Thu, 25 May 2006 10:20:14 z
+ -- Free Ekanayaka <freee at debian.org>, Tue, 23 Jan 2007 12:20:51 +0100

Modified: bootsplash/trunk/debian/bootsplash-default
===================================================================
--- bootsplash/trunk/debian/bootsplash-default	2007-01-25 10:37:34 UTC (rev 1041)
+++ bootsplash/trunk/debian/bootsplash-default	2007-01-25 10:37:43 UTC (rev 1042)
@@ -10,7 +10,7 @@
 SPLASH="yes"
 
 # The theme bootsplash should use.  Right now this points to
-# /etc/bootsplash/theme/current which is a symlink to the
+# /etc/bootsplash/themes/current which is a symlink to the
 # current theme.
 THEME="current"
 

Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog	2007-01-25 10:37:34 UTC (rev 1041)
+++ bootsplash/trunk/debian/changelog	2007-01-25 10:37:43 UTC (rev 1042)
@@ -1,3 +1,14 @@
+bootsplash (3.3-5) unstable; urgency=low
+
+  * Bug fix: "fbmngplay doesn't work", thanks to Pablo Chinea and  
+    Jens Lody (Closes: #385443).
+  * Bug fix: "typo in /etc/default/bootsplash", thanks to Tomas Pospisek
+    (Closes: #407556).
+  * Bug fix: "typo in README.Debian", thanks to Tomas Pospisek (Closes:
+    #407558).
+
+ -- Free Ekanayaka <freee at debian.org>  Tue, 23 Jan 2007 12:22:07 +0100
+
 bootsplash (3.3-4) unstable; urgency=low
 
   * Actually included the es.po file\!

Modified: bootsplash/trunk/debian/patches/gcc-4.0.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/gcc-4.0.dpatch	2007-01-25 10:37:34 UTC (rev 1041)
+++ bootsplash/trunk/debian/patches/gcc-4.0.dpatch	2007-01-25 10:37:43 UTC (rev 1042)
@@ -6,35 +6,25 @@
 
 @DPATCH@
 diff -urNad bootsplash-3.1~/Utilities/mng.c bootsplash-3.1/Utilities/mng.c
---- bootsplash-3.1~/Utilities/mng.c	2006-02-05 20:42:22.000000000 -0500
-+++ bootsplash-3.1/Utilities/mng.c	2006-02-05 20:43:15.701551216 -0500
-@@ -217,7 +217,7 @@
- 	// BGRA8        
- 	unsigned int i = mymng->width;
- 	unsigned int fr, fg, fb, br, bg, bb, r, g, b, a;
--	unsigned short output, input;
-+	unsigned short output, input, tmp;
- 
- 	while (i--) {
- 		fb = *src++;
+--- bootsplash-3.3~/Utilities/mng.c	2006-02-05 20:42:22.000000000 -0500
++++ bootsplash-3.3/Utilities/mng.c	2007-01-20 18:09:57.000000000 +0100
 @@ -228,7 +228,8 @@
  		a = a * mymng->alpha / 100;
  		switch (mymng->fbbpp) {
  		case 16:
 -			input = *((unsigned short *) background)++;
 +			input = *((unsigned short *) background);
-+			input++;
++			background += sizeof(*((unsigned short *) background));
  
  			br = (input >> mng->fbredo) << (8 - mng->fbredl);
  			bg = (input >> mng->fbgreeno) << (8 -
-@@ -279,7 +280,9 @@
+@@ -279,7 +280,8 @@
  						  fbgreeno) | (b << mng->
  							       fbblueo);
  
 -			*((unsigned short *) dest)++ = output;
-+			tmp = *((unsigned short *) dest);
-+			tmp++;
-+			tmp = output;
++			*((unsigned short *) dest) = output;
++			dest += sizeof(*((unsigned short *) dest));
  			break;
  		case 24:
  			*dest++ = b;