Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at 2016-11-25 12:04:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gfxboot (Old) and /work/SRC/openSUSE:Factory/.gfxboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gfxboot" Changes: -------- --- /work/SRC/openSUSE:Factory/gfxboot/gfxboot.changes 2016-11-08 18:24:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gfxboot.new/gfxboot.changes 2016-11-25 12:04:55.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 23 14:27:20 UTC 2016 - [email protected] + +- merge pr gh#openSUSE/gfxboot#22 +- update git2log script +- adjust keymap names to be consistent again (bsc#1009914) +- 4.5.20 + +------------------------------------------------------------------- Old: ---- gfxboot-4.5.19.tar.xz New: ---- gfxboot-4.5.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.z0FwrC/_old 2016-11-25 12:04:57.000000000 +0100 +++ /var/tmp/diff_new_pack.z0FwrC/_new 2016-11-25 12:04:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: gfxboot -Version: 4.5.19 +Version: 4.5.20 Release: 0 Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX License: GPL-2.0+ ++++++ KDE.tar.xz ++++++ ++++++ SLED.tar.xz ++++++ ++++++ SLES.tar.xz ++++++ ++++++ examples.tar.xz ++++++ ++++++ gfxboot-4.5.19.tar.xz -> gfxboot-4.5.20.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.19/VERSION new/gfxboot-4.5.20/VERSION --- old/gfxboot-4.5.19/VERSION 2016-11-07 13:15:19.000000000 +0100 +++ new/gfxboot-4.5.20/VERSION 2016-11-23 15:23:06.000000000 +0100 @@ -1 +1 @@ -4.5.19 +4.5.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.19/changelog new/gfxboot-4.5.20/changelog --- old/gfxboot-4.5.19/changelog 2016-11-07 13:15:19.000000000 +0100 +++ new/gfxboot-4.5.20/changelog 2016-11-23 15:23:06.000000000 +0100 @@ -1,14 +1,24 @@ +2016-11-23: 4.5.20 + - merge pr gh#openSUSE/gfxboot#22 + - update git2log script + - adjust keymap names to be consistent again (bsc #1009914) + 2016-10-19: 4.5.19 + - merge pr gh#openSUSE/gfxboot#20 - Update ca.po 2016-10-19: 4.5.18 + - merge pr gh#openSUSE/gfxboot#18 + - merge pr gh#openSUSE/gfxboot#16 - Update ca.po - Update lt.po 2016-10-17: 4.5.17 + - merge pr gh#openSUSE/gfxboot#15 - fix bug calculating video and xvideo options (bsc #780621) 2016-10-14: 4.5.16 + - merge pr gh#openSUSE/gfxboot#14 - implement enhanced menu layout engine - rework video mode menu - adjust to new menu engine @@ -23,19 +33,24 @@ - updated sound samples 2016-09-13: 4.5.15 + - merge pr gh#openSUSE/gfxboot#11 - Adapted to the new keymaps used by linuxrc and YaST 2016-08-08: 4.5.14 + - merge pr gh#openSUSE/gfxboot#10 - fix boot-label redrawing after language change (bsc #988392) 2016-06-13: 4.5.13 + - merge pr gh#openSUSE/gfxboot#8 - updated translations - make 'systemboot' and 'more' menu entries translatable 2015-12-04: 4.5.12 + - merge pr gh#openSUSE/gfxboot#4 - fix booting from submenu (bsc #957893) 2015-11-12: 4.5.11 + - merge pr gh#openSUSE/gfxboot#3 - documented submenu syntax - show submenu indicator in RTL layout - on leaving a submenu, restore cursor position @@ -48,6 +63,7 @@ - implement LEAP boot splash 2015-09-28: 4.5.8 + - merge pr gh#openSUSE/gfxboot#2 - Add a basic README.md 2014-10-14: 4.5.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.19/git2log new/gfxboot-4.5.20/git2log --- old/gfxboot-4.5.19/git2log 2016-11-07 13:15:19.000000000 +0100 +++ new/gfxboot-4.5.20/git2log 2016-11-23 15:23:06.000000000 +0100 @@ -1,5 +1,17 @@ #! /usr/bin/perl +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# This script is maintained at https://github.com/openSUSE/ssob +# +# If you're in another project, this is just a copy. +# You may update it to the latest version from time to time... +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +use strict; + use Getopt::Long; use Data::Dumper; @@ -8,27 +20,44 @@ $Data::Dumper::Indent = 1; sub usage; +sub get_branch_tags; +sub get_branch; +sub get_parent_branch; +sub get_version; usage 0 if !@ARGV; -@deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags ); +my @deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags ); + +my $branch; +my $current_version; +my $github_project; +my @tags; +my @all_tags; + +my $opt_log; +my $opt_version; +my $opt_branch; +my $opt_update; +my $opt_file; GetOptions( 'help' => sub { usage 0 }, 'version' => \$opt_version, + 'branch' => \$opt_branch, 'update' => \$opt_update, 'log|changelog' => \$opt_log, ) || usage 1; -usage 1 if @ARGV > 1 || !($opt_log || $opt_version); +usage 1 if @ARGV > 1 || !($opt_log || $opt_version || $opt_branch); $opt_file = @ARGV ? shift : '-'; die "no git repo\n" unless -d ".git"; if($opt_update && $opt_file ne '-' && -f($opt_file)) { - $ok = 1; + my $ok = 1; - $t = (stat $opt_file)[9]; + my $t = (stat $opt_file)[9]; for (@deps) { $ok = 0 if (stat)[9] > $t; @@ -37,57 +66,55 @@ exit 0 if $ok; } -for (`git branch`) { - if(/^\*\s+(\S+)/) { - $branch = $1; - last; - } +if(`git config remote.origin.url` =~ m#github.com[:/]+(\S+/\S+)#) { + $github_project = $1; } -$branch = "master" if $branch eq '(no'; +@all_tags = `git tag`; +chomp @all_tags; +$branch = get_branch; die "no branch?\n" unless $branch; -# print STDERR "writing log for branch $branch\n"; - -@tags = `git tag`; +@tags = get_branch_tags; +die "no tags at all?\n" unless @tags; -chomp @tags; +if($branch ne 'master') { + if(!grep { /^$branch\-/ } @tags) { + $branch = get_parent_branch; + die "sorry, can't determine branch\n" unless $branch; -for (@tags) { - if(/^\d/) { - s/(\d+)/sprintf "%04d", $1/eg; - push @ntags, $_; - } - elsif(s/^$branch\-//) { - s/(\d+)/sprintf "%04d", $1/eg; - push @ntags, "$branch-$_"; + @tags = get_branch_tags; + die "no tags at all?\n" unless @tags; } } +else { + @tags = get_branch_tags; + die "no tags at all?\n" unless @tags; +} -@tags = sort @ntags; - -die "no tags at all?\n" unless @tags; - -$current_version = $tags[-1]; -$current_version =~ s/(\d+)/$1 + 0/eg; +if($opt_branch) { + open my $f, ">$opt_file"; + print $f "$branch\n"; + close $f; -if(`git log --pretty=medium --date=iso '$current_version..HEAD'`) { - $current_version =~ s/(\d+)$/$1 + 1/e; + exit 0; } -$current_version =~ s/^$branch\-//; +$current_version = get_version; if($opt_version) { - open F, ">$opt_file"; - print F "$current_version\n"; - close F; + open my $f, ">$opt_file"; + print $f "$current_version\n"; + close $f; exit 0; } if($branch ne 'master') { - for ($i = 0; $i < @tags; $i++) { + my ($i1, $i2, $bi); + + for (my $i = 0; $i < @tags; $i++) { if($tags[$i] =~ /^$branch\-(\S+)/) { $i2 = $i; $bi = $1; @@ -99,7 +126,7 @@ warn "no tags in this branch yet\n" unless $bi; - for ($i = 0; $i < $i2; $i++) { + for (my $i = 0; $i < $i2; $i++) { if($tags[$i] ge $bi) { if($tags[$i] eq $bi) { $i1 = $i; @@ -122,31 +149,32 @@ open F, ">$opt_file"; -for ($i = @tags - 1; $i > 0; $i--) { - $date = undef; - @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`; +for (my $i = @tags - 1; $i > 0; $i--) { + my ($date, @t2); + + my @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`; # print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t, "---\n"; - undef @t2; - $merge = 0; + my $merge = 0; for (@t) { $merge = 1 if /^Merge: /; $merge = 0 if /^commit /; push @t2, $_ if !$merge; + if(/^ Merge pull request #(\d+) from /) { + push @t2, "merge pr gh#$github_project#$1\n" if $github_project; + } } @t = @t2; undef @t2; - $detail = 0; + my $detail = 0; for (@t) { $detail = 1 if /^ $/; + $detail = 2 if /^ Conflicts:$/; $detail = 0 if /^commit /; - if($detail && /^ [^\-\s]/) { - # push @t2, "# $_"; - } - else { - push @t2, $_; + if(!$detail) { + push @t2, $_ if $detail < 2; } } @t = @t2; @@ -160,10 +188,21 @@ last; } } + + # handle white space in every first line once and for all + my $empty = 1; + for (@t) { + $empty = 1, $_ = "", next if $_ =~ /^\s*$/; + next if !$empty; + s/^\s*//; + $empty = 0; + } + @t = grep { !/^(commit|Author:|Date:|Merge:|\s*$)|created.*tag/ } @t; if(@t) { # rewrite a bit to have it look more consistent - map { s/(fate|bnc)#/$1 #/g } @t; + map { s/(fate|bnc|bsc)#/$1 #/g } @t; + map { s/(fate|bnc|bsc)\s*(\d{4})/$1 #$2/g } @t; map { s/\(#/(bnc #/g } @t; map { s/bug\s*#/bnc #/g } @t; map { s/feat(\.|ure)?\s*#?(\d+)/fate #$2/g } @t; @@ -175,9 +214,9 @@ map { s/^/\t/ } @t; map { s/\\'/'/ } @t; -# print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t); + # print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t); - $t = $tags[$i]; + my $t = $tags[$i]; $t = "${branch}-$t" if $branch ne 'master' && $t eq "HEAD"; $t =~ s/HEAD/$current_version/; print F "$date:\t$t\n"; @@ -187,6 +226,8 @@ close F; + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sub usage { my $err = shift; @@ -196,6 +237,7 @@ Create changelog and project version from git repo. --changelog Write changelog to FILE. --version Write version number to FILE. + --branch Write current branch to FILE. --update Write changelog or version only if FILE is outdated. --help Print this help text. usage @@ -203,3 +245,72 @@ exit $err; } + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +sub get_branch_tags +{ + my @ntags; + + for (@all_tags) { + if(/^\d/) { + s/(\d+)/sprintf "%04d", $1/eg; + push @ntags, $_; + } + elsif(s/^$branch\-//) { + s/(\d+)/sprintf "%04d", $1/eg; + push @ntags, "$branch-$_"; + } + } + + return sort @ntags; +} + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +sub get_branch +{ + my $b; + + for (`git branch`) { + if(/^\*\s+(\S+)/) { + $b = $1; + last; + } + } + + $b = "master" if $b eq '(no'; + + return $b; +} + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +sub get_parent_branch +{ + my $p; + + for (`git log -g --pretty=oneline`) { + $p = $1 if /checkout: moving from (\S+) to $branch/; + } + + # print "parent = $p\n"; + + return $p || "master"; +} + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +sub get_version +{ + my $v = $tags[-1]; + $v =~ s/(\d+)/$1 + 0/eg; + + if(`git log --pretty=medium --date=iso '$v..HEAD'`) { + $v =~ s/(\d+)$/$1 + 1/e; + } + + $v =~ s/^$branch\-//; + + return $v; +} + ++++++ openSUSE.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_lang.inc new/themes/openSUSE/src/dia_lang.inc --- old/themes/openSUSE/src/dia_lang.inc 2016-11-07 13:15:19.000000000 +0100 +++ new/themes/openSUSE/src/dia_lang.inc 2016-11-23 15:23:06.000000000 +0100 @@ -27,59 +27,59 @@ [ "bn_BD" "us" false "\u09ac\u09be\u0982\u09b2\u09be" ] % Bengali [ "bs_BA" "us" false "Bosanski" ] % Bosnian [ "ca_ES" "es" false "Català" ] % Catalan - [ "cs_CZ" "cz-us-qwertz" false "Čeština" ] % Czech + [ "cs_CZ" "cz" false "Čeština" ] % Czech [ "cy_GB" "us" false "Cymraeg" ] % Welsh [ "da_DK" "dk" false "Dansk" ] % Danish - [ "de_DE" "de-latin1-nodeadkeys" false "Deutsch" ] % German + [ "de_DE" "de-nodeadkeys" false "Deutsch" ] % German [ "el_GR" "gr" false "Ελληνικά" ] % Greek [ "en_GB" "uk" false "English (UK)" ] % English [ "en_US" "us" false "English (US)" ] % English [ "es_ES" "es" false "Español" ] % Spanish [ "et_EE" "et" false "Eesti" ] % Estonian [ "fa_IR" "us" true "\ufbfd\ufeb4\u0631\ufe8e\ufed3" ] % Farsi - [ "fi_FI" "fi-latin1" false "Suomi" ] % Finnish - [ "fr_FR" "fr-latin1" false "Français" ] % French + [ "fi_FI" "fi" false "Suomi" ] % Finnish + [ "fr_FR" "fr" false "Français" ] % French [ "gl_ES" "es" false "Galego" ] % Galician [ "ka_GE" "us" false "ქართული" ] % Kartuli [ "gu_IN" "us" false "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0" ] % Gujarati [ "he_IL" "us" false "תירבע" ] % Hebrew % [ "hi_IN" "us" false "\u0939\u093f\u0928\u094d\u0926\u0940" ] % Hindi [ "hi_IN" "us" false "\u0939\u093f\u0902\u0926\u0940" ] % Hindi - [ "hr_HR" "croat" false "Hrvatski" ] % Croatian + [ "hr_HR" "hr" false "Hrvatski" ] % Croatian [ "hu_HU" "hu" false "Magyar" ] % Hungarian [ "id_ID" "us" false "Bahasa Indonesia" ] % Indonesian [ "it_IT" "it" false "Italiano" ] % Italian - [ "ja_JP" "jp106" false "日本語" ] % Japanese + [ "ja_JP" "jp" false "日本語" ] % Japanese [ "jv_ID" "us" false "Basa Jawa" ] % Javanese % [ "km_KH" "khmer" false "\u1781\u17d2\u1798\u17c2\u179a" ] % Khmer [ "km_KH" "khmer" false "Khmer" ] % Khmer - [ "ko_KR" "korean" false "한글" ] % Korean + [ "ko_KR" "kr" false "한글" ] % Korean [ "ky_KG" "us" false "Кыргызча" ] % Kirghiz [ "lo_LA" "us" false "\u0e9e\u0eb2\u0eaa\u0eb2\u0ea5\u0eb2\u0ea7" ] % Lao - [ "lt_LT" "lt.baltic" false "Lietuvių" ] % Lithuanian + [ "lt_LT" "lt" false "Lietuvių" ] % Lithuanian [ "mk_MK" "us" false "Македонски" ] % Macedonian [ "mr_IN" "us" false "\u092e\u0930\u093e\u0920\u0940" ] % Marathi - [ "nb_NO" "no-latin1" false "Norsk" ] % Norwegian + [ "nb_NO" "no" false "Norsk" ] % Norwegian [ "nl_NL" "us" false "Nederlands" ] % Dutch - [ "nn_NO" "no-latin1" false "Nynorsk" ] % Nynorsk + [ "nn_NO" "no" false "Nynorsk" ] % Nynorsk [ "pa_IN" "us" false "\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40" ] % Punjabi - [ "pl_PL" "Pl02" false "Polski" ] % Polish - [ "pt_BR" "br-abnt2" false "Português (Brasil)" ] % Portuguese (Brazilian) - [ "pt_PT" "pt-latin1" false "Português" ] % Portuguese + [ "pl_PL" "pl" false "Polski" ] % Polish + [ "pt_BR" "br" false "Português (Brasil)" ] % Portuguese (Brazilian) + [ "pt_PT" "pt" false "Português" ] % Portuguese [ "ro_RO" "us" false "Română" ] % Romanian [ "ru_RU" "ruwin_alt-UTF-8" false "Русский" ] % Russian [ "si_LK" "us" false "\u0dc3\u0dd2\u0d82\u0dc4\u0dbd" ] % Sinhala - [ "sk_SK" "sk-qwertz" false "Slovenčina" ] % Slovak - [ "sl_SI" "slovene" false "Slovenščina" ] % Slovenian + [ "sk_SK" "sk" false "Slovenčina" ] % Slovak + [ "sl_SI" "si" false "Slovenščina" ] % Slovenian [ "sr_RS" "sr-cy" false "Srpski" ] % Serbian - [ "sv_SE" "sv-latin1" false "Svenska" ] % Swedish + [ "sv_SE" "se" false "Svenska" ] % Swedish [ "ta_IN" "us" false "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd" ] % Tamil - [ "tg_TJ" "tj" false "тоҷикӣ" ] % Tadjik + [ "tg_TJ" "tj_alt-UTF8" false "тоҷикӣ" ] % Tadjik [ "th_TH" "us" false "\u0e20\u0e32\u0e29\u0e32\u0e44\u0e17\u0e22" ] % Thai - [ "tr_TR" "trq" false "Türkçe" ] % Turkish - [ "uk_UA" "ua" false "Українська" ] % Ukrainian + [ "tr_TR" "tr" false "Türkçe" ] % Turkish + [ "uk_UA" "ua-urf" false "Українська" ] % Ukrainian [ "vi_VN" "us" false "Tiếng Việt" ] % Vietnamese - [ "wa_BE" "be-latin1" false "Walon" ] % Walloon + [ "wa_BE" "be" false "Walon" ] % Walloon [ "xh_ZA" "us" false "isiXhosa" ] % Xhosa [ "zh_CN" "us" false "简体中文" ] % Simplified Chinese [ "zh_TW" "us" false "繁體中文 (台灣)" ] % Traditional Chinese ++++++ upstream.tar.xz ++++++
