Hi,

 I made a patch for these bugs, please review it.
 Thanks!


-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/iijmio-mail.jp
 http://wiki.debian.org/HidekiYamane

diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.freewnn-tserver freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.freewnn-tserver
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.freewnn-tserver
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.freewnn-tserver
@@ -19,7 +19,7 @@
 # This file was automatically customized by dh-make on Thu, 15 Jul 1999 23:10:35 +0900
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/cWnn4/tserver
+DAEMON=/usr/bin/tserver
 NAME=tserver
 DESC="FreeWnn Taiwanese server"
 
diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.init freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.init
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.init
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.init
@@ -19,7 +19,7 @@
 # This file was automatically customized by dh-make on Thu, 15 Jul 1999 23:10:35 +0900
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/cWnn4/cserver
+DAEMON=/usr/bin/cserver
 NAME=cserver
 DESC="FreeWnn Chinese server"
 
diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.files freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.files
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.files
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.files
@@ -1,4 +1,12 @@
-usr/bin/kWnn4
+usr/bin/katod
+usr/bin/katof
+usr/bin/kdtoa
+usr/bin/kserver
+usr/bin/kwddel
+usr/bin/kwdreg
+usr/bin/kwnnkill
+usr/bin/kwnnstat
+usr/bin/kwnntouch
 usr/share/wnn/ko_KR
 var/lib/wnn/ko_KR
 
diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.files freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.files
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.files
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.files
@@ -1,13 +1,13 @@
-usr/bin/Wnn4/atod
-usr/bin/Wnn4/atof
-usr/bin/Wnn4/dtoa
-usr/bin/Wnn4/jserver
-usr/bin/Wnn4/oldatonewa
-usr/bin/Wnn4/wddel
-usr/bin/Wnn4/wdreg
-usr/bin/Wnn4/wnnkill
-usr/bin/Wnn4/wnnstat
-usr/bin/Wnn4/wnntouch
+usr/bin/atod
+usr/bin/atof
+usr/bin/dtoa
+usr/bin/jserver
+usr/bin/oldatonewa
+usr/bin/wddel
+usr/bin/wdreg
+usr/bin/wnnkill
+usr/bin/wnnstat
+usr/bin/wnntouch
 usr/share/wnn/ja_JP
 usr/share/man/man1/atod.1
 usr/share/man/man1/atof.1
diff -u freewnn-1.1.0+1.1.1-a021/debian/changelog freewnn-1.1.0+1.1.1-a021/debian/changelog
--- freewnn-1.1.0+1.1.1-a021/debian/changelog
+++ freewnn-1.1.0+1.1.1-a021/debian/changelog
@@ -1,3 +1,11 @@
+freewnn (1.1.0+1.1.1-a021-1.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * fix "subdir-in-usr-bin", move files from /usr/bin/{Wnn,cWnn,kWnn} to 
+    /usr/bin (Closes: #552767, #552766, #552768) 
+
+ -- Hideki Yamane (Debian-JP) <henr...@debian.or.jp>  Sat, 23 Jan 2010 14:40:11 +0900
+
 freewnn (1.1.0+1.1.1-a021-1.3) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.files freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.files
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.files
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-cserver.files
@@ -1,4 +1,13 @@
-usr/bin/cWnn4
+usr/bin/catod
+usr/bin/catof
+usr/bin/cdtoa
+usr/bin/cserver
+usr/bin/cwddel
+usr/bin/cwdreg
+usr/bin/cwnnkill
+usr/bin/cwnnstat
+usr/bin/cwnntouch
+usr/bin/tserver
 usr/share/wnn/zh_CN
 usr/share/wnn/zh_TW
 usr/share/man/man1/catod.1
diff -u freewnn-1.1.0+1.1.1-a021/debian/rules freewnn-1.1.0+1.1.1-a021/debian/rules
--- freewnn-1.1.0+1.1.1-a021/debian/rules
+++ freewnn-1.1.0+1.1.1-a021/debian/rules
@@ -62,6 +62,11 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \
 	$(MAKE) install.man DESTDIR=$(CURDIR)/debian/tmp
 
+# avoid "subdir-in-usr-bin" lintian error
+	mv $(CURDIR)/debian/tmp/usr/bin/Wnn4/*  $(CURDIR)/debian/tmp/usr/bin/
+	mv $(CURDIR)/debian/tmp/usr/bin/cWnn4/* $(CURDIR)/debian/tmp/usr/bin/
+	mv $(CURDIR)/debian/tmp/usr/bin/kWnn4/* $(CURDIR)/debian/tmp/usr/bin/
+
 	dh_movefiles
 
 	mkdir -p $(CURDIR)/debian/freewnn-common/usr/share/man/ja
diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.init freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.init
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.init
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-kserver.init
@@ -19,7 +19,7 @@
 # This file was automatically customized by dh-make on Thu, 15 Jul 1999 23:10:35 +0900
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/kWnn4/kserver
+DAEMON=/usr/bin/kserver
 NAME=kserver
 DESC="FreeWnn Korean server"
 
diff -u freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.init freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.init
--- freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.init
+++ freewnn-1.1.0+1.1.1-a021/debian/freewnn-jserver.init
@@ -19,7 +19,7 @@
 # This file was automatically customized by dh-make on Thu, 15 Jul 1999 23:10:35 +0900
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/Wnn4/jserver
+DAEMON=/usr/bin/jserver
 NAME=jserver
 DESC="FreeWnn Japanese server"
 

Attachment: pgpAmvloyaYw5.pgp
Description: PGP signature

Reply via email to