commit gfxboot

27 Oct 2006

Hello community,

here is the log from the commit of package gfxboot
checked in at Fri Oct 27 18:51:44 CEST 2006.

--------

--- arch/i386/gfxboot/gfxboot.changes	2006-10-26 17:34:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/gfxboot/gfxboot.changes	2006-10-27 15:03:40.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 27 15:03:26 CEST 2006 - snwint@suse.de
+
+- penguin theme is back
+- adjust html help text parser
+
+-------------------------------------------------------------------

Old:
----
  gfxboot-3.3.10.tar.bz2

New:
----
  gfxboot-3.3.11.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.9kaV0a/_old	2006-10-27 18:50:33.000000000 +0200
+++ /var/tmp/diff_new_pack.9kaV0a/_new	2006-10-27 18:50:33.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package gfxboot (Version 3.3.10)
+# spec file for package gfxboot (Version 3.3.11)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -17,10 +17,10 @@
 Obsoletes:      gfxboot-devel
 Autoreqprov:    on
 Summary:        Graphical Boot Logo for LILO and SYSLINUX
-Version:        3.3.10
+Version:        3.3.11
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         gfxboot-3.3.10.tar.bz2
+Source:         gfxboot-3.3.11.tar.bz2
 Source1:        NLD.tar.bz2
 Source2:        SLES.tar.bz2
 Source3:        SuSE.tar.bz2
@@ -60,6 +60,9 @@
 /usr/share/gfxboot
 
 %changelog -n gfxboot
+* Fri Oct 27 2006 - snwint@suse.de
+- penguin theme is back
+- adjust html help text parser
 * Thu Oct 26 2006 - snwint@suse.de
 - new translations
 * Mon Oct 23 2006 - snwint@suse.de

++++++ NLD.tar.bz2 ++++++

++++++ SLES.tar.bz2 ++++++

++++++ SuSE.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/Makefile new/themes/SuSE/Makefile
--- old/themes/SuSE/Makefile	2006-09-25 17:56:29.000000000 +0200
+++ new/themes/SuSE/Makefile	2006-10-27 14:13:32.000000000 +0200
@@ -16,7 +16,7 @@
 
 DEFAULT_LANG =
 
-PIC_COMMON   = timer_a.jpg
+PIC_COMMON   = timer_a.jpg pback.jpg phead.jpg panim{,_a}.jpg pabout.txt gfxboot.cfg
 PIC_INSTALL  = back.jpg welcome.jpg text*.pcx
 PIC_BOOT     = back.jpg
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/boot.config new/themes/SuSE/boot.config
--- old/themes/SuSE/boot.config	2006-08-01 18:24:50.000000000 +0200
+++ new/themes/SuSE/boot.config	2006-10-27 13:50:27.000000000 +0200
@@ -4,11 +4,6 @@
 /bsplash.show { } def
 /bsplash.done { } def
 
-% no penguin stuff
-/ptheme.init { } def
-/p.timeout.animate { } def
-/p.call.super { } def
-
 %% include timeout.inc
 %% include common.inc
 
@@ -32,4 +27,5 @@
 %% include keytables.inc
 %% include locale.inc
 
+%% include penguin.inc
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/common.inc new/themes/SuSE/common.inc
--- old/themes/SuSE/common.inc	2006-10-23 15:23:54.000000000 +0200
+++ new/themes/SuSE/common.inc	2006-10-27 14:24:06.000000000 +0200
@@ -994,7 +994,7 @@
 
   /menu.text.xofs      10 def
   /menu.text.yofs       2 def
-  /menu.item.height    fontheight dup ptheme { 2 } { 2 } ifelse div add def
+  /menu.item.height    fontheight dup ptheme { 3 } { 2 } ifelse div add def
   /menu.bar.height     fontheight menu.text.yofs dup add add def
 
   font.normal setfont
