Dear maintainer of zhcon, On Thursday, December 10, 2009 I sent you a notice announcing my intent to upload a NMU of your package to fix its pending l10n issues, after an initial notice sent on Saturday, December 05, 2009.
You either agreed for this NMU or did not respond to my notices. I will now upload this NMU to DELAYED/7-DAY. The NMU patch is attached to this mail. The NMU changelog is: Source: zhcon Version: 1:0.2.6-6.1 Distribution: unstable Urgency: low Maintainer: Christian Perrier <[email protected]> Date: Fri, 25 Dec 2009 08:55:54 +0100 Closes: 513666 560785 561491 Changes: zhcon (1:0.2.6-6.1) unstable; urgency=low . * Non-maintainer upload. * Fix FTBFS ("'IF_MASK' undeclared"). Thanks to Elías Alejandro for the patch. Closes: #561491 * Drop debian/conffiles that only lists files in /etc, that are automatically added to conffiles by dh_installdeb * Add real copyright mention to debian/copyright (taken from the output of "licensecheck") * Explicit reference tp GPL-2 test in debian.copyright * Add ${misc:Depends} to binary package dependencies and drop "debconf" (that will be added automatically) * Bump debhelper compatibility level to 7 * Replace "dh_clean -k" by dh_prep * No longer ignore errors from make in debian/rules * Use method recommended in autotools-dev to provide up-to-date config.{sub|guess} files. Consequently, build depend on autotools-dev * Fix pending l10n issues. Debconf translations: - Vietnamese (Clytie Siddall). Closes: #513666 - Simplified Chinese (Ji ZhengYu). Closes: #560785 --
diff -Nru zhcon-0.2.6.old/debian/changelog zhcon-0.2.6/debian/changelog
--- zhcon-0.2.6.old/debian/changelog 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/changelog 2009-12-25 10:21:33.000000000 +0100
@@ -1,3 +1,27 @@
+zhcon (1:0.2.6-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS ("'IF_MASK' undeclared"). Thanks to Elías Alejandro
+ for the patch. Closes: #561491
+ * Drop debian/conffiles that only lists files in /etc, that
+ are automatically added to conffiles by dh_installdeb
+ * Add real copyright mention to debian/copyright
+ (taken from the output of "licensecheck")
+ * Explicit reference tp GPL-2 test in debian.copyright
+ * Add ${misc:Depends} to binary package dependencies
+ and drop "debconf" (that will be added automatically)
+ * Bump debhelper compatibility level to 7
+ * Replace "dh_clean -k" by dh_prep
+ * No longer ignore errors from make in debian/rules
+ * Use method recommended in autotools-dev to provide
+ up-to-date config.{sub|guess} files. Consequently,
+ build depend on autotools-dev
+ * Fix pending l10n issues. Debconf translations:
+ - Vietnamese (Clytie Siddall). Closes: #513666
+ - Simplified Chinese (Ji ZhengYu). Closes: #560785
+
+ -- Christian Perrier <[email protected]> Fri, 25 Dec 2009 08:55:54 +0100
+
zhcon (1:0.2.6-6) unstable; urgency=low
* Fix input method crash on amd64. (Closes:Bug#501912)
diff -Nru zhcon-0.2.6.old/debian/compat zhcon-0.2.6/debian/compat
--- zhcon-0.2.6.old/debian/compat 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/compat 2009-12-25 10:14:01.000000000 +0100
@@ -1 +1 @@
-4
+7
diff -Nru zhcon-0.2.6.old/debian/conffiles zhcon-0.2.6/debian/conffiles
--- zhcon-0.2.6.old/debian/conffiles 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/conffiles 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/etc/zhcon.conf
diff -Nru zhcon-0.2.6.old/debian/control zhcon-0.2.6/debian/control
--- zhcon-0.2.6.old/debian/control 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/control 2009-12-25 10:20:50.000000000 +0100
@@ -2,12 +2,12 @@
Section: utils
Priority: optional
Maintainer: Yu Guanghui <[email protected]>
-Build-Depends: debhelper (>= 4.1.16), libggi2-dev (>= 1:2.2.1-4), unicon-imc2, libncurses5-dev
+Build-Depends: debhelper (>= 7), libggi2-dev (>= 1:2.2.1-4), unicon-imc2, libncurses5-dev, autotools-dev
Standards-Version: 3.7.2
Package: zhcon
Architecture: any
-Depends: ${shlibs:Depends}, debconf
+Depends: ${shlibs:Depends},${misc:Depends}
Conflicts: unicon-im (<< 3.0.4-9)
Description: A Fast Console CJK System Using FrameBuffer
Zhcon is a fast Linux Console Chinese System which supports framebuffer
diff -Nru zhcon-0.2.6.old/debian/copyright zhcon-0.2.6/debian/copyright
--- zhcon-0.2.6.old/debian/copyright 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/copyright 2009-12-25 10:10:00.000000000 +0100
@@ -8,9 +8,9 @@
ejoy <[email protected]>
Hu Yong <[email protected]>
-Copyright:
+Copyright: © 2001-2002 by ejoy, huyong, rick
- This program is under GPL license.
+ This program is under the GPL license.
On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru zhcon-0.2.6.old/debian/patch/561491.patch zhcon-0.2.6/debian/patch/561491.patch
--- zhcon-0.2.6.old/debian/patch/561491.patch 1970-01-01 01:00:00.000000000 +0100
+++ zhcon-0.2.6/debian/patch/561491.patch 2009-12-25 08:54:32.000000000 +0100
@@ -0,0 +1,18 @@
+Index: zhcon-0.2.6/src/display/lrmi.c
+===================================================================
+--- zhcon-0.2.6.orig/src/display/lrmi.c 2009-12-24 22:05:43.000000000 -0500
++++ zhcon-0.2.6/src/display/lrmi.c 2009-12-24 22:06:35.000000000 -0500
+@@ -33,6 +33,13 @@
+
+ #include "lrmi.h"
+
++#if defined(__linux__) && !defined(TF_MASK)
++ #define TF_MASK X86_EFLAGS_TF
++ #define IF_MASK X86_EFLAGS_IF
++ #define VIF_MASK X86_EFLAGS_VIF
++ #define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ #define REAL_MEM_BASE ((void *)0x10000)
+ #define REAL_MEM_SIZE 0x10000
+ #define REAL_MEM_BLOCKS 0x100
diff -Nru zhcon-0.2.6.old/debian/po/vi.po zhcon-0.2.6/debian/po/vi.po
--- zhcon-0.2.6.old/debian/po/vi.po 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/po/vi.po 2009-12-05 08:04:40.000000000 +0100
@@ -1,26 +1,26 @@
-# Vietnamese translation for zhcon.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <[email protected]>, 2005.
+# Vietnamese translation for Zhcon.
+# Copyright © 2009 Free Software Foundation, Inc.
+# Clytie Siddall <[email protected]>, 2005-2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: zhcon 1/0.2.3-8.1\n"
+"Project-Id-Version: zhcon 1:0.2.6-5.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2008-10-12 09:11+0200\n"
-"PO-Revision-Date: 2005-08-21 22:00+0930\n"
+"PO-Revision-Date: 2009-01-31 17:10+1030\n"
"Last-Translator: Clytie Siddall <[email protected]>\n"
-"Language-Team: Vietnamese <[email protected]>\n"
+"Language-Team: Vietnamese <[email protected]>\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"
-"X-Generator: LocFactoryEditor 1.2.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
#. Type: note
#. Description
#: ../templates:1001
msgid "You MUST rebuild kernel with framebuffer support."
-msgstr "Bạn • phải • xây dụng lại hạt nhân với sự hỗ trợ bộ đệm khung."
+msgstr "Bạn phải xây dựng lại hạt nhân với hỗ trợ vùng đệm khung."
#. Type: note
#. Description
@@ -29,5 +29,6 @@
"Please read README.Debian and README. zhcon need a kernel supporting "
"framebuffer, you have to build it by yourself."
msgstr ""
-"Bạn hãy đọc hai tập tin Đọc Đi <README.Debian> và <README>. Trình zhcon cần "
-"một bộ đệm khung có hỗ trợ hạt nhăn: bạn cần phải tự xăy dụng nó."
+"Hãy đọc hai tài liệu đọc Đi README.Debian và README. Phần mềm zhcon yêu cầu "
+"một hạt nhân mà hỗ trợ vùng đệm khung (framebuffer). Vì thế bạn cần phải tự "
+"xây dựng hạt nhân đó."
diff -Nru zhcon-0.2.6.old/debian/po/zh_CN.po zhcon-0.2.6/debian/po/zh_CN.po
--- zhcon-0.2.6.old/debian/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100
+++ zhcon-0.2.6/debian/po/zh_CN.po 2009-12-12 14:28:48.000000000 +0100
@@ -0,0 +1,33 @@
+# Chinese translations for zhcon package
+# zhcon 软件包的简体中文翻译.
+# Copyright (C) 2009 THE zhcon'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the zhcon package.
+# Ji ZhengYu <[email protected]>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon HEAD\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2008-10-12 09:11+0200\n"
+"PO-Revision-Date: 2009-12-12 16:36+0800\n"
+"Last-Translator: Ji ZhengYu <[email protected]>\n"
+"Language-Team: Chinese (simplified) <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "You MUST rebuild kernel with framebuffer support."
+msgstr "您必须重新编译一个带 framebuffer 支持的内核。"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"Please read README.Debian and README. zhcon need a kernel supporting "
+"framebuffer, you have to build it by yourself."
+msgstr ""
+"请查看README.Debian 及README。zhcon 需要一个支持framebuffer 的内核，您必须自"
+"己手工编译它。"
diff -Nru zhcon-0.2.6.old/debian/rules zhcon-0.2.6/debian/rules
--- zhcon-0.2.6.old/debian/rules 2009-11-29 19:28:58.000000000 +0100
+++ zhcon-0.2.6/debian/rules 2009-12-25 10:20:37.000000000 +0100
@@ -8,7 +8,10 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- # Add here commands to configure the package.
+ ln -sf /usr/share/misc/config.sub .
+ ln -sf /usr/share/misc/config.guess .
+
+ # Add here commands to configure the package.
./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc
touch configure-stamp
@@ -29,14 +32,14 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
-
+ [ ! -f Makefile ] || $(MAKE) distclean
+ find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/zhcon.
signature.asc
Description: Digital signature
