tags 453307 + patch tags 433982 + patch tags 438530 + patch tags 438532 + patch tags 438533 + patch tags 438534 + patch thanks
On November 28, 2007 at 11:44PM +0900, tats (at vega.ocn.ne.jp) wrote: > Package: t-code > Version: 2:2.3.1-2 > Severity: serious > > lintian displays the following error and warnings for this package. > > ---- > Now running lintian... > W: t-code source: debian-rules-sets-DH_COMPAT line 9 > W: t-code source: debian-rules-ignores-make-clean-error line 47 > W: t-code source: package-uses-deprecated-debhelper-compat-version 3 > W: t-code source: ancient-standards-version 3.5.8 (current is 3.7.2) > E: t-code source: clean-should-be-satisfied-by-build-depends debhelper > W: t-code: old-fsf-address-in-copyright-file > Finished running lintian. > ---- > > I'll prepare a patch to fix this bug soon. The maintainer Shigeo is currently busy, and he requested NMU. http://lists.debian.org/debian-japanese/2007/11/msg00037.html http://lists.debian.org/debian-japanese/2007/11/msg00039.html I have prepared the attached patch for NMU to fix this bug #453307 and also #433982, #438530, #438531, #438532, #438533 and #438534. I'll do this NMU this weekend or so. Thanks, -- Tatsuya Kinoshita
diff -urN t-code-2.3.1-2/debian/changelog t-code-2.3.1/debian/changelog --- t-code-2.3.1-2/debian/changelog 2007-08-18 00:43:48.000000000 +0900 +++ t-code-2.3.1/debian/changelog 2007-11-29 00:14:45.000000000 +0900 @@ -1,3 +1,27 @@ +t-code (2:2.3.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix lintian error and warnings, closes: #453307 + - Move debhelper from Build-Depends-Indep to Build-Depends. + - Bump up debhelper version to 5. + - Don't use DH_COMPAT in debian/rules, use debian/compat instead. + - Don't ignore an error of make distclean in debian/rules. + - Update FSF address in debian/copyright. + - Bump up Standerd-Version to 3.7.2. + * debian/rules: + - Fix FTBFS when /bin/sh is dash, closes: Bug#438531 + - Use binary-indep instead of binary-arch, closes: Bug#438530 + * debian/emacsen-startup: + - Use debian-pkg-add-load-path-item to set load-path, closes: Bug438532 + - Fix that startup fails if package is removed but not purged, + closes: Bug#438533 + * debian/control: + - Prefer emacs and emacs22, closes: Bug#433982 + * debian/emacsen-install: Create symlinks for *.el files, rather than + copying *.el files and then removing them, closes: Bug#438534 + + -- Tatsuya Kinoshita <[EMAIL PROTECTED]> Thu, 29 Nov 2007 00:14:44 +0900 + t-code (2:2.3.1-2) unstable; urgency=low * FIX tcode-site-data-directory in tc-pre.el diff -urN t-code-2.3.1-2/debian/compat t-code-2.3.1/debian/compat --- t-code-2.3.1-2/debian/compat 1970-01-01 09:00:00.000000000 +0900 +++ t-code-2.3.1/debian/compat 2007-11-28 23:30:35.000000000 +0900 @@ -0,0 +1 @@ +5 diff -urN t-code-2.3.1-2/debian/control t-code-2.3.1/debian/control --- t-code-2.3.1-2/debian/control 2007-08-18 00:43:48.000000000 +0900 +++ t-code-2.3.1/debian/control 2007-11-28 23:37:24.000000000 +0900 @@ -2,12 +2,13 @@ Section: utils Priority: optional Maintainer: NOSHIRO Shigeo <[EMAIL PROTECTED]> -Standards-Version: 3.5.8 -Build-Depends-Indep: debhelper (>> 3.0.0), automake1.4, autoconf, emacs21|xemacs21-mule|xemacs21-mule-canna-wnn +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5) +Build-Depends-Indep: automake1.4, autoconf, emacs | emacs22 | emacs21 | xemacs21-mule | xemacs21-mule-canna-wnn Package: t-code Architecture: all -Depends: xemacs21-mule | xemacs21-mule-canna-wnn | emacs21| xemacs21-gnome-mule-canna-wnn | xemacs21-gnome-mule +Depends: emacs | emacs22 | emacs21 | xemacs21-mule | xemacs21-mule-canna-wnn | xemacs21-gnome-mule-canna-wnn | xemacs21-gnome-mule Description: Yet another Japanese input method T-Code is Japanese input method that doesn't use Kana-to-Kanji conversion. You can input Kanji characters directly in the diff -urN t-code-2.3.1-2/debian/copyright t-code-2.3.1/debian/copyright --- t-code-2.3.1-2/debian/copyright 2007-08-18 00:43:48.000000000 +0900 +++ t-code-2.3.1/debian/copyright 2007-11-28 23:56:34.000000000 +0900 @@ -3,30 +3,26 @@ It was downloaded from http://openlab.jp/tcode/soft.html -Copyright: -Upstream Author: -;; Copyright (C) 1989--2002 Kaoru Maeda, Yasushi Saito and KITAJIMA Akira. +Copyright (C) 1989--2002 Kaoru Maeda, Yasushi Saito and KITAJIMA Akira. -;; Author: Kaoru Maeda <[EMAIL PROTECTED]> -;; Yasushi Saito <[EMAIL PROTECTED]> -;; KITAJIMA Akira <[EMAIL PROTECTED]> -;; Maintainer: KITAJIMA Akira -;; Version: 2.3 pre 9.1 -;; Keyword: input method - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2 of the License, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;;You should have received a copy of the GNU General Public License with -;;your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or -;;with the dpkg source package as the file COPYING. If not, write to the -;;Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;;MA 02111-1307, USA. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +with the Debian distribution in file `/usr/share/common-licenses/GPL'; +if not, write to the Free Software Foundation, Inc., 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is distributed under the same conditions as the +upstream. diff -urN t-code-2.3.1-2/debian/emacsen-install t-code-2.3.1/debian/emacsen-install --- t-code-2.3.1-2/debian/emacsen-install 2007-08-18 00:43:48.000000000 +0900 +++ t-code-2.3.1/debian/emacsen-install 2007-11-29 00:14:40.000000000 +0900 @@ -39,7 +39,7 @@ install -m 444 ${DATADIR}/tc-bitmap-8x16 ${ELCDIR} cd ${ELDIR} FILES="eelll.el tc-bushu.el tc-complete.el tc-help.el tc-image.el tc-inst.el tc-is18.el tc-is19.el tc-is20.el tc-jiscode.el tc-mazegaki.el tc-mkmzdic.el tc-pre.el tc-setup.el tc-sysdep.el tc-tbl.el tc-util.el tc.el tutc-tbl.el" -cp ${FILES} ${ELCDIR} +ln -sf ${ELDIR}/*.el ${ELCDIR} cd ${ELCDIR} cat << EOF > path.el @@ -53,6 +53,6 @@ else ${XEMACS} ${FLAGS} ${FILES} > CompilationLog 2>&1 || abort_install fi -rm -f *.el path.el +rm -f path.el exit 0 diff -urN t-code-2.3.1-2/debian/emacsen-startup t-code-2.3.1/debian/emacsen-startup --- t-code-2.3.1-2/debian/emacsen-startup 2007-08-18 00:43:48.000000000 +0900 +++ t-code-2.3.1/debian/emacsen-startup 2007-11-28 00:56:48.000000000 +0900 @@ -1,17 +1,15 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file for the Debian GNU/Linux t-code package -;; -;; Originally contributed by Nils Naumann <[EMAIL PROTECTED]> -;; Modified by Dirk Eddelbuettel <[EMAIL PROTECTED]> -;; Adapted for dh-make by Jim Van Zandt <[EMAIL PROTECTED]> +;;; 50t-code.el --- Debian t-code startup file -*-mode: emacs-lisp;-*- -;; The t-code package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(setq load-path (cons (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/t-code") load-path)) -(require 'tc-setup) +;;; Code: + +(let ((lispdir (concat "/usr/share/" (symbol-name flavor) "/site-lisp/t-code"))) + (when (and (featurep 'mule) (file-exists-p (concat lispdir "/tc.elc"))) + (if (fboundp 'debian-pkg-add-load-path-item) + (debian-pkg-add-load-path-item lispdir) + (setq load-path (cons lispdir load-path))) + ;; + (require 'tc-setup) + ;; + )) + +;;; 50t-code.el ends here diff -urN t-code-2.3.1-2/debian/rules t-code-2.3.1/debian/rules --- t-code-2.3.1-2/debian/rules 2007-08-18 00:43:48.000000000 +0900 +++ t-code-2.3.1/debian/rules 2007-11-28 23:36:07.000000000 +0900 @@ -1,13 +1,8 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=3 - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -44,7 +39,7 @@ rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean -rm -f \ config.log \ etc/bushu.expand \ @@ -80,8 +75,9 @@ install -m 644 lisp/*.el \ $(CURDIR)/debian/t-code/usr/share/emacs/site-lisp/t-code - install -m 644 kinput2/{README,tc-ki2.el,ccdef.tcode} \ - $(CURDIR)/debian/t-code/usr/share/doc/t-code/kinput2 + install -m 644 kinput2/README $(CURDIR)/debian/t-code/usr/share/doc/t-code/kinput2 + install -m 644 kinput2/tc-ki2.el $(CURDIR)/debian/t-code/usr/share/doc/t-code/kinput2 + install -m 644 kinput2/ccdef.tcode $(CURDIR)/debian/t-code/usr/share/doc/t-code/kinput2 # fixups for debian. mv $(CURDIR)/debian/t-code/usr/share/t-code/manual.pdf \ @@ -89,12 +85,12 @@ mv $(CURDIR)/debian/t-code/usr/bin/tcinput \ $(CURDIR)/debian/t-code/usr/share/doc/t-code/skkinput3 -# 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 +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot # dh_installdebconf
pgpk3B8U8LiGS.pgp
Description: PGP signature