@@ -1020,7 +1020,7 @@
 
   ptheme {
     /menu.start.x 220 def
-    /menu.start.y 182 def
+    /menu.start.y 163 def
   } if
 
   /menu.bar.width menu.bar.min.width def
@@ -1315,32 +1315,12 @@
 % Global variables.
 %
 
-/ptheme false def
-
-syslinux {
-  rand pop rand 4 shr 11 div 0xffff and
-    date weekday 5 lt { 15 } { 3 } ifelse
-    date month dup 12 eq exch 1 eq or { 1 add 2 div } if
-  mod 0 eq
-
-  date
-  dup 0x7d50c18 ge over 0x7d60101 le and
-  dup 0x7d50c12 eq or
-  dup 0x7d50c0b eq or
-  dup 0x7d50c06 eq or
-  dup 0x7d50c04 eq or
-  dup 0x7d50b1b eq or
-  exch pop or
-
-  0x417 cvp getbyte 0x40 and 0 ne or
-  {
-    /ptheme true def
-  } if
+/ptheme rand pop rand 100 mod penguin.percent lt def
 
+0x417 cvp getbyte 0x40 and 0 ne {
+  /ptheme true def
 } if
 
-/ptheme false def
-
 /transp 0x30 def
 
 /testX { 0x417 cvp getbyte 0x10 and 0 ne } def
@@ -1395,7 +1375,7 @@
 /debug 0 def
 
 ptheme small_layout or CapsLock or
-  true or
+%  true or
 {
   /bsplash.done { } def
 } {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/dia_about.inc new/themes/SuSE/dia_about.inc
--- old/themes/SuSE/dia_about.inc	2006-07-13 15:42:07.000000000 +0200
+++ new/themes/SuSE/dia_about.inc	2006-10-27 13:59:56.000000000 +0200
@@ -64,7 +64,7 @@
 /about.msg {
 
   /about.msg
-    "about.txt" findfile dup .undef ne {
+    ptheme { "pabout.txt" } { "about.txt" } ifelse findfile dup .undef ne {
       dup length string dup cvp rot dup length memcpy
     } if
   def
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/gfxboot.cfg new/themes/SuSE/gfxboot.cfg
--- old/themes/SuSE/gfxboot.cfg	1970-01-01 01:00:00.000000000 +0100
+++ new/themes/SuSE/gfxboot.cfg	2006-10-27 14:37:14.000000000 +0200
@@ -0,0 +1,2 @@
+# penguin theme likelihood, in percent
+penguin=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/install.config new/themes/SuSE/install.config
--- old/themes/SuSE/install.config	2006-08-08 15:35:00.000000000 +0200
+++ new/themes/SuSE/install.config	2006-10-27 13:30:52.000000000 +0200
@@ -24,10 +24,5 @@
 %% include keytables.inc
 %% include locale.inc
 
-% %% include penguin.inc
-% no penguin stuff
-/ptheme.init { } def
-/p.timeout.animate { } def
-/p.call.super { } def
-
+%% include penguin.inc
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/pabout.txt new/themes/SuSE/pabout.txt
--- old/themes/SuSE/pabout.txt	1970-01-01 01:00:00.000000000 +0100
+++ new/themes/SuSE/pabout.txt	2006-10-27 14:34:46.000000000 +0200
@@ -0,0 +1,6 @@
+Penguin theme originally made by Raphael Quinet
+(http://www.gamers.org/~quinet/lilo/).
+Modernized for openSUSE by Steffen Winterfeldt.
+
+Like it or hate it? Edit gfxboot.cfg in /boot/message
+to have it always or to get rid of it.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/panel.inc new/themes/SuSE/panel.inc
--- old/themes/SuSE/panel.inc	2006-07-13 15:38:44.000000000 +0200
+++ new/themes/SuSE/panel.inc	2006-10-27 13:55:57.000000000 +0200
@@ -94,28 +94,15 @@
       [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ]
       [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ]
     ] def
-
-    /panel.penguin [
-      [ keyF1 0 "F1" /panel.ptheme /panel.ptheme.width /panel.ptheme.update .undef ]
-      [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ]
-      [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ]
-    ] def
-
-    /panel ptheme {
-      panel.penguin
-    } {
-      panel.full
-      CapsLock { pop panel.full } if
-    } ifelse def
   } {
     /panel.short [
       [ keyF1 0 "F1" /panel.help /panel.help.width /panel.help.update .undef ]
       [ keyF2 0 "F2" /panel.options /panel.options.width /panel.options.update .undef ]
     ] def
-
-    /panel panel.full def
   } ifelse
 
+  /panel panel.full def
+
   panel.show
 } def
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/penguin.inc new/themes/SuSE/penguin.inc
--- old/themes/SuSE/penguin.inc	2005-08-28 19:39:11.000000000 +0200
+++ new/themes/SuSE/penguin.inc	2006-10-27 14:02:59.000000000 +0200
@@ -48,71 +48,6 @@
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-%
-% Panel penguin entry.
-%
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Show help window.
-%
-% ( ) => ( )
-%
-/panel.ptheme {
-  /panel panel.short def
-  penguin_about_popup
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Return width of panel entry.
-%
-% ( ) => ( width )
-%
-/panel.ptheme.width {
-  "About" strsize pop
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Redraw panel entry.
-%
-% ( panel ) => ( )
-%
-/panel.ptheme.update {
-  panel.text.moveto
-  "About" show
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Show penguin theme 'about' box.
-%
-% ( ) ==> ( )
-%
-/penguin_about_popup {
-  window.dialog
-
-  dup .title "About" put
-  dup .text
-"Penguin theme originally made by Raphael Quinet <quinet@gamers.org>.
-
-See http://www.gamers.org/~quinet/lilo/.
-
-Modernized for openSUSE by Steffen Winterfeldt <snwint@suse.de>"
-
-  put
-  dup .buttons [
-    button.ok button.default actRedraw button.setaction
-  ] put
-  dup window.init
-      window.show
-} def
-
-
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 %
 % penguin animations
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/system.inc new/themes/SuSE/system.inc
--- old/themes/SuSE/system.inc	2006-10-23 15:20:44.000000000 +0200
+++ new/themes/SuSE/system.inc	2006-10-27 14:16:36.000000000 +0200
@@ -914,6 +914,16 @@
 } def
 
 
+% Penguin theme percentage.
+%
+% (  -- int )
+%
+/penguin.percent {
+  /penguin.percent "penguin" getgfxconfig dup .undef ne { cvn } { pop 0 } ifelse def
+  penguin.percent
+} def
+
+
 % Video memory in kb.
 %
 % (  -- int )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/timeout.inc new/themes/SuSE/timeout.inc
--- old/themes/SuSE/timeout.inc	2006-03-13 16:46:29.000000000 +0100
+++ new/themes/SuSE/timeout.inc	2006-10-27 13:44:06.000000000 +0200
@@ -15,6 +15,8 @@
   % first time
   timeout.current .undef eq { over timeout.init } if
 
+  ptheme { over over p.timeout.animate } if
+
   % no counter
   timeout.steps .undef eq { return } if
 

++++++ Zen.tar.bz2 ++++++

++++++ gfxboot-3.3.10.tar.bz2 -> gfxboot-3.3.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.3.10/Changelog new/gfxboot-3.3.11/Changelog
--- old/gfxboot-3.3.10/Changelog	2006-10-26 15:54:08.000000000 +0200
+++ new/gfxboot-3.3.11/Changelog	2006-10-27 14:39:56.000000000 +0200
@@ -1,3 +1,7 @@
+27/10/2006:	v3.3.11
+	- penguin theme is back
+	- adjust html help text parser
+
 26/10/2006:	v3.3.10
 	- new translations
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.3.10/VERSION new/gfxboot-3.3.11/VERSION
--- old/gfxboot-3.3.10/VERSION	2006-10-26 15:53:51.000000000 +0200
+++ new/gfxboot-3.3.11/VERSION	2006-10-27 14:38:31.000000000 +0200
@@ -1 +1 @@
-3.3.10
+3.3.11
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.3.10/bin/unpack_bootlogo new/gfxboot-3.3.11/bin/unpack_bootlogo
--- old/gfxboot-3.3.10/bin/unpack_bootlogo	2005-12-05 16:00:27.000000000 +0100
+++ new/gfxboot-3.3.11/bin/unpack_bootlogo	2006-10-27 15:01:24.000000000 +0200
@@ -32,10 +32,20 @@
   }
 
   if($xdir) {
+    rename "$dir/gfxboot.cfg", "$dir/$xdir/gfxboot.cfg.tmp" if -f "$dir/gfxboot.cfg";
     system "chmod -t $tmp/$_ ; mv $tmp/$_ $dir/$xdir ; ln -s $xdir/$_ $tmp/$_" for @ext;
+    if(-f "$dir/$xdir/gfxboot.cfg.tmp") {
+      system "cat $dir/$xdir/gfxboot.cfg.tmp >>$dir/$xdir/gfxboot.cfg";
+      unlink "$dir/$xdir/gfxboot.cfg.tmp";
+    }
   }
   else {
+    rename "$dir/gfxboot.cfg", "$dir/gfxboot.cfg.tmp" if -f "$dir/gfxboot.cfg";
     system "chmod -t $tmp/$_ ; mv $tmp/$_ $dir" for @ext;
+    if(-f "$dir/gfxboot.cfg.tmp") {
+      system "cat $dir/gfxboot.cfg.tmp >>$dir/gfxboot.cfg";
+      unlink "$dir/gfxboot.cfg.tmp";
+    }
   }
 
   open P, "| cd $tmp; cpio --quiet -o >../bootlogo";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.3.10/help2txt new/gfxboot-3.3.11/help2txt
--- old/gfxboot-3.3.10/help2txt	2005-08-29 12:12:20.000000000 +0200
+++ new/gfxboot-3.3.11/help2txt	2006-10-27 13:09:36.000000000 +0200
@@ -4,7 +4,7 @@
 
 sub nospaces;
 
-$opt_product = "SUSE Linux";
+$opt_product = "openSUSE";
 
 %help_key_rename = (
   'F2' => 'F3',
@@ -27,14 +27,17 @@
     print STDERR "BOM in line $. found\n";
   }
 
-  s/\s*<\/?(hr|body|html|h\d+)\s*>//gi;
+  # remove XML markup fragments
+  s#<\?xml[^>]*>|<!DOCTYPE.*|\s*\]>\s*##g;
+
+  s#\s*<(/?(hr/?|body|html|h\d+)|/br)\s*>##gi;
   if(/<!--\s*help=(\S+)\s*-->/) {
     $helptype = $1;
   }
   s/\s*<(!|meta).*?>\s*//g;
   s/<(em|strong)>/\x11/gi;
   s/<\/(em|strong)>/\x10/gi;
-  s/&product;/$opt_product/gi;
+  s/(&product;|\@product\@)/$opt_product/gi;
   while(/<a\s/) {
     if(s/\<[aA]\s+name=\"([^"]+)\">([^<]*)<\/a>\s*/\x04\x12$1\x14$2\x10/) {
       if($anchor{$1}) {
@@ -59,7 +62,7 @@
 
 $txt =~ s/\n( +)(?!\n)/"\n<!" . length($1) . ">"/seg;
 $txt =~ s/\s+/ /sg;
-$txt =~ s/\s*<br>\s*/\n/sgi;
+$txt =~ s/\s*<br\/?>\s*/\n/sgi;
 $txt =~ s/<!(\d+)>/" " x $1/seg;
 $txt =~ s/(\x14.*?\x10)\s*/$1/sg;
 $txt =~ s/\s*(\x04|$)/$1/sg;


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)