diff -u edb-1.31/debian/control edb-1.31/debian/control
--- edb-1.31/debian/control
+++ edb-1.31/debian/control
@@ -1,5 +1,5 @@
 Source: edb
-Section: misc
+Section: lisp
 Priority: optional
 Maintainer: Jari Aalto <jari.aalto@cante.net>
 Uploaders: Tatsuya Kinoshita <tats@debian.org>
@@ -12,7 +12,7 @@
 
 Package: edb
 Architecture: all
-Depends: ${misc:Depends}, emacs23 | emacs22 | emacs-snapshot, make, dpkg (>= 1.15.4) | install-info
+Depends: ${misc:Depends}, emacs23 | emacs22 | emacs-snapshot | emacs, make, dpkg (>= 1.15.4) | install-info
 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
reverted:
--- edb-1.31/debian/BYTE-COMPILE.el
+++ edb-1.31.orig/debian/BYTE-COMPILE.el
@@ -1,2 +0,0 @@
-(setq load-path (cons "." load-path))
-(setq edb-directory ".")
diff -u edb-1.31/debian/rules edb-1.31/debian/rules
--- edb-1.31/debian/rules
+++ edb-1.31/debian/rules
@@ -35,7 +35,8 @@
 		-o -name "*[#~]*" \
 		| xargs -r rm
 
-	rm -f lisp/*.elc
+	rm -f lisp/*.elc \
+		debian/BYTE*.el
 
 	# Generated files
 	rm -f lisp/edbcore.el
diff -u edb-1.31/debian/emacsen-startup edb-1.31/debian/emacsen-startup
--- edb-1.31/debian/emacsen-startup
+++ edb-1.31/debian/emacsen-startup
@@ -2,9 +2,10 @@
 ;;
 ;; Emacs startup file for the Debian GNU/Linux edb package
 ;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; 2009-08-30 rewritten by Jari Aalto <jari.aalto@cante.net> for the 1.31.
 ;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
+;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
 ;;
 ;; The edb package follows the Debian/GNU Linux 'emacsen' policy and
 ;; byte-compiles its elisp files for each 'emacs flavor' (emacs<NN>).
@@ -40,12 +41,14 @@
     (autoload 'database-mode	    "edbcore"  "EDB database package" nil)
     (autoload 'database-summary-mode    "edbcore"  "EDB database package" nil)
 
-    (defvar edb-debian-inhibit-edb nil)
+    (defvar edb-debian-inhibit-edb nil
+      "*If non-nil, disable `edb-debian-after-find-file' in `find-file-hook'.")
+
     (add-hook 'find-file-hook 'edb-debian-after-find-file)
 
     (defun edb-debian-after-find-file ()
       "Turn on EDB if first like is ';; Database file written by EDB'.
-Function should be placed in `find-file-hooks'."
+This function is normally placed in `find-file-hooks'."
       ;; When called, point is at the beginning of the buffer.
       (when (and (not edb-debian-inhibit-edb)
 		 (looking-at ";; Database file written by EDB"))
diff -u edb-1.31/debian/emacsen-install edb-1.31/debian/emacsen-install
--- edb-1.31/debian/emacsen-install
+++ edb-1.31/debian/emacsen-install
@@ -28,11 +28,11 @@
     EL_FLAGS="-batch -q -no-site-file"
     EMACS="$FLAVOR $EL_LIBS $EL_FLAGS"
 
-    echo "install/$PACKAGE: Handling install of emacsen flavor $FLAVOR [$ARGS]"
+    echo "install/$PACKAGE: Handling install of emacsen flavor $FLAVOR"
 
     case "$FLAVOR" in
 	xemacs*)
-	    echo "$MESSAGE ignored."
+	    echo "$MESSAGE [xemacs*] ignored."
 	    ;;
 
 	*)
diff -u edb-1.31/debian/changelog edb-1.31/debian/changelog
--- edb-1.31/debian/changelog
+++ edb-1.31/debian/changelog
@@ -1,3 +1,20 @@
+edb (1.31-2) unstable; urgency=low
+
+  * debian/docs
+    - New. Install README, NEWS etc. (Closes: #544283).
+  * debian/emacsen-startup
+    - (edb-debian-inhibit-edb): Add documentation string.
+    - (edb-debian-after-find-file): Improve documentation string.
+  * debian/control
+    - (Depends): Add emacs.
+    - (Section): Change misc to lisp.
+  * debian/emacsen-install
+    - (Install): Adjust displayed message.
+  * debian/rules
+    - (clean): remove BYTE-COMPILE.el.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Wed, 02 Dec 2009 09:42:06 +0000
+
 edb (1.31-1) unstable; urgency=low
 
   [ Jari Aalto ]
@@ -9,10 +26,13 @@
       Included in original file doc/edb.texi,
   * debian/control
     - (Build-Depends): Update to debhelper 7. Remove dpatch.
+    - (Build-Depends-Indep): Add emacs23 | emacs22 | emacs-snapshot.
+      Remove emacs21.
     - (Depends): Add make. Add emacs23 (Closes: #542206), remove emacs21.
+      emacs23 | emacs22 | emacs-snapshot.
+    - (Depends): Add make. Move emacs* packages to Build-Depends-Indep.
       Add ${misc:Depends} (lintian).
       Add "dpkg (>= 1.15.4) | install-info" (lintian).
-    - (Build-Depends-Indep): Add emacs23 | emacs22 | emacs-snapshot.
     - (Homepage): New field. Point to current upstream.
     - (Standards-Version): update to 3.8.3.
     - (Vcs-*): New fields.
only in patch2:
unchanged:
--- edb-1.31.orig/debian/docs
+++ edb-1.31/debian/docs
@@ -0,0 +1,8 @@
+AUTHORS
+BUGS
+BUGS.edb
+HACKING
+NEWS
+README
+THANKS
+TODO