Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-07-09 09:59:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader", Maintainer is "snwint@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2012-07-02 10:32:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-07-09 09:59:55.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jul 6 14:18:45 CEST 2012 - mchang@suse.com + +- use 'auto' for default gfxmode +- replace background with theme +- support editing GRUB_DISTRIBUTOR +- re-enable to create device.map from BootStorage +- 0.6.6 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.6.5.tar.bz2 New: ---- perl-Bootloader-0.6.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.20vgbL/_old 2012-07-09 09:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.20vgbL/_new 2012-07-09 09:59:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.6.5 +Version: 0.6.6 Release: 0 Requires: perl-base = %{perl_version} Requires: e2fsprogs ++++++ perl-Bootloader-0.6.5.tar.bz2 -> perl-Bootloader-0.6.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.5/perl-Bootloader.changes new/perl-Bootloader-0.6.6/perl-Bootloader.changes --- old/perl-Bootloader-0.6.5/perl-Bootloader.changes 2012-06-29 16:21:41.000000000 +0200 +++ new/perl-Bootloader-0.6.6/perl-Bootloader.changes 2012-07-06 14:20:59.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Jul 6 14:18:45 CEST 2012 - mchang@suse.com + +- use 'auto' for default gfxmode +- replace background with theme +- support editing GRUB_DISTRIBUTOR +- re-enable to create device.map from BootStorage +- 0.6.6 + +------------------------------------------------------------------- Fri Jun 29 16:20:02 CEST 2012 - snwint@suse.de - mchang: fix error caused by grub.cfg missing (bnc#769350) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.5/src/Core/GRUB2.pm new/perl-Bootloader-0.6.6/src/Core/GRUB2.pm --- old/perl-Bootloader-0.6.5/src/Core/GRUB2.pm 2012-06-29 16:21:41.000000000 +0200 +++ new/perl-Bootloader-0.6.6/src/Core/GRUB2.pm 2012-07-06 14:20:59.000000000 +0200 @@ -631,21 +631,19 @@ $conf =~ s/^\s*@/#/; } } - # TODO: as we know the grub2-install also create device map - # I skipped creating them by yast .. # now process the device map - ## my %glob = %{$self->{"global"}}; - ## my @device_map = (); - ## while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) - ## { - ## my $line = "($fw)\t$unix"; - ## push @device_map, $line; - ## } + my %glob = %{$self->{"global"}}; + my @device_map = (); + while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) + { + my $line = "($fw)\t$unix"; + push @device_map, $line; + } return { Bootloader::Path::Grub2_installdevice() => $grub2_installdev, Bootloader::Path::Grub2_defaultconf() => $grub2_defaultconf, - ## Bootloader::Path::Grub2_devicemap() => \@device_map, + Bootloader::Path::Grub2_devicemap() => \@device_map, } } @@ -700,8 +698,10 @@ $ret{"serial"} = $val; } elsif ($key =~ m/@?GRUB_GFXMODE/) { $ret{"gfxmode"} = $val; - } elsif ($key =~ m/@?GRUB_BACKGROUND/) { - $ret{"gfxbackground"} = $val; + } elsif ($key =~ m/@?GRUB_THEME/) { + $ret{"gfxtheme"} = $val; + } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { + $ret{"distributor"} = $val; } } @@ -800,7 +800,7 @@ }, { 'key' => '@GRUB_GFXMODE', - 'value' => '640x480', + 'value' => 'auto', 'comment_before' => [ '# The resolution used on graphical terminal', '# note that you can use only modes which your graphic card supports via VBE', @@ -842,7 +842,8 @@ my $terminal = delete $globinfo{"terminal"} || ""; my $serial = delete $globinfo{"serial"} || ""; my $gfxmode = delete $globinfo{"gfxmode"} || ""; - my $gfxbackground = delete $globinfo{"gfxbackground"} || ""; + my $gfxtheme = delete $globinfo{"gfxtheme"} || ""; + my $distributor = delete $globinfo{"distributor"} || ""; # $root = " root=$root" if $root ne ""; $vga = " vga=$vga" if $vga ne ""; $append = " $append" if $append ne ""; @@ -882,14 +883,14 @@ $line_ref->{"value"} = $gfxmode; } $gfxmode = ""; - } elsif ($key =~ m/@?GRUB_BACKGROUND/) { - if ($gfxbackground ne "") { - $line_ref->{"key"} = "GRUB_BACKGROUND"; - $line_ref->{"value"} = $gfxbackground; + } elsif ($key =~ m/@?GRUB_THEME/) { + if ($gfxtheme ne "") { + $line_ref->{"key"} = "GRUB_THEME"; + $line_ref->{"value"} = $gfxtheme; } else { $line_ref = undef; } - $gfxbackground = ""; + $gfxtheme = ""; } elsif ($key =~ m/@?GRUB_TERMINAL/) { if ($terminal eq "") { $line_ref->{"key"} = '@GRUB_TERMINAL'; @@ -901,6 +902,9 @@ } $terminal = ""; } + } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { + $line_ref->{"value"} = "$distributor" if "$distributor" ne ""; + $distributor = ""; } defined $line_ref ? $line_ref : (); } @lines; @@ -947,10 +951,17 @@ } } - if ($gfxbackground ne "") { + if ($gfxtheme ne "") { + push @lines, { + "key" => "GRUB_THEME", + "value" => "$gfxtheme", + } + } + + if ("$distributor" ne "") { push @lines, { - "key" => "GRUB_BACKGROUND", - "value" => "$gfxbackground", + "key" => "GRUB_DISTRIBUTOR", + "value" => "$distributor", } } return \@lines; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.5/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.6.6/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.6.5/src/Core/GRUB2EFI.pm 2012-06-29 16:21:41.000000000 +0200 +++ new/perl-Bootloader-0.6.6/src/Core/GRUB2EFI.pm 2012-07-06 14:20:59.000000000 +0200 @@ -238,8 +238,10 @@ $ret{"serial"} = $val; } elsif ($key =~ m/@?GRUB_GFXMODE/) { $ret{"gfxmode"} = $val; - } elsif ($key =~ m/@?GRUB_BACKGROUND/) { - $ret{"gfxbackground"} = $val; + } elsif ($key =~ m/@?GRUB_THEME/) { + $ret{"gfxtheme"} = $val; + } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { + $ret{"distributor"} = $val; } } @@ -337,7 +339,7 @@ }, { 'key' => '@GRUB_GFXMODE', - 'value' => '640x480', + 'value' => 'auto', 'comment_before' => [ '# The resolution used on graphical terminal', '# note that you can use only modes which your graphic card supports via VBE', @@ -379,7 +381,8 @@ my $terminal = delete $globinfo{"terminal"} || ""; my $serial = delete $globinfo{"serial"} || ""; my $gfxmode = delete $globinfo{"gfxmode"} || ""; - my $gfxbackground = delete $globinfo{"gfxbackground"} || ""; + my $gfxtheme = delete $globinfo{"gfxtheme"} || ""; + my $distributor = delete $globinfo{"distributor"} || ""; # $root = " root=$root" if $root ne ""; $vga = " vga=$vga" if $vga ne ""; $append = " $append" if $append ne ""; @@ -419,14 +422,14 @@ $line_ref->{"value"} = $gfxmode; } $gfxmode = ""; - } elsif ($key =~ m/@?GRUB_BACKGROUND/) { - if ($gfxbackground ne "") { - $line_ref->{"key"} = "GRUB_BACKGROUND"; - $line_ref->{"value"} = $gfxbackground; + } elsif ($key =~ m/@?GRUB_THEME/) { + if ($gfxtheme ne "") { + $line_ref->{"key"} = "GRUB_THEME"; + $line_ref->{"value"} = $gfxtheme; } else { $line_ref = undef; } - $gfxbackground = ""; + $gfxtheme = ""; } elsif ($key =~ m/@?GRUB_TERMINAL/) { if ($terminal eq "") { $line_ref->{"key"} = '@GRUB_TERMINAL'; @@ -438,6 +441,9 @@ } $terminal = ""; } + } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { + $line_ref->{"value"} = "$distributor" if "$distributor" ne ""; + $distributor = ""; } defined $line_ref ? $line_ref : (); } @lines; @@ -484,13 +490,19 @@ } } - if ($gfxbackground ne "") { + if ($gfxtheme ne "") { push @lines, { - "key" => "GRUB_BACKGROUND", - "value" => "$gfxbackground", + "key" => "GRUB_THEME", + "value" => "$gfxtheme", } } + if ("$distributor" ne "") { + push @lines, { + "key" => "GRUB_DISTRIBUTOR", + "value" => "$distributor", + } + } return \@lines; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.5/version new/perl-Bootloader-0.6.6/version --- old/perl-Bootloader-0.6.5/version 2012-06-29 16:21:41.000000000 +0200 +++ new/perl-Bootloader-0.6.6/version 2012-07-06 14:20:59.000000000 +0200 @@ -1 +1 @@ -0.6.5 +0.6.6 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org