Hello community,
here is the log from the commit of package gfxboot for openSUSE:Factory checked in at 2018-01-28 00:37:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gfxboot (Old)
and /work/SRC/openSUSE:Factory/.gfxboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gfxboot"
Sun Jan 28 00:37:56 2018 rev:134 rq:569766 version:4.5.25
Changes:
--------
--- /work/SRC/openSUSE:Factory/gfxboot/gfxboot.changes 2017-10-10 11:37:01.939152108 +0200
+++ /work/SRC/openSUSE:Factory/.gfxboot.new/gfxboot.changes 2018-01-28 00:37:57.765606914 +0100
@@ -1,0 +2,20 @@
+Fri Jan 26 01:32:37 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Translated using Weblate (Japanese)
+- 4.5.25
+
+--------------------------------------------------------------------
+Thu Jan 25 07:52:53 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Translated using Weblate (Slovak)
+
+--------------------------------------------------------------------
+Tue Jan 23 15:07:52 UTC 2018 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/gfxboot#29
+- add config file entries to specify a title for the main screen
+ (bsc#1077188)
+- fix bug processing serial menu entries (bsc#1075852)
+- 4.5.24
+
+--------------------------------------------------------------------
Old:
----
gfxboot-4.5.23.tar.xz
New:
----
gfxboot-4.5.25.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.E1OoGC/_old 2018-01-28 00:37:58.757560703 +0100
+++ /var/tmp/diff_new_pack.E1OoGC/_new 2018-01-28 00:37:58.761560516 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gfxboot
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: gfxboot
-Version: 4.5.23
+Version: 4.5.25
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.23.tar.xz -> gfxboot-4.5.25.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.23/VERSION new/gfxboot-4.5.25/VERSION
--- old/gfxboot-4.5.23/VERSION 2017-10-05 16:43:02.000000000 +0200
+++ new/gfxboot-4.5.25/VERSION 2018-01-26 05:03:07.000000000 +0100
@@ -1 +1 @@
-4.5.23
+4.5.25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.23/changelog new/gfxboot-4.5.25/changelog
--- old/gfxboot-4.5.23/changelog 2017-10-05 16:43:02.000000000 +0200
+++ new/gfxboot-4.5.25/changelog 2018-01-26 05:03:07.000000000 +0100
@@ -1,3 +1,12 @@
+2018-01-26: 4.5.25
+ - Translated using Weblate (Japanese)
+ - Translated using Weblate (Slovak)
+
+2018-01-23: 4.5.24
+ - merge pr gh#openSUSE/gfxboot#29
+ - fix bug processing serial menu entries (bsc #1075852)
+ - add config file entries to specify a title for the main screen (bsc #1077188)
+
2017-10-04: 4.5.23
- merge pr gh#openSUSE/gfxboot#27
- add gfx mode number and framebuffer address to debug status
++++++ openSUSE.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/Makefile new/themes/openSUSE/Makefile
--- old/themes/openSUSE/Makefile 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/Makefile 2018-01-26 05:03:07.000000000 +0100
@@ -49,6 +49,7 @@
perl -p -e 's/^(layout=.*)/$$1,install/' src/gfxboot.cfg >bootlogo.dir/gfxboot.cfg
perl -pi -e 's/^(theme=).*/$$1$(THEME)/' bootlogo.dir/gfxboot.cfg
perl -pi -e 's/^(product=).*/$$1$(PRODUCT)/' bootlogo.dir/gfxboot.cfg
+ perl -pi -e 's/^(mainmenu.title=).*/$$1$(PRODUCT)/' bootlogo.dir/gfxboot.cfg
cp -rL data-install/* fonts/*.fnt po/*.tr bootlogo.dir
cp -rL help-install/*.hlp bootlogo.dir
cp src/main.bin bootlogo.dir/init
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/po/ja.po new/themes/openSUSE/po/ja.po
--- old/themes/openSUSE/po/ja.po 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/po/ja.po 2018-01-26 05:03:07.000000000 +0100
@@ -4,12 +4,16 @@
msgid ""
msgstr ""
"Project-Id-Version: bootloader\n"
-"PO-Revision-Date: 2016-06-01 12:23\n"
-"Last-Translator: Novell language \n"
-"Language-Team: Novell language \n"
+"PO-Revision-Date: 2018-01-26 04:03+0000\n"
+"Last-Translator: Yasuhiko Kamata \n"
+"Language-Team: Japanese "
+"https://l10n.opensuse.org/projects/gfxboot/master/ja/\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 2.18\n"
#. ok button label
#. txt_ok
@@ -24,7 +28,7 @@
#. reboot button label
#. txt_reboot
msgid "Reboot"
-msgstr "リブート"
+msgstr "再起動"
#. continue button label
#. txt_continue
@@ -37,11 +41,11 @@
#. txt_safe_linux
msgid "Linux--Safe Settings"
-msgstr "Linux--セーフ設定"
+msgstr "Linux--セーフモード"
#. txt_boot_harddisk
msgid "Boot from Hard Disk"
-msgstr "ハードディスクからのブート"
+msgstr "ハードディスクからの起動"
#. txt_rescue
msgid "Rescue System"
@@ -53,20 +57,20 @@
#. txt_bootoptions
msgid "Boot Options"
-msgstr "ブートオプション"
+msgstr "起動オプション"
#. window title for exit dialog
#. txt_exit_title (see txt_exit_dialog)
msgid "Exiting..."
-msgstr "終了中..."
+msgstr "終了しています..."
#. txt_exit_dialog
msgid ""
"You are leaving the graphical boot menu and\n"
"starting the text mode interface."
msgstr ""
-"グラフィカルブートメニューを終了し、\n"
-"テキストモードインタフェースを起動します。"
+"グラフィカルな起動メニューを終了し、\n"
+"テキストモードのインターフェイスを起動します。"
#. txt_help
msgid "Help"
@@ -75,7 +79,7 @@
#. window title for kernel loading (see txt_load_kernel)
#. txt_load_kernel_title
msgid "Starting..."
-msgstr "起動中..."
+msgstr "起動しています..."
#. Keep the three newlines!
#. txt_load_kernel
@@ -112,12 +116,12 @@
#. boot disk change dialog title
#. txt_change_disk_title
msgid "Change Boot Disk"
-msgstr "ブートディスクの変更"
+msgstr "起動ディスクの変更"
#. txt_insert_disk
#, c-format
msgid "Insert boot disk %u."
-msgstr "ブートディスク %u を挿入します。"
+msgstr "起動ディスク %u を挿入してください。"
#. txt_insert_disk2
#, c-format
@@ -125,8 +129,8 @@
"This is boot disk %u.\n"
"Insert boot disk %u."
msgstr ""
-"これはブートディスク %u です。\n"
-"ブートディスク %u を挿入します。"
+"これは起動ディスク %u です。\n"
+"起動ディスク %u を挿入してください。"
#. <product> is e.g. SuSE Linux X.Y or Enterprise Server Z
#. txt_insert_disk3
@@ -135,8 +139,8 @@
"This is not a <product> boot disk.\n"
"Insert boot disk %u."
msgstr ""
-"これは<product>ブートディスクではありません。\n"
-"ブートディスク %u を挿入します。"
+"これは<product>の起動ディスクではありません。\n"
+"起動ディスク %u を挿入してください。"
#. password dialog title
#. txt_password_title
@@ -145,7 +149,7 @@
#. txt_dud_ready
msgid "Get your driver update floppy ready."
-msgstr "ドライバアップデートフロッピーを用意してください。"
+msgstr "ドライバアップデートのフロッピィをご用意ください。"
#. power off dialog title
#. txt_power_off_title
@@ -164,11 +168,11 @@
#. dialog title for hard disk installation
#. txt_harddisk_title
msgid "Hard Disk Installation"
-msgstr "ハードディスクのインストール"
+msgstr "ハードディスクインストール"
#. txt_hd_diskdevice
msgid "Disk Device (Scans All Disks If Empty)\n"
-msgstr "ディスクデバイス(空の場合はすべてのディスクをスキャンする)\n"
+msgstr "ディスクデバイス(何も指定しない場合はすべてのディスクをスキャン)\n"
#. txt_directory
msgid "Directory\n"
@@ -190,7 +194,7 @@
#. label for ftp user input
#. txt_user1
msgid "User (Anonymous Login If Empty)\n"
-msgstr "ユーザ(空の場合は匿名ログインを行う)\n"
+msgstr "ユーザ(何も指定しない場合は匿名ログイン)\n"
#. dialog title for nfs installation
#. txt_nfs_title
@@ -200,7 +204,7 @@
#. label for smb user input
#. txt_user2
msgid "User (Uses \"guest\" If Empty)\n"
-msgstr "ユーザ(空の場合は「guest」を使用する)\n"
+msgstr "ユーザ(何も指定しない場合は \"guest\" を使用)\n"
#. dialog title for smb installation
#. txt_smb_title
@@ -295,8 +299,7 @@
"by commas ',') here:\n"
msgstr ""
"ドライバアップデートをCD-ROMから直接読み込むには、\n"
-"ドライバアップデートのファイル名(カンマ「,」\n"
-"で区切られている)を入力してください:\n"
+"ドライバアップデートのファイル名(カンマ ',' 区切り)を入力してください:\n"
#. install source menu title
#. ** please keep it really short (comparable to the english text) **
@@ -321,7 +324,7 @@
#. ** please keep it really short (comparable to the english text) **
#. txt_arch
msgid "Arch"
-msgstr "アーチ"
+msgstr "システム"
#. menu label for selecting some (linux) kernel variant
#. ** please keep it really short (comparable to the english text) **
@@ -332,35 +335,35 @@
#. menu item for kernel variant (cf. txt_kernel)
#. txt_kernel_default
msgid "Default"
-msgstr "デフォルト"
+msgstr "既定値"
#. menu item for kernel variant (cf. txt_kernel)
#. -> like in txt_safe_linux
#. txt_kernel_safe
msgid "Safe Settings"
-msgstr "セーフ設定"
+msgstr "セーフモード"
#. menu item for kernel variant (cf. txt_kernel)
#. -> similar to txt_noacpi_install
#. txt_kernel_noacpi
msgid "No ACPI"
-msgstr "ACPIなし"
+msgstr "ACPI無し"
#. menu item for kernel variant (cf. txt_kernel)
#. -> similar to txt_nolapic_install
#. txt_kernel_nolapic
msgid "No Local APIC"
-msgstr "ローカルAPICなし"
+msgstr "ローカルAPIC無し"
#. main menu: start in system repair mode
#. txt_repain_system
msgid "Repair Installed System"
-msgstr "インストールしたシステムの修復"
+msgstr "インストール済みシステムの修復"
#. menu item
#. txt_mediacheck
msgid "Check Installation Media"
-msgstr "インストールメディアの確認"
+msgstr "インストールメディアの検証"
#. menu item for keyboard layout (please keep it short)
#. txt_keyboard
@@ -390,7 +393,7 @@
#. menu item
#. txt_no_network
msgid "No Network"
-msgstr "ネットワークなし"
+msgstr "ネットワーク無し"
#. short menu item for manual network config (NOT some kind of manual)
#. txt_manual_network
@@ -418,8 +421,8 @@
"Netmask\n"
"(or use '/N' notation with Host IP)\n"
msgstr ""
-"ネットマスク\n"
-"(またはホストIPで「/N」表記を使用する)\n"
+"サブネットマスク\n"
+"(IPアドレスの指定で '/N' 表記を使用してもかまいません)\n"
#. label for Live CD installation
#. txt_live_kde
@@ -439,7 +442,7 @@
#. label for name server (network setup)
#. txt_nameservers
msgid "Name servers, separated by spaces\n"
-msgstr "スペースで区切られたネームサーバ\n"
+msgstr "ネームサーバ (スペース区切り)\n"
#. label for ip address (network setup)
#. txt_host_ip
@@ -453,12 +456,12 @@
#. menu item to signify no KMS (KMS = kernel mode setting - keep the english acronym)
#. txt_video_no_kms
msgid "No KMS"
-msgstr "KMSなし"
+msgstr "KMS無し"
#. menu item for booting an installed Linux system
#. txt_systemboot
msgid "Boot Linux System"
-msgstr "Linuxシステムのブート"
+msgstr "Linuxシステムの起動"
#. menu item selecting a submenu with more entries
#. txt_expert
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/po/sk.po new/themes/openSUSE/po/sk.po
--- old/themes/openSUSE/po/sk.po 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/po/sk.po 2018-01-26 05:03:07.000000000 +0100
@@ -9,14 +9,16 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-10-07 21:13+0100\n"
-"Last-Translator: Rastislav Krupanský \n"
-"Language-Team: Slovak \n"
+"PO-Revision-Date: 2018-01-25 07:53+0000\n"
+"Last-Translator: Ferdinand Galko \n"
+"Language-Team: Slovak https://l10n.opensuse.org/projects/gfxboot/master/sk/"
+"\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 & n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 2.18\n"
"X-Poedit-Language: Slovak\n"
"X-Poedit-Country: SLOVAKIA\n"
@@ -442,12 +444,12 @@
#. menu label for an update (as opposed to a new installation)
#. txt_upgrade
msgid "Upgrade"
-msgstr ""
+msgstr "Zvýšiť verziu"
#. label for name server (network setup)
#. txt_nameservers
msgid "Name servers, separated by spaces\n"
-msgstr ""
+msgstr "Názvové servery, oddelené medzerami\n"
#. label for ip address (network setup)
#. txt_host_ip
@@ -455,18 +457,20 @@
"IP address with network prefix\n"
"(Examples: 192.168.5.77/24 2001:db8:75:fff::3/64)\n"
msgstr ""
+"IP adresa s predponou siete\n"
+"(Príklady: 192.168.5.77/24 2001:db8:75:fff::3/64)\n"
#. menu item to signify no KMS (KMS = kernel mode setting - keep the english acronym)
#. txt_video_no_kms
msgid "No KMS"
-msgstr ""
+msgstr "Žiadne KMS"
#. menu item for booting an installed Linux system
#. txt_systemboot
msgid "Boot Linux System"
-msgstr ""
+msgstr "Spustiť systém Linux"
#. menu item selecting a submenu with more entries
#. txt_expert
msgid "More ..."
-msgstr ""
+msgstr "Viac..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/common.inc new/themes/openSUSE/src/common.inc
--- old/themes/openSUSE/src/common.inc 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/src/common.inc 2018-01-26 05:03:07.000000000 +0100
@@ -1762,6 +1762,10 @@
/menu.start.x
/menu.start.y "mainmenu.pos" 253 170 gfxconfig.set.int2
/menu.max.entries "mainmenu.entries" 8 gfxconfig.set.int
+/menu.title "mainmenu.title" "" gfxconfig.set.str
+/menu.title.color "mainmenu.title.color" white gfxconfig.set.int
+/menu.title.pos.x
+/menu.title.pos.y "mainmenu.title.pos" -1 40 gfxconfig.set.int2
/boot.pos.x
/boot.pos.y "bootopt.pos" 263 480 gfxconfig.set.int2
/panel.normal.fg "panel.normal.fg" white gfxconfig.set.int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/gfxboot.cfg new/themes/openSUSE/src/gfxboot.cfg
--- old/themes/openSUSE/src/gfxboot.cfg 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/src/gfxboot.cfg 2018-01-26 05:03:07.000000000 +0100
@@ -44,6 +44,11 @@
mainmenu.bar.color=0xffffff
mainmenu.normal.fg=0xffffff
mainmenu.selected.fg=0x000000
+; main menu title
+mainmenu.title=
+mainmenu.title.color=0xffffff
+; if x = -1, center horizontally
+mainmenu.title.pos=-1,40
; boot option colors
bootopt.label.fg=0xffffff
bootopt.text.fg=0xffffff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/menu.inc new/themes/openSUSE/src/menu.inc
--- old/themes/openSUSE/src/menu.inc 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/src/menu.inc 2018-01-26 05:03:07.000000000 +0100
@@ -212,6 +212,19 @@
% ( ) == > ( )
%
/main.drawmenu {
+ % center menu title if x == -1
+ /menu.title.pos.x_aligned
+ menu.title.pos.x -1 eq {
+ clip.size pop menu.title strsize pop sub 2 div 0 max
+ } {
+ menu.title.pos.x
+ } ifelse
+ def
+
+ menu.title.pos.x_aligned menu.title.pos.y moveto
+ menu.title.color setcolor
+ menu.title show
+
menu.text.normal setcolor
/menu.bar.width.old menu.bar.width def
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/serial.inc new/themes/openSUSE/src/serial.inc
--- old/themes/openSUSE/src/serial.inc 2017-10-05 16:43:02.000000000 +0200
+++ new/themes/openSUSE/src/serial.inc 2018-01-26 05:03:07.000000000 +0100
@@ -202,7 +202,8 @@
smenu.main .xm_current menu.entry put
smenu.main .xm_title "Main Menu" put
smenu.main .xm_text "Select a boot entry." put
- smenu.main .xm_list [ menu.texts { menuitemmap } forall ] put
+ % careful: menuitemmap returns a static buffer
+ smenu.main .xm_list [ menu.texts { menuitemmap strdup } forall ] put
} if
/smenu smenu.main def
++++++ upstream.tar.xz ++++++