Dear maintainer,
I have some free time and I'd like to offer help.
Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #574219.
See the debian/patches directory for the important fixes.
Please let me know if anything needs correction or if the above is
acceptable.
Thank you for maintaining the package,
Jari Aalto
[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html
lsdiff(1) of changes:
dict-xdict-0.1/debian/changelog
dict-xdict-0.1/debian/compat
dict-xdict-0.1/debian/control
dict-xdict-0.1/debian/copyright
dict-xdict-0.1/debian/patches/10-Dictionary.patch
dict-xdict-0.1/debian/patches/series
dict-xdict-0.1/debian/postrm
dict-xdict-0.1/debian/rules
dict-xdict-0.1/debian/source/format
dict-xdict-0.1/debian/watch
dict-xdict-0.1/Dictionary
diffstat for dict-xdict-0.1 dict-xdict-0.1
Dictionary | 55 +++++---
debian/changelog | 26 ---
debian/compat | 2
debian/control | 4
debian/copyright | 2
debian/patches/10-Dictionary.patch | 243 -------------------------------------
debian/patches/series | 1
debian/postrm | 25 +--
debian/rules | 2
debian/source/format | 1
debian/watch | 4
11 files changed, 51 insertions(+), 314 deletions(-)
diff -Nru dict-xdict-0.1/debian/changelog dict-xdict-0.1/debian/changelog
--- dict-xdict-0.1/debian/changelog 2010-10-19 19:28:11.000000000 +0300
+++ dict-xdict-0.1/debian/changelog 2010-10-19 19:30:12.000000000 +0300
@@ -1,29 +1,3 @@
-dict-xdict (0.1-4.2) unstable; urgency=low
-
- * Non-maintainer upload.
- - Move to packaging format "3.0 (quilt)".
- * debian/compat
- - Update to 8.
- * debian/control
- - (Build-Depends): Update to debhelper 8.
- - (Standards-Version): Update to 3.9.1.
- * debian/copyright
- - Point to GPL-2.
- * debian/postrm
- - (remove|purge): Check whether /etc/init.d/dictd exists and only then
- call invoke-rc.d or init.d script. Patch thanks to Hideki Yamane
- <henr...@debian.or.jp> (serious; Closes: #574219).
- * debian/patches
- - (10): New. Convert direct changes to a patch (Lintian).
- * debian/rules
- - (install): Update dh_clean -k to dh_prep.
- * debian/source/format
- - New file.
- * debian/watch
- - New file.
-
- -- Jari Aalto <jari.aa...@cante.net> Tue, 19 Oct 2010 19:28:11 +0300
-
dict-xdict (0.1-4.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru dict-xdict-0.1/debian/compat dict-xdict-0.1/debian/compat
--- dict-xdict-0.1/debian/compat 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/compat 2010-10-19 19:30:12.000000000 +0300
@@ -1 +1 @@
-8
+4
diff -Nru dict-xdict-0.1/debian/control dict-xdict-0.1/debian/control
--- dict-xdict-0.1/debian/control 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/control 2010-10-19 19:30:12.000000000 +0300
@@ -2,9 +2,9 @@
Section: text
Priority: optional
Maintainer: Emfox Zhou <em...@debian.org>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 4.0.0)
Build-Depends-Indep: dictfmt, dictzip
-Standards-Version: 3.9.1
+Standards-Version: 3.7.3
Package: dict-xdict
Architecture: all
diff -Nru dict-xdict-0.1/debian/copyright dict-xdict-0.1/debian/copyright
--- dict-xdict-0.1/debian/copyright 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/copyright 2010-10-19 19:30:12.000000000 +0300
@@ -20,5 +20,5 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
-Public License can be found in "/usr/share/common-licenses/GPL-2".
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff -Nru dict-xdict-0.1/debian/patches/10-Dictionary.patch dict-xdict-0.1/debian/patches/10-Dictionary.patch
--- dict-xdict-0.1/debian/patches/10-Dictionary.patch 2010-10-19 19:26:28.000000000 +0300
+++ dict-xdict-0.1/debian/patches/10-Dictionary.patch 1970-01-01 02:00:00.000000000 +0200
@@ -1,243 +0,0 @@
-From 53b53718871ebb40434c21798939c78d8fac9c4e Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aa...@cante.net>
-Date: Tue, 19 Oct 2010 19:26:11 +0300
-Subject: [PATCH] Dictionary: Debian chnages (unknown author)
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Jari Aalto <jari.aa...@cante.net>
----
- Dictionary | 55 ++++++++++++++++++++++++++++++++++++-------------------
- 1 files changed, 36 insertions(+), 19 deletions(-)
-
-diff --git a/Dictionary b/Dictionary
-index d615a41..b4e9548 100644
---- a/Dictionary
-+++ b/Dictionary
-@@ -48,31 +48,27 @@ _____
-
- gif
- .GIF
-- 图形文件扩展名,( GRAPHICS INTERCHANGE FORMAT
--的缩写。一种可以提供计算机之间高效传输的图形文件格式)
-+ 图形文件扩展名, (GRAPHICS INTERCHANGE FORMAT 的缩写。一种可以提供计算机之间高效传输的图形文件格式)
- _____
-
- jpeg
- .JPEG
-- 静态图形压缩文件,( JOINT PHOTOGRAPHIC EXPERTS GROUP
--的缩写,一种图形文件压缩格式)
-+ 静态图形压缩文件, (JOINT PHOTOGRAPHIC EXPERTS GROUP 的缩写, 一种图形文件压缩格式)
- _____
-
- mpeg
- .MPEG
-- 动态图形压缩文件,( MOTION PICTURE EXPERTS GROUP
--的缩写,常用的视频文件存贮和压缩格式)
-+ 动态图形压缩文件, ( MOTION PICTURE EXPERTS GROUP 的缩写, 常用的视频文件存贮和压缩格式)
- _____
-
- tiff
- .TIFF
-- 图形文件扩展名,( TAGGED IMAGE FILE FORMAT
--的缩写。是一种存贮多媒体图形文件的标准格式)
-+ 图形文件扩展名, (TAGGED IMAGE FILE FORMAT 的缩写。是一种存贮多媒体图形文件的标准格式)
- _____
-
- wav
- .WAV
-- 语音文件扩展名,(是存贮声音文件的一种标准格式)
-+ 语音文件扩展名, (是存贮声音文件的一种标准格式)
- _____
-
- web
-@@ -82,7 +78,7 @@ _____
-
- 10baset
- 10BaseT
-- (Ethernet的另一种型态,它允许工作站利用双绞线连接)
-+ (Ethernet的另一种型态, 它允许工作站利用双绞线连接)
- _____
-
- 16 bit
-@@ -6116,24 +6112,23 @@ _____
-
- aaas
- AAAS
-- [American Association for the Advancement of Science
--的缩略]美国科学发展协会，[American Academy of Arts and
--Sciences的缩略]美国科学艺术研究院
-+ [American Association for the Advancement of Science 的缩略] 美国科学发展协会
-+ [American Academy of Arts and Sciences 的缩略] 美国科学艺术研究院
- _____
-
- aabomycin
-+aabomycin
- 阿博霉素
- _____
-
- aaf
- AAF
-- [Army Air Forces的缩略]陆军航空队[美国]
-+ [Army Air Forces 的缩略] 陆军航空队[美国]
- _____
-
- aaja
- AAJA
-- [Afro-Asian Journalists'
--Association的缩略]亚非新闻工作者协会
-+ [Afro-Asian Journalists' Association 的缩略] 亚非新闻工作者协会
- _____
-
- aalenian
-@@ -6153,18 +6148,21 @@ _____
-
- aam
- AAM
-- [air-to-air missile的缩略]空对空导弹
-+ [air-to-air missile的缩略] 空对空导弹
- _____
-
- aardvark
-+aardvark
- n. 土猪
- _____
-
- aardwolf
-+aardwolf
- n. 土狼
- _____
-
- aaric
-+aaric
- 蘑菇
- _____
-
-@@ -6184,10 +6182,12 @@ AARP
- _____
-
- aasmus
-+aasmus
- n. 气喘
- _____
-
- aasvogel
-+aasvogel
- n. 秃鹰之一种
- _____
-
-@@ -6197,6 +6197,7 @@ Aatrex
- _____
-
- ab
-+ab
- from之意
- _____
-
-@@ -6242,7 +6243,8 @@ abacist
- _____
-
- aback
-- ad. 向后地,朝后地
-+aback
-+ ad. 向后地, 朝后地
- _____
-
- abacterial
-@@ -6263,19 +6265,23 @@ Abaddon
- _____
-
- abaft
-+abaft
- ad. 向船尾
- prep. 在…后
- _____
-
- abaissement
-+abaissement
- 针拨术; 内障摘出术
- _____
-
- abalienate
-+abalienate
- 让渡
- _____
-
- abalienation
-+abalienation
- 让渡; 精神错乱状态; 精神紊乱
- _____
-
-@@ -6296,7 +6302,8 @@ abamurus
- _____
-
- abandon
-- vt. 抛弃,离弃,遗弃;放弃
-+abandon
-+ vt. 抛弃, 离弃, 遗弃; 放弃
- _____
-
- abandon oneself to
-@@ -267619,35 +267626,43 @@ girdling
- _____
-
- girl
-+girl
- n. 女孩子,姑娘;女儿;女仆,保姆;女工作人员
- _____
-
- girl friend
-+girl friend
- n. 女朋友
- _____
-
- girlfriend
-+girlfriend
- n. 女友
- _____
-
- girlhood
-+girlhood
- n. 少女时期,少女
- n. 少女时期
- _____
-
- girlie
-+girlie
- n. 少女
- _____
-
- girlish
-+girlish
- a. 少女的,少女似的,适于女子的
- _____
-
- girls
-+girls
- n. 女孩子们
- _____
-
- giro
-+giro
- n. 直升飞机
- _____
-
-@@ -267663,11 +267678,13 @@ Girondist
- _____
-
- girt
-+girt
- vt. 围绕
- vi. 围长为
- _____
-
- girth
-+girth
- n. 腰身,周长,肚带
- vt. 围绕,包围
- vi. 围长为
---
-1.7.1
-
diff -Nru dict-xdict-0.1/debian/patches/series dict-xdict-0.1/debian/patches/series
--- dict-xdict-0.1/debian/patches/series 2010-10-19 19:27:14.000000000 +0300
+++ dict-xdict-0.1/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-10-Dictionary.patch
diff -Nru dict-xdict-0.1/debian/postrm dict-xdict-0.1/debian/postrm
--- dict-xdict-0.1/debian/postrm 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/postrm 2010-10-19 19:30:12.000000000 +0300
@@ -2,31 +2,26 @@
set -e
-case "$1" in
+case "$1" in
remove|purge)
+ if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
- if [ -x /usr/sbin/dictdconfig ]; then
- dictdconfig -w
+ # if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart; fi
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d dictd restart
+ else
+ /etc/init.d/dictd restart
fi
-
- if [ -x /etc/init.d/dictd ]; then
- if which invoke-rc.d > /dev/null 2>&1 ; then
- invoke-rc.d dictd restart
- else
- /etc/init.d/dictd restart
- fi
- fi
-
exit 0
;;
upgrade|abort-upgrade|abort-remove|abort-deconfigure|in-favour|removing)
- exit 0
+ exit 0;
;;
*)
- echo "postinst called with unknown argument \"$1\"" >&2
- exit 0
+ echo "postinst called with unknown argument \`$1'" >&2;
+ exit 0;
;;
esac
diff -Nru dict-xdict-0.1/debian/rules dict-xdict-0.1/debian/rules
--- dict-xdict-0.1/debian/rules 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/rules 2010-10-19 19:30:12.000000000 +0300
@@ -42,7 +42,7 @@
install: build
dh_testdir
dh_testroot
- dh_prep
+ dh_clean -k
dh_installdirs
cp xdict.* debian/dict-xdict/usr/share/dictd
diff -Nru dict-xdict-0.1/debian/source/format dict-xdict-0.1/debian/source/format
--- dict-xdict-0.1/debian/source/format 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/source/format 1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-3.0 (quilt)
diff -Nru dict-xdict-0.1/debian/watch dict-xdict-0.1/debian/watch
--- dict-xdict-0.1/debian/watch 2010-10-19 19:24:20.000000000 +0300
+++ dict-xdict-0.1/debian/watch 1970-01-01 02:00:00.000000000 +0200
@@ -1,4 +0,0 @@
-version=3
-# A placeholder, when upstream URL is known
-# http://index.html .*package-([\d.]+).*\.tar\.gz
-
diff -Nru dict-xdict-0.1/Dictionary dict-xdict-0.1/Dictionary
--- dict-xdict-0.1/Dictionary 2005-12-11 07:34:54.000000000 +0200
+++ dict-xdict-0.1/Dictionary 2010-10-19 19:30:12.000000000 +0300
@@ -48,31 +48,27 @@
gif
.GIF
- 图形文件扩展名,( GRAPHICS INTERCHANGE FORMAT
-的缩写。一种可以提供计算机之间高效传输的图形文件格式)
+ 图形文件扩展名, (GRAPHICS INTERCHANGE FORMAT 的缩写。一种可以提供计算机之间高效传输的图形文件格式)
_____
jpeg
.JPEG
- 静态图形压缩文件,( JOINT PHOTOGRAPHIC EXPERTS GROUP
-的缩写,一种图形文件压缩格式)
+ 静态图形压缩文件, (JOINT PHOTOGRAPHIC EXPERTS GROUP 的缩写, 一种图形文件压缩格式)
_____
mpeg
.MPEG
- 动态图形压缩文件,( MOTION PICTURE EXPERTS GROUP
-的缩写,常用的视频文件存贮和压缩格式)
+ 动态图形压缩文件, ( MOTION PICTURE EXPERTS GROUP 的缩写, 常用的视频文件存贮和压缩格式)
_____
tiff
.TIFF
- 图形文件扩展名,( TAGGED IMAGE FILE FORMAT
-的缩写。是一种存贮多媒体图形文件的标准格式)
+ 图形文件扩展名, (TAGGED IMAGE FILE FORMAT 的缩写。是一种存贮多媒体图形文件的标准格式)
_____
wav
.WAV
- 语音文件扩展名,(是存贮声音文件的一种标准格式)
+ 语音文件扩展名, (是存贮声音文件的一种标准格式)
_____
web
@@ -82,7 +78,7 @@
10baset
10BaseT
- (Ethernet的另一种型态,它允许工作站利用双绞线连接)
+ (Ethernet的另一种型态, 它允许工作站利用双绞线连接)
_____
16 bit
@@ -6116,24 +6112,23 @@
aaas
AAAS
- [American Association for the Advancement of Science
-的缩略]美国科学发展协会，[American Academy of Arts and
-Sciences的缩略]美国科学艺术研究院
+ [American Association for the Advancement of Science 的缩略] 美国科学发展协会
+ [American Academy of Arts and Sciences 的缩略] 美国科学艺术研究院
_____
aabomycin
+aabomycin
阿博霉素
_____
aaf
AAF
- [Army Air Forces的缩略]陆军航空队[美国]
+ [Army Air Forces 的缩略] 陆军航空队[美国]
_____
aaja
AAJA
- [Afro-Asian Journalists'
-Association的缩略]亚非新闻工作者协会
+ [Afro-Asian Journalists' Association 的缩略] 亚非新闻工作者协会
_____
aalenian
@@ -6153,18 +6148,21 @@
aam
AAM
- [air-to-air missile的缩略]空对空导弹
+ [air-to-air missile的缩略] 空对空导弹
_____
aardvark
+aardvark
n. 土猪
_____
aardwolf
+aardwolf
n. 土狼
_____
aaric
+aaric
蘑菇
_____
@@ -6184,10 +6182,12 @@
_____
aasmus
+aasmus
n. 气喘
_____
aasvogel
+aasvogel
n. 秃鹰之一种
_____
@@ -6197,6 +6197,7 @@
_____
ab
+ab
from之意
_____
@@ -6242,7 +6243,8 @@
_____
aback
- ad. 向后地,朝后地
+aback
+ ad. 向后地, 朝后地
_____
abacterial
@@ -6263,19 +6265,23 @@
_____
abaft
+abaft
ad. 向船尾
prep. 在…后
_____
abaissement
+abaissement
针拨术; 内障摘出术
_____
abalienate
+abalienate
让渡
_____
abalienation
+abalienation
让渡; 精神错乱状态; 精神紊乱
_____
@@ -6296,7 +6302,8 @@
_____
abandon
- vt. 抛弃,离弃,遗弃;放弃
+abandon
+ vt. 抛弃, 离弃, 遗弃; 放弃
_____
abandon oneself to
@@ -267619,35 +267626,43 @@
_____
girl
+girl
n. 女孩子,姑娘;女儿;女仆,保姆;女工作人员
_____
girl friend
+girl friend
n. 女朋友
_____
girlfriend
+girlfriend
n. 女友
_____
girlhood
+girlhood
n. 少女时期,少女
n. 少女时期
_____
girlie
+girlie
n. 少女
_____
girlish
+girlish
a. 少女的,少女似的,适于女子的
_____
girls
+girls
n. 女孩子们
_____
giro
+giro
n. 直升飞机
_____
@@ -267663,11 +267678,13 @@
_____
girt
+girt
vt. 围绕
vi. 围长为
_____
girth
+girth
n. 腰身,周长,肚带
vt. 围绕,包围
vi. 围长为
