tags 575617 + patch
tags 575617 + pending
thanks

Dear maintainer,

I've prepared an NMU for debian-zh-faq (versioned as 1.11+nmu1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru debian-zh-faq-1.11/debian/README.Debian.in 
debian-zh-faq-1.11+nmu1/debian/README.Debian.in
--- debian-zh-faq-1.11/debian/README.Debian.in  2001-02-25 16:27:19.000000000 
-0800
+++ debian-zh-faq-1.11+nmu1/debian/README.Debian.in     2010-05-08 
12:10:08.000000000 -0700
@@ -4,16 +4,18 @@
 
    Õâ¸ö[CN:Èí¼þ°ü:][TW:Ì×¼þ:]Àï¡¶Debian Chinese FAQ¡·ÊÇÎÒÃÇÔÚ Debian 
ÏÂʹÓÃÖÐÎĵÄһЩ¾­Ñ飬
 Ï£ÍûËüÄܹ»ÈÃÄú¸üÈÝÒ×µÄÔÚ Debian [CN:²Ù×÷:][TW:×÷Òµ:]ϵͳϽøÐÐÖÐÎÄ´¦Àí¡£
-   
-   This packages contains the book Debian_Chinese_FAQ, and it answers some
-frequently asked question about Chinese environment setup.  It also
-introduces the special Chinese software in Debian.  Hope it can make you
-easy to use Chinese in Debian Operating System.
+
+These packages contain the book Debian_Chinese_FAQ, and it answers
+some frequently asked question about Chinese environment setup. It
+also introduces the special Chinese software in Debian. Hope it can
+help you to use the Debian Operating System.
 
   Õâ¸öÈí¼þ°üÊÇ»ùÓÚ»ô¶«Áé <[email protected]> µÄ debian-guide-zh 
[CN:Èí¼þ°ü:][TW:Ì×¼þ:]Ð޸ĶøÀ´£¬
 Ôڴ˱íʾ¸Ðл¡£
 
-  This packages is base on Anthony Fok <[email protected]>'s debian-guide-zh,
+These packages are based on Anthony Fok <[email protected]>'s debian-guide-zh,
 Thanks to you, Anthony!
 
   --ÓÚ¹ã»Ô Yu Guanghui <[email protected]>, Tue, 20 Feb 2001 17:53:33 +800.
