[debian-devel:09855] modified points on user-ja

[Taketoshi Sano <xlj06203@xxxxxxxxxxx>]

佐野＠浜松です。

user-ja の 0.10 (potato-jp 版) から 0.12 (potato 版) までの変更点について
久保田さんへの連絡と、JP プロジェクト内に記録を残す目的とを兼ねて、この ML に
流しておきます。

以下、0.10 と 0.12 を diff -ruN で比較した結果と、それに対するコメント
(行頭に '#') です。

diff -ruN chk/user-ja-0.10/Makefile ./user-ja-0.12/Makefile
--- chk/user-ja-0.10/Makefile	Thu Jan  1 09:00:00 1970
+++ ./user-ja-0.12/Makefile	Thu Jun 17 12:54:33 1999
@@ -0,0 +1,14 @@
+#! /usr/bin/make -f
+#
+# Makefile for user-ja
+
+all:
+
+install:
+	install -m 755 user-ja-conf $(DESTDIR)/usr/bin
+	install -m 644 dot.* general.pl $(DESTDIR)/usr/share/user-ja
+	install -m 644 user-ja-conf.1 $(DESTDIR)/usr/man/man1
+	install -m 644 user-ja-conf.ja.1 $(DESTDIR)/usr/man/ja/man1/user-ja-conf.1
+
+clean:
+

# debian/rules を debmake ベースから dh_make ベースに変更したのと
# 合わせて、TOP directory に Makefile を置くようにしました。

diff -ruN chk/user-ja-0.10/debian/README.Debian ./user-ja-0.12/debian/README.Debian
--- chk/user-ja-0.10/debian/README.Debian	Thu Jan  1 09:00:00 1970
+++ ./user-ja-0.12/debian/README.Debian	Sat Jun 19 06:47:14 1999
@@ -0,0 +1,13 @@
+user-ja for Debian
+----------------------
+
+This package provide a command to setup a Japanese environment.
+Invoke 'user-ja-conf' as each user to setup his/her Japanese environment.
+
+The author of this software is Tomohiro KUBOTA <kubota@debian.or.jp>.
+He maintained this package as native Debian package as a one of
+JP Packages for Debian from Debian JP. He now prepares to send
+his application to new maintainer team of Debian, and until he becomes
+the official maintainer, I take the charge of this package.
+
+ -- Taketoshi Sano <sano@debian.org>, Thu, 17 Jun 1999 11:50:28 +0900
diff -ruN chk/user-ja-0.10/debian/README.debian ./user-ja-0.12/debian/README.debian
--- chk/user-ja-0.10/debian/README.debian	Sat Oct 10 17:52:05 1998
+++ ./user-ja-0.12/debian/README.debian	Thu Jan  1 09:00:00 1970
@@ -1,7 +0,0 @@
-user-ja for DEBIAN
-----------------------
-
-This package provide a command to setup a Japanese environment.
-Invoke 'user-ja-conf' as each user to setup his/her Japanese environment.
-
-Tomohiro KUBOTA <kubota@debian.or.jp>, Sun, 13 Sep 1998 19:09:55 +0900

# README.debian から README.Debian への名称変更と、若干の内容追加です。

diff -ruN chk/user-ja-0.10/debian/changelog ./user-ja-0.12/debian/changelog
--- chk/user-ja-0.10/debian/changelog	Mon Jun  7 00:14:32 1999
+++ ./user-ja-0.12/debian/changelog	Sat Jun 19 06:49:20 1999
@@ -1,3 +1,21 @@
+user-ja (0.12) unstable; urgency=low
+
+  * fix lintian error (my fault: typo in README.Debian)
+
+ -- Taketoshi Sano <sano@debian.org>  Sat, 19 Jun 1999 06:48:38 +0900
+
+user-ja (0.11) unstable; urgency=low
+
+  * New Maintainer, a part of MERGE Operation from Debian JP
+    (The original author (& maintainer) now prepares to sent
+     the application to new maintainer team on Debian)
+  * add 2 lines to enable more function of nvi-m17n-canna
+    (dot.nexrc.pl)
+  * add chmod to set permission 0644 for non executable files
+    and more message on quit (user-ja-conf)
+
+ -- Taketoshi Sano <sano@debian.org>  Thu, 17 Jun 1999 11:30:30 +0900
+
 user-ja (0.10) unstable; urgency=low
 
   * Recommends: locale-ja, gconv-modules.
@@ -103,5 +121,4 @@
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "kubota@debian.or.jp"
 End:
diff -ruN chk/user-ja-0.10/debian/control ./user-ja-0.12/debian/control
--- chk/user-ja-0.10/debian/control	Thu May 27 19:59:24 1999
+++ ./user-ja-0.12/debian/control	Thu Jun 17 12:40:50 1999
@@ -1,8 +1,8 @@
 Source: user-ja
 Section: misc
 Priority: optional
