Bug#564920: arcboot: diff for NMU version 0.3.12+nmu1

[aurel32]

Package: arcboot
Version: 0.3.12
Severity: normal
Tags: patch

Hi,

The following is the diff for my arcboot 0.3.12+nmu1 NMU.

diff -Nru arcboot-0.3.12/arclib/string.c arcboot-0.3.12+nmu1/arclib/string.c
--- arcboot-0.3.12/arclib/string.c      2004-11-29 11:39:38.000000000 +0100
+++ arcboot-0.3.12+nmu1/arclib/string.c 2010-01-12 10:14:18.000000000 +0100
@@ -124,3 +124,36 @@
 {
        memset(p, 0, len);
 }
+
+char *strcat(char *dest, const char *src)
+{
+       char *tmp = dest;
+
+       while (*dest)
+               dest++;
+       while ((*dest++ = *src++) != '\0')
+               ;
+       return tmp;
+}
+
+void *memmove(void *dest, const void *src, size_t count)
+{
+       char *tmp;
+       const char *s;
+
+       if (dest <= src) {
+               tmp = dest;
+               s = src;
+               while (count--)
+                       *tmp++ = *s++;
+       } else {
+               tmp = dest;
+               tmp += count;
+               s = src;
+               s += count;
+               while (count--)
+                       *--tmp = *--s;
+       }
+       return dest;
+}
+
diff -Nru arcboot-0.3.12/debian/changelog arcboot-0.3.12+nmu1/debian/changelog
--- arcboot-0.3.12/debian/changelog     2008-11-23 14:26:18.000000000 +0100
+++ arcboot-0.3.12+nmu1/debian/changelog        2010-01-12 10:14:44.000000000 
+0100
@@ -1,3 +1,19 @@
+arcboot (0.3.12+nmu1) unstable; urgency=low
+  
+  * Non-maintainer upload with maintainer approval.
+  
+  [ Aurelien Jarno ]
+  * Add strcat() and memmove() to arclib/string.c, taken from kernel
+    sources.  (Closes: #564237)
+
+  [ Christian Perrier ]
+  * Fix pending l10n issues. Debconf translations:
+  * Vietnamese (Clytie Siddall).  (Closes: #509712)
+  * Brazilian Portuguese (Eder L. Marques (frolic)).  (Closes: #511883)
+  * Simplified Chinese (Ji ZhengYu).  (Closes: #562063)
+
+ -- Aurelien Jarno <aure...@debian.org>  Tue, 12 Jan 2010 09:14:33 +0000
+
 arcboot (0.3.12) unstable; urgency=low
 
   * [1b7d979] Update cs translation (Closes: #499590) - thanks to Miroslav
diff -Nru arcboot-0.3.12/debian/po/ja.po arcboot-0.3.12+nmu1/debian/po/ja.po
--- arcboot-0.3.12/debian/po/ja.po      2008-02-16 14:51:15.000000000 +0100
+++ arcboot-0.3.12+nmu1/debian/po/ja.po 2010-01-12 10:14:18.000000000 +0100
@@ -1,44 +1,43 @@
-#
+# 
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
 #    this format, e.g. by running:
 #         info -n '(gettext)PO Files'
 #         info -n '(gettext)Header Entry'
-#
+# 
 #    Some information specific to po-debconf are available at
 #            /usr/share/doc/po-debconf/README-trans
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
+# 
 #    Developers do not need to manually edit POT or PO files.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: arcboot 0.3.9.1\n"
-"Report-Msgid-Bugs-To: arcb...@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-24 14:06+0000\n"
-"PO-Revision-Date: 2008-01-30 21:26+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henr...@debian.or.jp>\n"
-"Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid "Location of arcboot:"
-msgstr "arcboot の位置:"
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid ""
-"Arcboot must be put into the volume header of a disk with a SGI disklabel. "
-"Usually the volume header of /dev/sda is used. Please give the device name "
-"of the disk you want to put arcboot onto."
-msgstr ""
-"arcboot は SGI 
ディスクラベルを持つディスクのボリュームヘッダに書き込まねば"
-"なりません。通常、/dev/sda 
のボリュームヘッダが使用されます。arcboot を配置"
-"したいデバイス名を入力してください。"
-
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: arcboot 0.3.9.1\n"
+"Report-Msgid-Bugs-To: arcb...@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-24 14:06+0000\n"
+"PO-Revision-Date: 2008-01-30 21:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henr...@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Location of arcboot:"
+msgstr "arcboot の位置:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Arcboot must be put into the volume header of a disk with a SGI disklabel. "
+"Usually the volume header of /dev/sda is used. Please give the device name "
+"of the disk you want to put arcboot onto."
+msgstr ""
+"arcboot は SGI 
ディスクラベルを持つディスクのボリュームヘッダに書き込まねばな"
+"りません。通常、/dev/sda 
のボリュームヘッダが使用されます。arcboot を配置した"
+"いデバイス名を入力してください。"
diff -Nru arcboot-0.3.12/debian/po/pt_BR.po 
arcboot-0.3.12+nmu1/debian/po/pt_BR.po
--- arcboot-0.3.12/debian/po/pt_BR.po   2008-02-16 14:48:22.000000000 +0100
+++ arcboot-0.3.12+nmu1/debian/po/pt_BR.po      2010-01-12 10:14:18.000000000 
+0100
@@ -1,34 +1,27 @@
+# arcboot Brazilian Portuguese translation
+# Copyright (C) 2008 arcboot's PACKAGE COPYRIGHT HOLDER
+# This file is distributed under the same license as the arcboot package.
+# Eder L. Marques (frolic) <fro...@debian-ce.org>, 2008.
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: arcboot_0.3.7\n"
+"Project-Id-Version: arcboot\n"
 "Report-Msgid-Bugs-To: arcb...@packages.debian.org\n"
 "POT-Creation-Date: 2008-01-24 14:06+0000\n"
-"PO-Revision-Date: 2004-01-17 21:15-0300\n"
-"Last-Translator: André Luís Lopes <andre...@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portugu...@lists.debian.org>\n"
+"PO-Revision-Date: 2008-09-19 14:11-0300\n"
+"Last-Translator: Eder L. Marques (frolic) <fro...@debian-ce.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portugu...@lists.debian."
+"org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
 
 #. Type: string
 #. Description
 #: ../templates:1001
 msgid "Location of arcboot:"
-msgstr ""
+msgstr "Localização do arcboot:"
 
 #. Type: string
 #. Description
@@ -38,10 +31,7 @@
 "Usually the volume header of /dev/sda is used. Please give the device name "
 "of the disk you want to put arcboot onto."
 msgstr ""
-"O arcboor deve ser colocado dentro de um cabeçalho de volume de um disco "
-"com um disklabel SGI. Normalmente o cabeçalho de volume de /dev/sda é "
-"usado. Por favor, informe o nome do dispositivo do disco onde você deseja "
-"colocar o arcboot."
-
-#~ msgid "Where to put arcboot?"
-#~ msgstr "Onde colocar o arcboot ?"
+"O arcboot deve ser colocado dentro de um cabeçalho de volume de um disco com 
"
+"um disklabel SGI. Normalmente o cabeçalho de volume de /dev/sda é usado. 
Por "
+"favor, forneça o nome do dispositivo do disco onde você deseja colocar o "
+"arcboot."
diff -Nru arcboot-0.3.12/debian/po/vi.po arcboot-0.3.12+nmu1/debian/po/vi.po
--- arcboot-0.3.12/debian/po/vi.po      2008-02-16 14:48:22.000000000 +0100
+++ arcboot-0.3.12+nmu1/debian/po/vi.po 2010-01-12 10:14:18.000000000 +0100
@@ -1,25 +1,26 @@
 # Vietnamese translation for arcboot.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <cly...@riverland.net.au>, 2005.
+# Copyright © 2008 Free Software Foundation, Inc.
+# Clytie Siddall <cly...@riverland.net.au>, 2005-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: arcboot 0.3.8.6\n"
+"Project-Id-Version: arcboot 0.3.11+nmu1\n"
 "Report-Msgid-Bugs-To: arcb...@packages.debian.org\n"
 "POT-Creation-Date: 2008-01-24 14:06+0000\n"
-"PO-Revision-Date: 2005-06-12 11:33+0930\n"
+"PO-Revision-Date: 2008-12-25 16:49+1030\n"
 "Last-Translator: Clytie Siddall <cly...@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-l...@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi...@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #. Type: string
 #. Description
 #: ../templates:1001
 msgid "Location of arcboot:"
-msgstr ""
+msgstr "Vị trí của arcboot"
 
 #. Type: string
 #. Description
@@ -29,9 +30,6 @@
 "Usually the volume header of /dev/sda is used. Please give the device name "
 "of the disk you want to put arcboot onto."
 msgstr ""
-"Phải để trình arcboot vào phần đầu khối tin của một đĩa 
có nhãn đĩa SGI. "
-"Thường dùng phần đầu khối tin của «/dev/sda». Hãy nhập tên 
thiết bị của đĩa "
-"nơi bạn muốn để trình arcboot."
-
-#~ msgid "Where to put arcboot?"
-#~ msgstr "Bạn có muốn để trình arcboot vào chỗ nào?"
+"Phần mềm arcboot phải nằm trong phần đầu khối tin của một 
đĩa có nhãn đĩa "
+"SGI. Bình thường dùng phần đầu khối tin của « /dev/sda ». 
Hãy gõ tên thiết bị "
+"của đĩa trên đó bạn muốn để arcboot."
diff -Nru arcboot-0.3.12/debian/po/zh_CN.po 
arcboot-0.3.12+nmu1/debian/po/zh_CN.po
--- arcboot-0.3.12/debian/po/zh_CN.po   1970-01-01 01:00:00.000000000 +0100
+++ arcboot-0.3.12+nmu1/debian/po/zh_CN.po      2010-01-12 10:14:18.000000000 
+0100
@@ -0,0 +1,34 @@
+# Chinese translations for arcboot package
+# arcboot 软件包的简体中文翻译.
+# Copyright (C) 2009 THE arcboot'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the arcboot package.
+# Ji ZhengYu <zhengy...@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: arcboot VERSION\n"
+"Report-Msgid-Bugs-To: arcb...@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-24 14:06+0000\n"
+"PO-Revision-Date: 2009-12-22 19:07+0800\n"
+"Last-Translator: Ji ZhengYu <zhengy...@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n...@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Location of arcboot:"
+msgstr "arcboot 的位置："
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Arcboot must be put into the volume header of a disk with a SGI disklabel. "
+"Usually the volume header of /dev/sda is used. Please give the device name "
+"of the disk you want to put arcboot onto."
+msgstr ""
+"Arcboot 必须置于带SGI 标识的磁盘卷头部。通常使用/dev/sda 
作为卷头部。请您指定"
+"arcboot 所存放的磁盘设备名。"



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org