Hi Jari, If you still have the intention of `ITA: edb' and no one has offered to sponsor it for you, I'll sponsor your package. Please apply the attached patch, and tell me a location for the new package. If not, I'll NMU or so. On October 1, 2006 at 7:38PM +0900, tats (at debian.org) wrote: > On June 12, 2006 at 3:03PM +0300, > jari.aalto (at cante.net) wrote: > > > Subject: edb -- Package available > > To: 353629@bugs.debian.org > > > > Package available, needs sponsor: > > > > http://sponsors.debian.net/viewpkg.php?id=254 > > I've found, downloaded, and skimmed through your package. (Though > I'm not a user of edb.) > > Some somments and patches: > > * Build-Depends > > debhelper and patch should be moved from Build-Depends-Indep to > Build-Depends because those packages are used at the clean target. > > * Standards-Version > > Current version is 3.7.2. > > * duplicate-conffile > > /etc/emacs/site-start.d/50edb.el is marked as conffile duplicately. > dh_installemacsen does enough job, so it should be removed from > `debian/conffiles'. > > * copyright > > You mentions `Added copyright holder' in changelog, but there is > no change. > > * short description > > The short description should not begin with an article. > > See also Developer's Reference 6.2.2. > > * long description > > Please add a space to the beginning of `Homepage:'. (Two spaces > prepending the `Homepage:' line) > > See also Developer's Reference 6.2.4. > > * emacs-snapshot > > Other version of GNU Emacs, emacs-snapshot, is available. > > * emacsen-startup > > To add the package directory to load-path, debian-pkg-add-load-path-item > should be used. See also > `/usr/share/doc/emacsen-common/debian-emacs-policy.gz'. > > If the package is removed but not purged, the setup should be skipped. > > * emacsen-install, emacsen-remove > > If flavor is `emacs', don't display messages. > > * emacsen-install > > Add -q to not load user init files when byte-compiling. > > Make *.el symlinks to find the source files from Emacs Help. > > xemacs22 (not yet available) should be skipped. > > I've created the attached patch for the above things. -- Tatsuya Kinoshita
diff -urN edb-1.21-14/debian/conffiles edb-1.21/debian/conffiles
--- edb-1.21-14/debian/conffiles 2006-10-01 12:07:07.000000000 +0900
+++ edb-1.21/debian/conffiles 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-/etc/emacs/site-start.d/50edb.el
diff -urN edb-1.21-14/debian/control edb-1.21/debian/control
--- edb-1.21-14/debian/control 2006-10-01 12:07:07.000000000 +0900
+++ edb-1.21/debian/control 2006-10-01 19:21:49.000000000 +0900
@@ -2,15 +2,16 @@
Section: utils
Priority: optional
Maintainer: Jari Aalto <jari.aalto@cante.net>
-Build-Depends-Indep: debhelper (>= 4.0.0), patch, texinfo
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4), patch
+Build-Depends-Indep: texinfo
+Standards-Version: 3.7.2
Package: edb
Architecture: all
-Depends: emacs21
-Description: A database program for GNU Emacs
+Depends: emacs21 | emacs-snapshot
+Description: database program for GNU Emacs
EDB is a database program for GNU Emacs. It permits you to
manipulate structured (or not-so-structured) data within
Emacs and provides many of the usual database features.
.
- Homepage: http://www.glug.org/people/ttn/software/edb/
+ Homepage: http://www.glug.org/people/ttn/software/edb/
diff -urN edb-1.21-14/debian/copyright edb-1.21/debian/copyright
--- edb-1.21-14/debian/copyright 2006-10-01 12:07:07.000000000 +0900
+++ edb-1.21/debian/copyright 2006-10-01 18:00:01.000000000 +0900
@@ -1,10 +1,29 @@
-This package was debianized by Takao KAWAMURA kawamura@debian.org on
+This package was debianized by Takao KAWAMURA <kawamura@debian.org> on
Sun, 23 May 1999 21:58:27 +0900.
It was downloaded from ftp://theory.lcs.mit.edu/pub/people/mernst/edb/
-Copyright:
+Copyright (C) 1991-1995 Michael D. Ernst <mernst@theory.lcs.mit.edu>
-;; EDB is distributed under the same conditions as GNU Emacs.
+EDB is distributed under the same conditions as GNU Emacs.
-cf. /usr/share/common-licenses/GPL
+GNU Emacs 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 package 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
+along with GNU Emacs; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, 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 2006 Jari Aalto <jari.aalto@cante.net> and
+is distributed under the same conditions as the upstream, see above.
diff -urN edb-1.21-14/debian/emacsen-install edb-1.21/debian/emacsen-install
--- edb-1.21-14/debian/emacsen-install 2006-10-01 12:07:07.000000000 +0900
+++ edb-1.21/debian/emacsen-install 2006-10-01 18:21:42.000000000 +0900
@@ -3,30 +3,35 @@
FLAVOR=$1
PACKAGE=edb
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
echo install/${PACKAGE}: Handling install of emacsen flavor ${FLAVOR}
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}/
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}/
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
case ${FLAVOR} in
- emacs|xemacs21)
+ xemacs*)
echo install/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR};;
*)
echo -n install/${PACKAGE}: Byte-compiling for ${FLAVOR} ...
install -m 755 -d ${ELCDIR}
-
+ rm -f ${ELDIR}/BYTE-COMPILE.el ${ELCDIR}/*.el ${ELCDIR}/*.elc
(
cd ${ELDIR}
echo '(setq load-path (cons "." load-path))' > BYTE-COMPILE.el
echo '(setq edb-directory ".")' >> BYTE-COMPILE.el
- ${FLAVOR} -batch -no-site-file \
+ ${FLAVOR} -batch -q -no-site-file \
-l ./BYTE-COMPILE.el -l database.el \
-f byte-compile-database-all \
-f batch-byte-compile database.el
- ${FLAVOR} -batch -no-site-file -f batch-byte-compile edb-fixes-1.21.el
+ ${FLAVOR} -batch -q -no-site-file -f batch-byte-compile edb-fixes-1.21.el
- rm BYTE-COMPILE.el
+ rm -f BYTE-COMPILE.el
mv -f *.elc ${ELCDIR}
+ for f in *.el; do
+ ln -sf ${ELDIR}/$f ${ELCDIR}
+ done
)
echo " done.";;
esac
diff -urN edb-1.21-14/debian/emacsen-remove edb-1.21/debian/emacsen-remove
--- edb-1.21-14/debian/emacsen-remove 2006-10-01 12:07:07.000000000 +0900
+++ edb-1.21/debian/emacsen-remove 2006-10-01 18:28:49.000000000 +0900
@@ -3,14 +3,10 @@
FLAVOR=$1
PACKAGE=edb
-echo remove/${PACKAGE}: Handling removal of emacsen flavor ${FLAVOR}
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
-case ${FLAVOR} in
- emacs)
- echo remove/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR};;
- *)
- echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
- rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE};;
-esac
+echo remove/${PACKAGE}: Handling removal of emacsen flavor ${FLAVOR}
+echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
exit 0
diff -urN edb-1.21-14/debian/emacsen-startup edb-1.21/debian/emacsen-startup
--- edb-1.21-14/debian/emacsen-startup 2006-10-01 12:07:07.000000000 +0900
+++ edb-1.21/debian/emacsen-startup 2006-10-01 18:09:30.000000000 +0900
@@ -11,10 +11,16 @@
;; 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/edb")
- load-path))
+(let ((package-dir (concat "/usr/share/"
+ (symbol-name flavor)
+ "/site-lisp/edb")))
+ ;; If package-dir does not exist, the package must have
+ ;; removed but not purged, and we should skip the setup.
+ (when (file-directory-p package-dir)
+ (if (fboundp 'debian-pkg-add-load-path-item)
+ (debian-pkg-add-load-path-item package-dir)
+ (setq load-path (cons package-dir load-path)))
+ ;;
(setq edb-directory
(concat "/usr/share/" (symbol-name debian-emacs-flavor)
@@ -45,3 +51,6 @@
(setq buf (buffer-name (current-buffer))))))
(require 'edb-fixes-1.21)
+
+ ;;
+ ))
Attachment:
pgpHzBKpUQDLS.pgp
Description: PGP signature