-Maintainer: Tomohiro KUBOTA <kubota@debian.or.jp>
-Standards-Version: 2.4.1
+Maintainer: Taketoshi Sano <sano@debian.org>
+Standards-Version: 2.5.0
 
 Package: user-ja
 Architecture: all
diff -ruN chk/user-ja-0.10/debian/copyright ./user-ja-0.12/debian/copyright
--- chk/user-ja-0.10/debian/copyright	Mon Mar  1 23:14:32 1999
+++ ./user-ja-0.12/debian/copyright	Thu Jun 17 12:45:27 1999
@@ -1,6 +1,11 @@
-This package is an original Debian package made 
-by Tomohiro KUBOTA <kubota@debian.or.jp>
-on Sun, 13 Sep 1998 19:09:55 +0900.
+This package is maintained by Taketoshi Sano <sano@debian.org> on
+Thu, 17 Jun 1999 11:50:28 +0900.
+
+The author of this package is Tomohiro KUBOTA <kubota@debian.or.jp>.
+He made this package as an original native Debian package. And now
+he prepares to send his application to new maintainer team of Debian.
+Until he becomes the official maintainer, I (sano@debian.org) take 
+the charge of this package.
 
 Copyright:
 
@@ -18,3 +23,4 @@
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/doc/copyright/GPL'.
+

# このへんは説明不要ですよね。

diff -ruN chk/user-ja-0.10/debian/dirs ./user-ja-0.12/debian/dirs
--- chk/user-ja-0.10/debian/dirs	Wed Oct 14 02:01:54 1998
+++ ./user-ja-0.12/debian/dirs	Thu Jun 17 12:45:43 1999
@@ -1,4 +1,5 @@
-usr/share/user-ja
 usr/bin
+usr/sbin
+usr/share/user-ja
 usr/man/man1
 usr/man/ja/man1
diff -ruN chk/user-ja-0.10/debian/docs ./user-ja-0.12/debian/docs
--- chk/user-ja-0.10/debian/docs	Thu Jan  1 09:00:00 1970
+++ ./user-ja-0.12/debian/docs	Thu Jun 17 11:50:30 1999
@@ -0,0 +1,3 @@
+README.e
+README.jis
+README.romaji
diff -ruN chk/user-ja-0.10/debian/examples ./user-ja-0.12/debian/examples
--- chk/user-ja-0.10/debian/examples	Thu Jan  1 09:00:00 1970
+++ ./user-ja-0.12/debian/examples	Thu Jun 17 12:49:23 1999
@@ -0,0 +1 @@
+examples/dot.xsession

# debian/rules を dh_make ベースにしたのと合わせて、この辺も
# なるべく debian/rules をいじらない方向に振ってみました。
# (そのほうが debhelper や devscript の update に対応しやすいかと思って)

diff -ruN chk/user-ja-0.10/debian/postinst ./user-ja-0.12/debian/postinst
--- chk/user-ja-0.10/debian/postinst	Wed Oct 14 02:02:00 1998
+++ ./user-ja-0.12/debian/postinst	Thu Jun 17 12:32:15 1999
@@ -2,9 +2,35 @@
 
 set -e
 
-echo "user-ja HA JIDOUTEKI NIHA SETTEI WO OKONAI MASEN."
-echo "IPPAN user NI NATTE, /usr/bin/user-ja-conf WO"
-echo "JIKKOU SHITE KUDASAI."
-echo
-echo -n "[Enter] WO OSHITE KUDASAI. "
+if [ "$TERM" = "kterm" -o "$TERM" = "kon" ]; then
+
+  echo "user-ja does not change any setup unless"
+  echo "the user execute the configuration command: "
+  echo " 1st: login as a normal (not special) user account"
+  echo " 2nd: execute /usr/bin/user-ja-conf"
+  echo " "
+
+  echo 'user-ja はユーザが設定コマンドを実行しなければ'
+  echo '既存の設定になにも変更を加えません。'
+  echo '一般ユーザのアカウントでログインして'
+  echo '設定コマンド /usr/bin/user-ja-conf を'
+  echo '実行してください。'
+  echo
+  echo -n '[Enter] を押すと次に進みます。'
+
+else
+
+  echo "user-ja does not change any setup unless"
+  echo "the user execute the configuration command: "
+  echo " 1st: login as a normal (not special) user account"
+  echo " 2nd: execute /usr/bin/user-ja-conf"
+  echo " "
+
+  echo "user-ja HA JIDOUTEKI NIHA SETTEI WO OKONAI MASEN."
+  echo "IPPAN user NI NATTE, /usr/bin/user-ja-conf WO"
+  echo "JIKKOU SHITE KUDASAI."
+  echo
+  echo -n "[Enter] WO OSHITE KUDASAI. "
+fi
+
 read

# メールに入れる都合上、JIS コードに変換しましたが、もとは EUC-JP の
# メッセージです。 $TERM が kon または kterm の場合は postinst の
# メッセージが日本語になるようにしてみました。