+
+ -- Jari Aalto <[email protected]>, Sat,  8 May 2010 22:10:08 +0300
diff -Nru debian-zh-faq-1.11/debian/changelog 
debian-zh-faq-1.11+nmu1/debian/changelog
--- debian-zh-faq-1.11/debian/changelog 2007-08-06 22:59:28.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/changelog    2010-05-08 12:13:12.000000000 
-0700
@@ -1,15 +1,49 @@
+debian-zh-faq (1.11+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/changelog
+    - Remove obsolete Emacs local variables.
+    - Move to packaging format "3.0 (native)".
+  * debian/chnagelog
+    - Delete EOL whitespaces.
+  * debian/compat
+    - New file.
+  * debian/control
+    - (Build-Depends): update obsolete gs to ghostscript.
+      (important; Closes: #575617).
+      Update to debhelper 7.1.
+    - (Description): Fix spelling.
+    - (Depends): Add ${misc:Depends}.
+    - (Homepage): Update to Freshmeat.
+    - (Maintainer): Set to QA Group.
+    - (Standards-Version): Update to 3.8.4.
+  * debian/copyright
+    - Update layout. Point to GPL-2.
+  * debian/in.doc-base
+    - (Files): Correct file locations (E: Lintian).
+  * debian/README.Debian.in
+    - Fix spelling.
+  * debian/rules
+    - (DH_COMPAT): Remove; obsolete.
+    - (install_subpkgs): Update dh_clean to dh_prep.
+    - (clean): Fix lintian debian-rules-ignores-make-clean-error.
+  * debian/source/format
+    - New file.
+
+ -- Jari Aalto <[email protected]>  Sat, 08 May 2010 22:13:12 +0300
+
 debian-zh-faq (1.11) unstable; urgency=low
 
   * Changed font 'ming' to 'bsmi', 'song' to 'gbsn'. (Closes:Bug#393734)
-  * Replaced cjk-latex with latex-cjk-chinese in build-deps. 
+  * Replaced cjk-latex with latex-cjk-chinese in build-deps.
   * Added dvipdfmx to build-deps.
 
  -- Yu Guanghui <[email protected]>  Tue,  5 Dec 2006 14:57:51 +0800
 
 debian-zh-faq (1.10) unstable; urgency=low
 
-  * Fix lost changelog. Thanks Russ Allbery's patch 
-       (closes:Bug#262434) 
+  * Fix lost changelog. Thanks Russ Allbery's patch
+        (closes:Bug#262434)
 
  -- Yu Guanghui <[email protected]>  Sat,  7 Aug 2004 23:01:28 +0800
 
@@ -29,7 +63,7 @@
 
 debian-zh-faq (1.7) unstable; urgency=low
 
-  * Add English translation. 
+  * Add English translation.
 
  -- Yu Guanghui <[email protected]>  Thu, 15 Aug 2002 14:06:08 +0800
 
@@ -41,31 +75,31 @@
 
 debian-zh-faq (1.5) unstable; urgency=low
 
-  * New upstream release 
+  * New upstream release
 
  -- Yu Guanghui <[email protected]>  Fri,  4 Jan 2002 20:48:40 +0800
 
 debian-zh-faq (1.4) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Yu Guanghui <[email protected]>  Sat, 20 Oct 2001 10:40:08 +0800
 
 debian-zh-faq (1.3) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Yu Guanghui <[email protected]>  Thu, 23 Aug 2001 19:52:32 +0800
 
 debian-zh-faq (1.2) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Yu Guanghui <[email protected]>  Fri,  6 Jul 2001 01:06:49 +0800
 
 debian-zh-faq (1.1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Yu Guanghui <[email protected]>  Mon, 26 Feb 2001 08:27:57 +0800
 
@@ -74,7 +108,3 @@
   * Initial Release.
 
  -- Yu Guanghui <[email protected]>  Tue, 20 Feb 2001 17:31:16 +0800
-
-Local variables:
-mode: debian-changelog
-End:
diff -Nru debian-zh-faq-1.11/debian/compat debian-zh-faq-1.11+nmu1/debian/compat
--- debian-zh-faq-1.11/debian/compat    1969-12-31 16:00:00.000000000 -0800
+++ debian-zh-faq-1.11+nmu1/debian/compat       2010-05-08 11:57:50.000000000 
-0700
@@ -0,0 +1 @@
+7
diff -Nru debian-zh-faq-1.11/debian/control 
debian-zh-faq-1.11+nmu1/debian/control
--- debian-zh-faq-1.11/debian/control   2007-08-06 22:55:06.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/control      2010-05-08 12:12:27.000000000 
-0700
@@ -1,28 +1,28 @@
 Source: debian-zh-faq
 Section: doc
-Build-Depends: debhelper (>= 2.0.72), latex-cjk-chinese, gs, slice, 
zh-autoconvert, latex-cjk-chinese-arphic-bsmi00lp, 
latex-cjk-chinese-arphic-bkai00mp, latex-cjk-chinese-arphic-gbsn00lp, 
latex-cjk-chinese-arphic-gkai00mp, dvipdfmx
+Build-Depends: debhelper (>= 7.1), latex-cjk-chinese, ghostscript, slice, 
zh-autoconvert, latex-cjk-chinese-arphic-bsmi00lp, 
latex-cjk-chinese-arphic-bkai00mp, latex-cjk-chinese-arphic-gbsn00lp, 
latex-cjk-chinese-arphic-gkai00mp, dvipdfmx
 Priority: optional
 Maintainer: Yu Guanghui <[email protected]>
-Standards-Version: 3.5.2
+Standards-Version: 3.8.4
 
 Package: debian-zh-faq-s
+Depends: ${misc:Depends}
 Architecture: all
 Description: Debian Chinese FAQ (Chinese GB)
- This packages contains the book Debian_Chinese_FAQ (Simplified Chinese
+ This package contains the book Debian_Chinese_FAQ (Simplified Chinese
  GB Version), and it answers some frequently asked question about Chinese
- environment setup.  It also introduce the special Chinese software
- in Debian.  Hope it can make you easy to use Chinese in the Debian
- Operating System.
+ environment setup. It also introduce the special Chinese software
+ in Debian. Hope it can help you to use the Debian Operating System.
  .
- You may find the installed items under /usr/doc/debian-zh-faq-s.
+ You can find the documentation in directory /usr/doc/debian-zh-faq-s.
 
 Package: debian-zh-faq-t
+Depends: ${misc:Depends}
 Architecture: all
 Description: Debian Chinese FAQ (Chinese Big5)
- This packages contains the book Debian_Chinese_FAQ (Traditional Chinese
+ This package contain the book Debian_Chinese_FAQ (Traditional Chinese
  Big5 Version), and it answers some frequently asked question about Chinese
- environment setup.  It also introduces the special Chinese software
- in Debian.  Hope it can make you easy to use Chinese in the Debian
- Operating System.
+ environment setup. It also introduces the special Chinese software
+ in Debian. Hope it can help you to use the Debian Operating System.
  .
- You may find the installed items under /usr/doc/debian-zh-faq-t.
+ You can find the documentation in directory /usr/doc/debian-zh-faq-t.
diff -Nru debian-zh-faq-1.11/debian/copyright.in 
debian-zh-faq-1.11+nmu1/debian/copyright.in
--- debian-zh-faq-1.11/debian/copyright.in      2001-02-25 16:27:19.000000000 
-0800
+++ debian-zh-faq-1.11+nmu1/debian/copyright.in 2010-05-08 12:03:32.000000000 
-0700
@@ -1,12 +1,17 @@
-This package was debianized by Yu Guanghui <[email protected]> on
-Tue, 20 Feb 2001 17:31:16 +0800.
+This package was debianized by:
 
-Upstream Author: Yu Guanghui <[email protected]>
+    Yu Guanghui <[email protected]>
+    on Tue, 20 Feb 2001 17:31:16 +0800.
+
+Upstream Author:
+
+    Copyright (C) 2001-2006 Yu Guanghui <[email protected]>
 
 Copyright:
-This book maybe copied under the terms of the GNU General Public Licence
-(see below).
+
+    This book maybe copied under the terms of the GNU General Public
+    Licence version 2, or any later version.
 
 On Debian systems, you can find the complete GNU GPL at
-/usr/share/common-licenses/GPL.
+"/usr/share/common-licenses/GPL-2".
 
diff -Nru debian-zh-faq-1.11/debian/debhelper.log 
debian-zh-faq-1.11+nmu1/debian/debhelper.log
--- debian-zh-faq-1.11/debian/debhelper.log     1969-12-31 16:00:00.000000000 
-0800
+++ debian-zh-faq-1.11+nmu1/debian/debhelper.log        2010-05-08 
10:58:33.000000000 -0700
@@ -0,0 +1,11 @@
+dh_installdirs
+dh_installdocs
+dh_installdocs
+dh_installchangelogs
+dh_link
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
diff -Nru debian-zh-faq-1.11/debian/debian-zh-faq-s.README.Debian 
debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-s.README.Debian
--- debian-zh-faq-1.11/debian/debian-zh-faq-s.README.Debian     2010-05-14 
22:19:44.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-s.README.Debian        
2010-05-14 22:27:48.000000000 -0700
@@ -4,16 +4,18 @@
 
    Õâ¸öÈí¼þ°üÀï¡¶Debian Chinese FAQ¡·ÊÇÎÒÃÇÔÚ Debian ÏÂʹÓÃÖÐÎĵÄһЩ¾­Ñ飬
 Ï£ÍûËüÄܹ»ÈÃÄú¸üÈÝÒ×µÄÔÚ Debian ²Ù×÷ϵͳϽøÐÐÖÐÎÄ´¦Àí¡£
-   
-   This packages contains the book Debian_Chinese_FAQ, and it answers some
-frequently asked question about Chinese environment setup.  It also
-introduces the special Chinese software in Debian.  Hope it can make you
-easy to use Chinese in Debian Operating System.
+
+These packages contain the book Debian_Chinese_FAQ, and it answers
+some frequently asked question about Chinese environment setup. It
+also introduces the special Chinese software in Debian. Hope it can
+help you to use the Debian Operating System.
 
   Õâ¸öÈí¼þ°üÊÇ»ùÓÚ»ô¶«Áé <[email protected]> µÄ debian-guide-zh Èí¼þ°üÐ޸ĶøÀ´£¬
 Ôڴ˱íʾ¸Ðл¡£
 
-  This packages is base on Anthony Fok <[email protected]>'s debian-guide-zh,
+These packages are based on Anthony Fok <[email protected]>'s debian-guide-zh,
 Thanks to you, Anthony!
 
   --ÓÚ¹ã»Ô Yu Guanghui <[email protected]>, Tue, 20 Feb 2001 17:53:33 +800.
+
+ -- Jari Aalto <[email protected]>, Sat,  8 May 2010 22:10:08 +0300
diff -Nru debian-zh-faq-1.11/debian/debian-zh-faq-s.copyright 
debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-s.copyright
--- debian-zh-faq-1.11/debian/debian-zh-faq-s.copyright 2010-05-14 
22:19:44.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-s.copyright    2010-05-14 
22:27:48.000000000 -0700
@@ -1,12 +1,17 @@
-This package was debianized by Yu Guanghui <[email protected]> on
-Tue, 20 Feb 2001 17:31:16 +0800.
+This package was debianized by:
 
-Upstream Author: Yu Guanghui <[email protected]>
+    Yu Guanghui <[email protected]>
+    on Tue, 20 Feb 2001 17:31:16 +0800.
+
+Upstream Author:
+
+    Copyright (C) 2001-2006 Yu Guanghui <[email protected]>
 
 Copyright:
-This book maybe copied under the terms of the GNU General Public Licence
-(see below).
+
+    This book maybe copied under the terms of the GNU General Public
+    Licence version 2, or any later version.
 
 On Debian systems, you can find the complete GNU GPL at
-/usr/share/common-licenses/GPL.
+"/usr/share/common-licenses/GPL-2".
 
diff -Nru debian-zh-faq-1.11/debian/debian-zh-faq-s.doc-base 
debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-s.doc-base
--- debian-zh-faq-1.11/debian/debian-zh-faq-s.doc-base  2010-05-14 
22:19:44.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-s.doc-base     2010-05-14 
22:27:48.000000000 -0700
@@ -8,4 +8,4 @@
 
 
 Format: PostScript
-Files: /usr/share/doc/debian-zh-faq-s/debian-zh-faq-s.ps.gz
+Files: /usr/share/doc/debian-zh-faq-s/debian-zh-faq.zh_CN.ps.gz
diff -Nru debian-zh-faq-1.11/debian/debian-zh-faq-t.README.Debian 
debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-t.README.Debian
--- debian-zh-faq-1.11/debian/debian-zh-faq-t.README.Debian     2010-05-14 
22:19:44.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-t.README.Debian        
2010-05-14 22:27:48.000000000 -0700
@@ -4,16 +4,18 @@
 
    ³o­Ó®M¥ó¸Ì¡mDebian Chinese FAQ¡n¬O§Ú­Ì¦b Debian ¤u¨Ï¥Î¤¤¤åª�...@¨Ç¸gÅç¡a
 §Æ±æ¥¦¯à°÷Åý±z§ó®e©öªº¦b Debian �...@·~¨t²Î¤u¶i¦æ¤¤¤å³b²z¡c
-   
-   This packages contains the book Debian_Chinese_FAQ, and it answers some
-frequently asked question about Chinese environment setup.  It also
-introduces the special Chinese software in Debian.  Hope it can make you
-easy to use Chinese in Debian Operating System.
+
+These packages contain the book Debian_Chinese_FAQ, and it answers
+some frequently asked question about Chinese environment setup. It
+also introduces the special Chinese software in Debian. Hope it can
+help you to use the Debian Operating System.
 
   ³o­Ó³n¥ó¥]¬O°ò¤_ÀNªFÆF <[email protected]> ªº debian-guide-zh ®M¥ó­×§ï¦Ó¨Ó¡A
 ¦b¦¹ªí¥Ü·PÁ¡C
 
-  This packages is base on Anthony Fok <[email protected]>'s debian-guide-zh,
+These packages are based on Anthony Fok <[email protected]>'s debian-guide-zh,
 Thanks to you, Anthony!
 
   --¤_¼s½÷ Yu Guanghui <[email protected]>, Tue, 20 Feb 2001 17:53:33 +800.
+
+ -- Jari Aalto <[email protected]>, Sat,  8 May 2010 22:10:08 +0300
diff -Nru debian-zh-faq-1.11/debian/debian-zh-faq-t.copyright 
debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-t.copyright
--- debian-zh-faq-1.11/debian/debian-zh-faq-t.copyright 2010-05-14 
22:19:44.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-t.copyright    2010-05-14 
22:27:48.000000000 -0700
@@ -1,12 +1,17 @@
-This package was debianized by Yu Guanghui <[email protected]> on
-Tue, 20 Feb 2001 17:31:16 +0800.
+This package was debianized by:
 
-Upstream Author: Yu Guanghui <[email protected]>
+    Yu Guanghui <[email protected]>
+    on Tue, 20 Feb 2001 17:31:16 +0800.
+
+Upstream Author:
+
+    Copyright (C) 2001-2006 Yu Guanghui <[email protected]>
 
 Copyright:
-This book maybe copied under the terms of the GNU General Public Licence
-(see below).
+
+    This book maybe copied under the terms of the GNU General Public
+    Licence version 2, or any later version.
 
 On Debian systems, you can find the complete GNU GPL at
-/usr/share/common-licenses/GPL.
+"/usr/share/common-licenses/GPL-2".
 
diff -Nru debian-zh-faq-1.11/debian/debian-zh-faq-t.doc-base 
debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-t.doc-base
--- debian-zh-faq-1.11/debian/debian-zh-faq-t.doc-base  2010-05-14 
22:19:44.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/debian-zh-faq-t.doc-base     2010-05-14 
22:27:48.000000000 -0700
@@ -8,4 +8,4 @@
 
 
 Format: PostScript
-Files: /usr/share/doc/debian-zh-faq-t/debian-zh-faq-t.ps.gz
+Files: /usr/share/doc/debian-zh-faq-t/debian-zh-faq.zh_TW.ps.gz
diff -Nru debian-zh-faq-1.11/debian/in.doc-base 
debian-zh-faq-1.11+nmu1/debian/in.doc-base
--- debian-zh-faq-1.11/debian/in.doc-base       2004-01-30 08:10:25.000000000 
-0800
+++ debian-zh-faq-1.11+nmu1/debian/in.doc-base  2010-05-01 14:17:55.000000000 
-0700
@@ -8,4 +8,4 @@
 
 
 Format: PostScript
-Files: 
/usr/share/doc/debian-zh-faq-[CN:s:][TW:t:]/debian-zh-faq-[CN:s:][TW:t:].ps.gz
+Files: 
/usr/share/doc/debian-zh-faq-[CN:s:][TW:t:]/debian-zh-faq.[CN:zh_CN:][TW:zh_TW:].ps.gz
diff -Nru debian-zh-faq-1.11/debian/rules debian-zh-faq-1.11+nmu1/debian/rules
--- debian-zh-faq-1.11/debian/rules     2004-08-07 08:01:17.000000000 -0700
+++ debian-zh-faq-1.11+nmu1/debian/rules        2010-05-08 12:02:11.000000000 
-0700
@@ -17,9 +17,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=1
-
 build: build-stamp
 build-stamp:
        dh_testdir
@@ -35,7 +32,7 @@
        rm -f build-stamp
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
 
        cd debian \
        && for i in copyright README.Debian; do \
@@ -62,7 +59,7 @@
 $(install_subpkgs): build
        dh_testdir $(DH_OPTIONS)
        dh_testroot $(DH_OPTIONS)
-       dh_clean -k $(DH_OPTIONS)
+       dh_prep
        dh_installdirs $(DH_OPTIONS)
 
 # Build architecture-independent files here.
diff -Nru debian-zh-faq-1.11/debian/source/format 
debian-zh-faq-1.11+nmu1/debian/source/format
--- debian-zh-faq-1.11/debian/source/format     1969-12-31 16:00:00.000000000 
-0800
+++ debian-zh-faq-1.11+nmu1/debian/source/format        2010-05-08 
12:06:20.000000000 -0700
@@ -0,0 +1 @@
+3.0 (native)
diff -Nru debian-zh-faq-1.11/debian/substvars 
debian-zh-faq-1.11+nmu1/debian/substvars
--- debian-zh-faq-1.11/debian/substvars 1969-12-31 16:00:00.000000000 -0800
+++ debian-zh-faq-1.11+nmu1/debian/substvars    2010-05-08 10:58:33.000000000 
-0700
@@ -0,0 +1 @@
+misc:Depends=



-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to