[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[debian-devel:09724] modified points on mh-ja
佐野＠浜松です。
In <19990619234130D.xlj06203@xxxxxxxxxxxxxxxxxxxx>,
at Sat, 19 Jun 1999 23:42:33 +0900,
on [debian-devel:09627] mh-ja installed (Re: Re: user-ja and mh-ja),
Taketoshi Sano <xlj06203@xxxxxxxxxxx> さん writes:
> mh-ja が potato に install されたようです。
...
> あ、それから上記の -3 は lintian かけてなかったので、ちょっと
> 問題ありです。今日 -4 を作成して送ったので、そちらをお試しください。
変更個所を、もとのメンテナーである久保田さんにも知っておいてもらった
ほうが良いと思うので、 mh-ja の -2 (JP 版) と -4 (最新版) での変更点
を書いておきます。
以下、 -2 と -4 を diff -ruN で比較した結果と、それに対するコメント
(行頭に '#') です。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/conf/makefiles/sbr deb.4/mh-ja-6.8.4-jp.3.02.orig/conf/makefiles/sbr
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/conf/makefiles/sbr Fri Feb 12 19:56:46 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/conf/makefiles/sbr Wed Jun 30 12:03:17 1999
@@ -191,7 +191,8 @@
cp libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so.$(SLIBVER)
-@chmod $(PGMPROT) $(SLIBDIR)/libmh.so.$(SLIBVER)
@BEGIN: GELFSHLIB
- -@ln -sf libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so
+# we do not need this to use mh-ja
+# -@ln -sf libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so
@END: GELFSHLIB
-@ls -l $(SLIBDIR)/libmh.so*
-@echo "Shared library installed normally"
# ln -sf libmh.so.3.2 libmh.so を実行すると、lintian が
# "-dev パッケージじゃないのに .so があるよ」と警告するので
# 外しました。とりあえず mh-ja 自体の動作には libmh.so は必要無いようです。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/configure deb.4/mh-ja-6.8.4-jp.3.02.orig/configure
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/configure Fri Feb 12 19:57:17 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/configure Wed Jun 30 12:03:17 1999
@@ -3810,7 +3810,9 @@
then
if test "$sharedlib" = gnuelf
then
- LDFLAGS="$LDFLAGS -Xlinker -rpath -Xlinker $slibdir"
+# lintian does recomment not to use -rpath optin
+# LDFLAGS="$LDFLAGS -Xlinker -rpath -Xlinker $slibdir"
+ :
elif test x"$SOLARIS" != x
then
LDFLAGS="$LDFLAGS -R$slibdir"
# -rpath でリンクされていると、lintian が Error を出すので、
# 外しました。-rpath 付きのリンクはダイナミックリンカーの動作に
# 影響するので、やめたほうが良いと思います。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/configure.in deb.4/mh-ja-6.8.4-jp.3.02.orig/configure.in
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/configure.in Fri Feb 12 19:57:17 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/configure.in Wed Jun 30 12:03:17 1999
@@ -1027,7 +1027,9 @@
then
if test "$sharedlib" = gnuelf
then
- LDFLAGS="$LDFLAGS -Xlinker -rpath -Xlinker $slibdir"
+# lintian recmmend not to use -rpath (Debian specific)
+# LDFLAGS="$LDFLAGS -Xlinker -rpath -Xlinker $slibdir"
+ :
elif test x"$SOLARIS" != x
then
LDFLAGS="$LDFLAGS -R$slibdir"
# これは上と同じ。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/README.Debian deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/README.Debian
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/README.Debian Thu Jan 1 09:00:00 1970
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/README.Debian Wed Jun 30 12:03:17 1999
@@ -0,0 +1,31 @@
+mh-ja for Debian
+----------------------
+
+Japanized MH programs.
+
+User programs are installed in /usr/bin/mh and you should set your
+PATH variable to include this directory. For example, insert the line
+
+ export PATH=$PATH:/usr/bin/mh
+
+into your ~/.bash_profile or /etc/profile.
+
+The original source file is:
+ (1) mh-6.8.4-JP-3.01.tar.gz
+which is downloaded from
+ ftp://komadori.planet.kobe-u.ac.jp/pub/MH/.
+
+The '.orig.tar.gz' file contains
+ (2) mh-6.8.4-JP-3.00.patch.gz
+and
+ (3) mh-6.8.4-JP-3.00-3.01.diff.gz
+which is downloaded from the same site, besides the file (1).
+
+The files (2) and (3) are contained in PATCH/ directory
+of the '.orig.tar.gz' file.
+
+This Package is originally made by Tomohiro KUBOTA <kubota@debian.or.jp>,
+as one of the (add-on) JP Packages for Debian system.
+To merge JP Packages into Debian, I take charge of this package.
+
+ -- Taketoshi Sano <sano@debian.org>, Tue, 15 Jun 1999 18:38:59 +0900
# 下と合わせて、ファイル名変更、内容は最後のメンテナーの
# ところだけ変更しています。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/README.debian deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/README.debian
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/README.debian Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/README.debian Thu Jan 1 09:00:00 1970
@@ -1,25 +0,0 @@
-mh-ja for DEBIAN
-----------------------
-
-Japanized MH programs.
-
-User programs are installed in /usr/bin/mh and you should set your
-PATH variable to include this directory. For example, insert the line
-
- export PATH=$PATH:/usr/bin/mh
-
-into your ~/.bash_profile or /etc/profile.
-
-The original source file is:
- (1) mh-6.8.4-JP-3.01.tar.gz
-which is downloaded from
- ftp://komadori.planet.kobe-u.ac.jp/pub/MH/.
-The '.orig.tar.gz' file contains
- (2) mh-6.8.4-JP-3.00.patch.gz
-and
- (3) mh-6.8.4-JP-3.00-3.01.diff.gz
-which is downloaded from the same site, besides the file (1).
-The files (2) and (3) are contained in PATCH/ directory
-of the '.orig.tar.gz' file.
-
-Tomohiro KUBOTA <kubota@debian.or.jp>, Fri, 4 Dec 1998 11:04:39 +0900
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/changelog deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/changelog
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/changelog Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/changelog Wed Jun 30 12:03:17 1999
@@ -1,3 +1,15 @@
+mh-ja (6.8.4-jp.3.02-4) unstable; urgency=low
+
+ * fix some lintian errors
+
+ -- Taketoshi Sano <sano@debian.org> Sat, 19 Jun 1999 07:24:05 +0900
+
+mh-ja (6.8.4-jp.3.02-3) unstable; urgency=low
+
+ * New Maintainer (To merge this JP package to Debian)
+
+ -- Taketoshi Sano <sano@debian.org> Tue, 15 Jun 1999 18:38:59 +0900
+
mh-ja (6.8.4-jp.3.02-2) unstable; urgency=low
* h/strings.h is changed for alpha.
# 履歴追加です。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/control deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/control
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/control Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/control Wed Jun 30 12:03:17 1999
@@ -1,15 +1,15 @@
Source: mh-ja
Section: mail
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: mh-ja
Architecture: any
Conflicts: mh
Replaces: mh
Provides: mh, mail-reader
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, jless
Description: A set of electronic mail handling programs (Japanese Extented)
Unlike most mail user agents, MH is not a single program, rather it
is a set of program that are run from the shell. This allows the user
# potato 用に Standard-Version 変更。Depends に jless 追加。
# (もしかしたら、これは Suggests のほうが良いかも。)
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/copyright deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/copyright
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/copyright Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/copyright Wed Jun 30 12:03:17 1999
@@ -1,5 +1,11 @@
-This package was debianized by Tomohiro KUBOTA kubota@debian.or.jp on
-Fri, 4 Dec 1998 11:04:39 +0900.
+This is the Debian prepackaged version of mh-ja, a public domain
+mail handler software originally developed by the RAND Corporation
+and modified by the University of California, with enhancement by
+MH-plus project to use in Japanese environment.
+
+This package was debianized by Taketoshi Sano <sano@debian.org> on
+Tue, 15 Jun 1999 18:38:59 +0900. (This was one of the (add-on) JP
+Packages for Debian system by Tomohiro KUBOTA kubota@debian.or.jp)
It was downloaded from <ftp://komadori.planet.kobe-u.ac.jp/pub/MH/>
@@ -27,9 +33,13 @@
only that you provide appropriate credit to the RAND Corporation and the
University of California for having developed the software.
-
[copyright for mh-jp]
+Following is the copyright notice for the patch "MH-JP" to enhance
+the mh on Japanese environments provided by mh-plus project.
+I tried to translate this into English, but you may have to read
+the original Japanese copyright notice to understand the precise meaning.
+
○MH-JP について
MH-JP は *無保証* です。プログラムが正しく動作する、ドキュメントが正確に
@@ -56,3 +66,34 @@
メールが増えても大丈夫と、あちこちの妖しいMLに入りまくって周囲に
「そのような目」で見られるようになってしまった等も含む(笑))等の責任も、
当方は一切負いませんので、その旨ご了承下さい :-)
+
+ -- translation (roughly) --
+
+* about MH-JP
+
+ No warranty is made by the MH-plus project as to the accuracy and
+functioning of the program and related program material. The copyright
+of the each patch and file belongs to the each author of them.
+The author takes no responsibility of any damage arising out of
+the use of this patch.
+
+ You can redistribute this patch freely if and only if that
+your distribution includes all the files in this patch concurrently.
+There are no restriction on the use, copy, redistribution of
+the patch itself. And, the author will thank you if you add
+the detail documentation about the modification (who, what, how) in
+your distribution if you make modification on the patch itself and
+redistribute the patch with your modification.
+
+Binary distribution is allowed if and only if that a) you provide
+the opportunity to get the original archive of MH and this patch
+itself for users of your distribution, and b) your distribution
+includes the documents about the opportunity above (to get the
+source code), and about the executable binary (who, how, where:
+i.e.under what environment, make that binary).
+The author welcomes the contact from you if you plan to publish
+or quote on books or magazines from the configure script and
+the documents (files under doc-JP/, or Japanese Manuals) written
+by the mh-plus project. The author prefers the contact in advance
+of actual publishment or quotation.
+
# JP パッチの copyright 英訳追加。その他、ちょっと変更。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/dirs deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/dirs
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/dirs Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/dirs Wed Jun 30 12:03:17 1999
@@ -1,4 +1,6 @@
usr/bin
+usr/sbin
+usr/bin
usr/bin/mh
usr/sbin
usr/lib
# テンプレートのをそのまま残しただけです。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/diversions.ex deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/diversions.ex
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/diversions.ex Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/diversions.ex Thu Jan 1 09:00:00 1970
@@ -1 +0,0 @@
-<FILE> <Diverted to> <Packagename>
# このファイルは不要だと思ったので削除しました。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/docs deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/docs
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/docs Thu Jan 1 09:00:00 1970
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/docs Wed Jun 30 12:03:17 1999
@@ -0,0 +1,7 @@
+FAQ
+JPPatchlevel
+Makefile
+Patchlevel
+READ-ME
+READ-ME.JP3
+doc-JP/
# debian/rules の [A-Z]* が誤動作したので docs ファイルに書くように
# 変更し dh_installdocs への引数指定をやめました。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/postinst deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/postinst
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/postinst Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/postinst Wed Jun 30 12:03:17 1999
@@ -1,5 +1,6 @@
-#! /bin/sh
+#!/bin/sh -e
+
+if [ "$1" = configure ] ; then
+ ldconfig
+fi
-set -e
-ldconfig
-#DEBHELPER#
# 他の例からもらってきました。packaging-manual には
#
# Any package installing shared libraries in a directory that's listed
# in `/etc/ld.so.conf' or in one of the default library directories of
# `ld.so' (currently, these are `/usr/lib' and `/lib') must call
# `ldconfig' in its `postinst' script if and only if the first argument
# is `configure'. However, it is important not to call `ldconfig' in the
# postrm or preinst scripts in the case where the package is being
# upgraded (see section 6.3, `Details of unpack phase of installation or
# upgrade'), as `ldconfig' will see the temporary names that `dpkg' uses
# for the files while it is installing them and will make the shared
# library links point to them, just before `dpkg' continues the
# installation and removes the links!
#
# とあります。
# ("if and onlyif the first argument is `configure'" に注意)
# postinst が無条件で ldconfig を呼ぶという仕様はマズイようです。
# (postinst が abort-upgrade などを引数として呼ばれる場合がある)
# 実は -3 で ldconfig する postrm を追加してしまって lintian に
# 厳重注意されたので、このへんの規定を探していて上記を見つけました。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/rules deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/rules
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/rules Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/rules Wed Jun 30 12:03:17 1999
@@ -1,4 +1,81 @@
#!/usr/bin/make -f
+#-*- 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
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ ./configure --prefix=/usr
+ # Add here commands to compile the package.
+ $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp install-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) distclean
+
+ dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/tmp.
+ $(MAKE) install prefix=`pwd`/debian/tmp/usr
+
+ 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 CHANGES
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ # You may want to make some executables suid here
+ dh_suidregister
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
+#!/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.
@@ -55,7 +132,8 @@
ln -s /etc/mh/$$i $$i ;\
done
- dh_installdocs doc-JP/* [A-Z]*
+# dh_installdocs doc-JP/* [A-Z]*
+ dh_installdocs
dh_installchangelogs
# dh_installmanpages
ln -s folder.1 debian/tmp/usr/man/man1/folders.1
# ほぼ template そのままです。dh_intalldocs の [A-Z]* は glibc-2.1.1 の
# locate 関連 (broken collate) 問題で LANG=ja_JP.ujis だとほぼすべての
# アルファベットが該当してしまう (当然 debian/tmp 以下も) ようなので、
# コメントアウトしました。
diff -ruN deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/watch.ex deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/watch.ex
--- deb.2/mh-ja-6.8.4-jp.3.02.orig/debian/watch.ex Wed Jun 30 12:03:02 1999
+++ deb.4/mh-ja-6.8.4-jp.3.02.orig/debian/watch.ex Thu Jan 1 09:00:00 1970
@@ -1,5 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-sunsite.unc.edu /pub/Linux/Incomingu mh-ja-6.8.4-*.tar.gz debian uupdate
# これも不要と思われたので外しました。
以上。
--
＃わたしのおうちは浜松市、「夜のお菓子」で有名さ。
<xlj06203@xxxxxxxxxxx> : Taketoshi Sano (佐野 武俊)