diff -ruN chk/user-ja-0.10/debian/rules ./user-ja-0.12/debian/rules
--- chk/user-ja-0.10/debian/rules	Sun Feb 28 13:02:55 1999
+++ ./user-ja-0.12/debian/rules	Thu Jun 17 13:04:19 1999
@@ -1,48 +1,79 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+#-*- makefile -*-
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Christoph Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 package=user-ja
-BUILDDIR=`pwd`/debian/tmp
 
-build:
-	$(checkdir)
-	touch build
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	
+	# Add here commands to compile the package.
+	$(MAKE) 
 
-clean:
-	$(checkdir)
-	-rm -f build
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	touch build-stamp
 
-binary-indep: checkroot build
-	$(checkdir)
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
 	dh_installdirs
-	install -m 755 user-ja-conf $(BUILDDIR)/usr/bin
-	install -m 644 dot.* general.pl $(BUILDDIR)/usr/share/user-ja
-	install -m 644 user-ja-conf.1 $(BUILDDIR)/usr/man/man1
-	install -m 644 user-ja-conf.ja.1 $(BUILDDIR)/usr/man/ja/man1/user-ja-conf.1
-	dh_installdocs README*
-	dh_installexamples examples/*
-	dh_installchangelogs
-	dh_movefiles
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installemacsen
+#	dh_installinit
+	dh_installcron
+#	dh_installmanpages
+#	dh_undocumented
+	dh_installchangelogs 
+	dh_link
+	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_gencontrol
+	# You may want to make some executables suid here
+	dh_suidregister
+#	dh_makeshlibs
 	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: checkroot build
-
-define checkdir
-	test -f debian/rules
-endef
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: build clean binary-indep binary-arch binary

# debmake ベースから dh_make ベースへの変更です。

diff -ruN chk/user-ja-0.10/dot.nexrc.pl ./user-ja-0.12/dot.nexrc.pl
--- chk/user-ja-0.10/dot.nexrc.pl	Sun May 23 12:17:25 1999
+++ ./user-ja-0.12/dot.nexrc.pl	Thu Jun 17 11:28:08 1999
@@ -4,6 +4,8 @@
 " nvi-m17n-canna で、日本語が使えるようにする。
 " set noskipdisplay
 " set displayencoding=euc-jp
+" set inputencoding=euc-jp
+" set fileencoding=euc-jp
 " set autodetect=jp
 EOF
 if ($CANNA_LOCAL || $CANNA_REMOTE) {

# displayencoding だけだと、kon 上で canna を経由して日本語入力、が
# できなかったので inputencoding を追加しました。また fileencoding も
# ついでに入れておきました。他と同じくコメントなので、自分で編集しないと
# 有効にはなりませんが。

diff -ruN chk/user-ja-0.10/user-ja-conf ./user-ja-0.12/user-ja-conf
--- chk/user-ja-0.10/user-ja-conf	Sun May 23 12:17:25 1999
+++ ./user-ja-0.12/user-ja-conf	Thu Jun 17 18:02:46 1999
@@ -59,9 +59,15 @@
 $TMP = "/tmp/user-ja-$$";
 END {
 	if ($Sub::KANJI) {
-		print STDERR &euc2jis("\n[Enter] を押してください。終了します。");
+		print STDERR &euc2jis("\n設定の変更を反映させるために ");
+		print STDERR &euc2jis("\n一度ログアウトして再度ログイン ");
+		print STDERR &euc2jis("\nしてください。[Enter] キーを押すと ");
+		print STDERR &euc2jis("\n user-ja-conf が終了します。");
 	} else {
-		print STDERR "\n[Enter] WO OSHITE KUDASAI. SYUURYOU SHIMASU. ";
+		print STDERR "\nSettei no Henkou wo Han-ei saseru-tameni ";
+		print STDERR "\nIchi-do logout shitekara, mata futatabi ";
+		print STDERR "\nlogin shite kudasai. [Enter] key wo Osuto ";
+		print STDERR "\nkono user-ja-conf wa Syuuryou shimasu. ";
 	}
 	$a = <>;
 }
@@ -117,6 +123,7 @@
 		$whole2 = join("", @whole1);
 	}
 	&addfile($dotname, $comment, $startpoint, $whole2);
+	if ($execute ne 'x') {chmod(0644, $dotname);}
 	if ($execute eq 'x') {chmod(0755, $dotname);}
 }
 closedir(DIR);

# dot.nexrc のように「後で自分で編集しないといけないもの」については
# 「"user-ja-conf を実行しただけではダメ」というメッセージを表示した
# ほうが良いと思うのですが、それについては man page に記載するべきか
# とも考えています。ご検討ください。

以上。

-- 
     ＃わたしのおうちは浜松市、「夜のお菓子」で有名さ。
    <xlj06203@xxxxxxxxxxx> : Taketoshi Sano (佐野　武俊)