Merge lp:~xma/records/384430 into lp:records/1.5

[Xavier Maillard]

Fix bug lp:384430

[Xavier Maillard (xma)]

This branch is fixing bug 384430.

=== modified file 'ChangeLog'
--- ChangeLog	2009-06-05 23:02:42 +0000
+++ ChangeLog	2009-06-07 09:26:10 +0000
@@ -1,3 +1,19 @@
[phone]  Xavier Maillard  <[e-mail]>
+
+	* debian/control: update conflict fields.
+
+	* debian/changelog: bump version.
+
+	* debian/: new directory. Contains the required file to build a
+	Debian package. This is a copy&paste of what was available when
+	records was available in the Debian repositories. (fix
+	Bug:384430). 
+
+	* debian/rules: since lisp source files are now in src/ and the
+	documentation in doc/, update all install rules. Add targets to
+	build info and ps files. Distribute *all* files (even zero sized
+	one).
+
 2009-06-06  Xavier Maillard  <[e-mail]>
 
 	Verion 1.5.1 released.

=== added directory 'debian'
=== added file 'debian/README.Debian'
--- debian/README.Debian	1970-01-01 00:00:00 +0000
+++ debian/README.Debian	2009-06-07 07:47:51 +0000
@@ -0,0 +1,17 @@
+Emacs records-mode for Debian
+-----------------------------
+
+To start using records-mode, run recordsadmin -i
+
+If you want, you can add the following to your .emacs:
+
+; If you like abbrev mode 
+(add-hook 'records-mode-hooks
+    (function
+     (lambda ()
+       (abbrev-mode 1))))
+
+; If you want to be brought to today's record on startup
+(records-goto-today)
+
+Tommi Virtanen <[e-mail]>, Thu,  3 Dec 1998 14:37:11 +0200

=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2009-06-07 09:26:10 +0000
@@ -0,0 +1,124 @@
+records (1.5.1-1.0) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  * New upstream version.
+
+  * Upstream moved to SourceForge.
+
+  * rules: lisp source files are now in src/ and the documentation in
+	doc/. Ack. Added targets to build info and ps files.
+	Distribute *all* files (even zero sized one).
+
+ -- Xavier Maillard <[e-mail]>  Sun, 08 Jun 2009 11:04:15 +0100
+
+records (1.4.9-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * records-common: Get rid of the /usr/doc link in postinst 
+    (Closes: #359563).
+  * records-gnuemacs: Get rid of the /usr/doc link in postinst
+    (Closes: #359570).
+  * records-xemacs: Get rid of the /usr/doc link in postinst 
+    (Closes: #359573).
+
+ -- Amaya Rodrigo Sastre <[e-mail]>  Mon, 17 Jul 2006 20:53:25 +0200
+
+records (1.4.9-4) unstable; urgency=low
+
+  * Mention records-search.el in emacs install and remove scripts. This
+    makes M-x records-search work for me (Closes: #153876).
+  * Remove support for emacs20 and mule2, they have been removed from
+    Debian (Closes: #232784).
+  * Install info file to info directory (Closes: #178592).
+  * Different long descriptions for common/gnuemacs/xemacs (Closes:
+    #135921).
+  * Policy update: 3.5.6 -> 3.6.1: no longer link to undocumented(7)
+  
+ -- Tommi Virtanen <[e-mail]>  Sat,  7 Aug 2004 22:48:34 +0300
+
+records (1.4.9-3) unstable; urgency=low
+
+  * debian/README.Debian: Typo.
+  * debian/control: Change section to editors, as it is in the overrides.
+  * debian/emacsen-remove: Clean up the .elc files (Closes: #122605).
+
+ -- Tommi Virtanen <[e-mail]>  Sat,  5 Jan 2002 15:37:51 +0200
+
+records (1.4.9-2) unstable; urgency=low
+
+  * Split the package into two to work around the emacs mailcrypt issues. 
+    Closes: #84789.
+  * Updated Standards-Version.
+
+ -- Tommi Virtanen <[e-mail]>  Fri,  9 Nov 2001 21:45:34 +0200
+
+records (1.4.9-1) unstable; urgency=low
+
+  * New upstream version.
+  * Include records.ps in the package.
+  * Depend on emacs20 | emacsen, need a real package there first.
+  * Get rid of dh_suidregister.
+  * Install records-templ.tex into examples.
+  * Upstream moved to SourceForge.
+
+ -- Tommi Virtanen <[e-mail]>  Mon, 16 Apr 2001 01:02:20 +0300
+
+records (1.4.8-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Tommi Virtanen <[e-mail]>  Sun, 16 Apr 2000 17:56:49 +0300
+
+records (1.4.3-2) unstable; urgency=low
+
+  * Added dependency to mailcrypt|xemacs20|xemacs21 (XEmacs has
+    mailcrypt bundled). (Closes: #49560, #60133, #61237).
+  * Upgrade to policy 3.1.1, added Build-Depends
+  * New upstream coming soon, but as a separate upload.
+
+ -- Tommi Virtanen <[e-mail]>  Sun, 16 Apr 2000 17:03:50 +0300
+
+records (1.4.3-1) unstable; urgency=low
+
+  * New upstream source.
+  * Added upstream NEWS as changelog.
+  * FHS.
+  * Updated to policy 3.0.0
+  * Moved the build stuff to binary-indep
+  * Actually use dh_installemacsen (Closes: #36334)
+
+ -- Tommi Virtanen <[e-mail]>  Sat,  6 Nov 1999 15:27:54 +0200
+
+records (1.3-2) unstable; urgency=low
+
+  * Depend on perl5 instead of perl
+
+ -- Tommi Virtanen <[e-mail]>  Thu,  1 Jul 1999 23:36:42 +0300
+
+records (1.3-1) unstable; urgency=low
+
+  * New upstream source
+  * Remove recordsadmin on debian/rules clean
+
+ -- Tommi Virtanen <[e-mail]>  Sun, 30 May 1999 22:17:10 +0300
+
+records (1.2-3) unstable; urgency=low
+
+  * Remembered to fill in debian/copyright.
+
+ -- Tommi Virtanen <[e-mail]>  Mon, 25 Jan 1999 01:53:39 +0200
+
+records (1.2-2) unstable; urgency=low
+
+  * Made it Architecture: all
+
+ -- Tommi Virtanen <[e-mail]>  Sun, 17 Jan 1999 22:01:21 +0200
+
+records (1.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Tommi Virtanen <[e-mail]>  Thu,  3 Dec 1998 14:37:11 +0200
+
+

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2009-06-07 09:26:10 +0000
@@ -0,0 +1,44 @@
+Source: records
+Section: editors
+Priority: optional
+Maintainer: Tommi Virtanen <[e-mail]>
+Standards-Version: 3.6.1
+
+Package: records-common
+Architecture: all
+Description: Save and index notes in Emacs environment
+ Records-mode is a major mode for editing and indexing notes.
+ Notes are per-day files containing one or more subjects,
+ subjects from different days are indexed and can be traversed,
+ etc.
+ .
+ This package contains files common to GNU Emacs and XEmacs. You
+ probably want to install either records-gnuemacs or records-xemacs.
+
+Package: records-gnuemacs
+Architecture: all
+Depends: emacs21, mailcrypt, perl5, records-common
+Provides: records
+Replaces: records
+Conflicts: records (<< 1.5.1-1)
+Description: Save and index notes in Emacs environment
+ Records-mode is a major mode for editing and indexing notes.
+ Notes are per-day files containing one or more subjects,
+ subjects from different days are indexed and can be traversed,
+ etc.
+ .
+ This package contains support for GNU Emacs.
+
+Package: records-xemacs
+Architecture: all
+Depends: xemacs21, perl5, records-common
+Provides: records
+Replaces: records
+Conflicts: records (<< 1.5.1-1)
+Description: Save and index notes in Emacs environment
+ Records-mode is a major mode for editing and indexing notes.
+ Notes are per-day files containing one or more subjects,
+ subjects from different days are indexed and can be traversed,
+ etc.
+ .
+ This package contains support for XEmacs.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2009-06-07 07:47:51 +0000
@@ -0,0 +1,16 @@
+This package was debianized by Tommi Virtanen [e-mail] on
+Thu,  3 Dec 1998 14:37:11 +0200.
+
+It was downloaded from http://sourceforge.net/projects/records
+
+Upstream Author(s): Ashvin Goel <[e-mail]>
+				<[e-mail]> 
+
+Copyright:
+
+;;; Copyright (C) 1996 by Ashvin Goel
+;;;
+;;; This file is under the Gnu Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL'.

=== added file 'debian/emacsen-install'
--- debian/emacsen-install	1970-01-01 00:00:00 +0000
+++ debian/emacsen-install	2009-06-07 07:47:51 +0000
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+set -e
+
+PACKAGE=
+[ "$PACKAGE" ]
+
+FLAVOR="$1"
+
+EFLAGS="-batch -q -l lpath.el -f batch-byte-compile"
+
+inst () {
+    echo -n "install/$PACKAGE: Byte-compiling for ${FLAVOR}..."
+
+    install -m 755 -d "/usr/share/$FLAVOR/site-lisp/$PACKAGE/"
+
+    cp /usr/share/emacs/site-lisp/records/records-index.el \
+	/usr/share/emacs/site-lisp/records/records-dindex.el \
+	/usr/share/emacs/site-lisp/records/records-util.el \
+	/usr/share/emacs/site-lisp/records/records-vars.el \
+	/usr/share/emacs/site-lisp/records/records-autoloads.el \
+	/usr/share/emacs/site-lisp/records/records-search.el \
+	/usr/share/emacs/site-lisp/records/records.el \
+	"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/"
+    cat <<-EOF >"/usr/share/$FLAVOR/site-lisp/$PACKAGE/lpath.el"
+		(setq load-path (cons nil load-path))
+	EOF
+	(cd "/usr/share/$FLAVOR/site-lisp/$PACKAGE/" \
+	    && "$FLAVOR" $EFLAGS \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records.el" \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records-index.el" \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records-dindex.el" \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records-util.el" \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records-autoloads.el" \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records-vars.el" \
+		"/usr/share/${FLAVOR}/site-lisp/$PACKAGE/records-search.el" \
+	    >CompilationLog 2>&1)
+	gzip -9qf "/usr/share/$FLAVOR/site-lisp/$PACKAGE/CompilationLog"
+	rm -f "/usr/share/$FLAVOR/site-lisp/$PACKAGE"/*.el
+	echo "done."
+}
+
+case "$PACKAGE" in
+    records-gnuemacs)
+	case "$FLAVOR" in
+	    emacs)
+		;;
+	    emacs21)
+		inst
+		;;
+	    *)
+		;;
+	esac
+	;;
+
+    records-xemacs)
+	case "$FLAVOR" in
+	    emacs)
+		;;
+	    xemacs21)
+		inst
+		;;
+	    *)
+		;;
+	esac
+	;;
+
+    *)
+	echo "install/records: ERROR! Unknown package $PACKAGE." 1>&2
+	exit 2
+	;;
+esac
+
+exit 0;

=== added file 'debian/emacsen-remove'
--- debian/emacsen-remove	1970-01-01 00:00:00 +0000
+++ debian/emacsen-remove	2009-06-07 07:47:51 +0000
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+set -e
+
+PACKAGE=
+[ "$PACKAGE" ]
+
+FLAVOR="$1"
+echo "remove/$PACKAGE: Handling removal of emacsen flavor $FLAVOR"
+
+
+remove () {
+    echo -n "records: purging byte-compiled files for ${FLAVOR}..."
+    rm -f "/usr/share/$FLAVOR/site-lisp/$PACKAGE/records-index.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/records-autoloads.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/records-dindex.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/records-util.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/records-vars.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/records-search.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/records.elc" \
+	"/usr/share/$FLAVOR/site-lisp/$PACKAGE/CompilationLog.gz"
+    rmdir "/usr/share/$FLAVOR/site-lisp/$PACKAGE" || true
+    echo "done."
+}
+
+case "$PACKAGE" in
+    records-gnuemacs)
+	case "$FLAVOR" in
+	    emacs)
+		;;
+	    emacs21)
+		remove
+		;;
+	    *)
+		;;
+	esac
+	;;
+
+    records-xemacs)
+	case "$FLAVOR" in
+	    emacs)
+		;;
+	    xemacs21)
+		remove
+		;;
+	    *)
+		;;
+	esac
+	;;
+
+    *)
+	echo "remove/records: ERROR! Unknown package $PACKAGE." 1>&2
+	exit 2
+	;;
+esac
+
+exit 0;

=== added file 'debian/emacsen-startup'
--- debian/emacsen-startup	1970-01-01 00:00:00 +0000
+++ debian/emacsen-startup	2009-06-07 07:47:51 +0000
@@ -0,0 +1,32 @@
+;; 
+;; /etc/emacs/site-start.d/50records.el
+;;
+
+; Define key bindings for functions called from outside records mode
+
+; The preferred binding for records-goto-today - uncomment to use it
+(define-key global-map [?\C-c ?n] 'records-goto-today)
+(define-key global-map [?\C-c ?-] 'records-underline-line)
+
+; The Ctrl-x n map
+(define-key global-map [?\C-x ?n ?t] 'records-goto-today)
+(define-key global-map [?\C-x ?n ?r] 'records-insert-record-region)
+(define-key global-map [?\C-x ?n ?b] 'records-insert-record-buffer)
+
+
+; Hook up to the calendar mode
+(add-hook 'calendar-load-hook 
+	  (function
+	   (lambda ()
+	     (define-key calendar-mode-map "n" 'records-calendar-to-record))))
+
+;;;*** OPTIONAL ***;;;
+
+; If you like abbrev mode 
+;(add-hook 'records-mode-hooks
+;    (function
+;     (lambda ()
+;       (abbrev-mode 1))))
+
+; If you want to be brought to today's record on startup
+;(records-goto-today)

=== added file 'debian/info'
--- debian/info	1970-01-01 00:00:00 +0000
+++ debian/info	2009-06-07 07:47:51 +0000
@@ -0,0 +1,15 @@
+# This is a configuration files for installing a .info menu
+# The Description to be placed into the directory
+DESCR="Description"
+
+# The section this info file should be placed in (Regexp) followed by
+# the new section name to be created if the Regexp does not match
+# (Optional. If not given the .info will be appended to the directory)
+SECTION_MATCH="General Commands"
+SECTION_NAME="General Commands"
+
+# The file referred to from the Info directory
+FILE=records.info
+
+# Optional. The files to be copied to /usr/info
+#FILES=*.info

=== added file 'debian/postinst-emacsen'
--- debian/postinst-emacsen	1970-01-01 00:00:00 +0000
+++ debian/postinst-emacsen	2009-06-07 07:47:51 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+PACKAGE=
+[ "$PACKAGE" ]
+
+if [ "$1" = "configure" -a -x /usr/lib/emacsen-common/emacs-package-install ]
+then
+        /usr/lib/emacsen-common/emacs-package-install "$PACKAGE"
+fi
+
+if [ "$1" = "configure" ]; then
+        if [ -d /usr/doc -a -h /usr/doc/$PACKAGE -a -d /usr/share/doc/$PACKAGE ]; then
+                rm -f /usr/doc/$PACKAGE 
+        fi
+fi
+
+#DEBHELPER#
+

=== added file 'debian/postinst.records-common'
--- debian/postinst.records-common	1970-01-01 00:00:00 +0000
+++ debian/postinst.records-common	2009-06-07 07:47:51 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+PACKAGE=
+[ "$PACKAGE" ]
+
+if [ "$1" = "configure" ]; then
+	if [ -d /usr/doc -a -h /usr/doc/$PACKAGE -a -d /usr/share/doc/$PACKAGE ]; then
+		rm -f /usr/doc/$PACKAGE
+	fi
+
+	install-info --quiet --section "Emacs" "Emacs" \
+	    --description="Major mode for editing and indexing notes" \
+	    /usr/share/info/records.info
+fi

=== added file 'debian/prerm-emacsen'
--- debian/prerm-emacsen	1970-01-01 00:00:00 +0000
+++ debian/prerm-emacsen	2009-06-07 07:47:51 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+PACKAGE=
+[ "$PACKAGE" ]
+
+if [ -x /usr/lib/emacsen-common/emacs-package-remove ] ; then
+        /usr/lib/emacsen-common/emacs-package-remove "$PACKAGE"
+fi
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
+    -a -L /usr/doc/$PACKAGE ]; then
+        rm -f /usr/doc/$PACKAGE
+fi

=== added file 'debian/prerm.records-common'
--- debian/prerm.records-common	1970-01-01 00:00:00 +0000
+++ debian/prerm.records-common	2009-06-07 07:47:51 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+PACKAGE=
+[ "$PACKAGE" ]
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
+    -a -L /usr/doc/$PACKAGE ]; then
+        rm -f /usr/doc/$PACKAGE
+fi
+
+install-info --quiet --remove /usr/share/info/records.info
+

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2009-06-07 09:26:10 +0000
@@ -0,0 +1,143 @@
+#!/usr/bin/make -f
+
+INST=debian/inst
+
+testdir:
+	test -e debian/control
+
+testroot:
+	test root = "`whoami`" || (echo need root priviledges; exit 1)
+
+test: testdir testroot
+
+Makefile: Makefile.in configure
+	./configure --prefix=/usr
+
+info: doc/Makefile.in
+	-$(MAKE) info
+
+ps: doc/Makefile.in
+	-$(MAKE) ps
+
+config: testdir Makefile
+
+build: testdir config info ps
+
+clean: test
+	-$(MAKE) clean
+	rm -f recordsadmin config.log config.cache config.status Makefile
+	rm -rf debian/files debian/substvars $(INST)
+
+install-records-common: test build
+	install -d -m0755 \
+		$(INST)/records-common/usr/bin \
+		$(INST)/records-common/usr/share/emacs/site-lisp/records \
+		$(INST)/records-common/usr/share/info \
+		$(INST)/records-common/usr/share/doc/records-common/examples \
+		$(INST)/records-common/usr/share/man/man1
+	install -m0644 doc/records.info \
+		$(INST)/records-common/usr/share/info/records.info
+	install -m0755 src/recordsadmin $(INST)/records-common/usr/bin
+	install -m0644 \
+		FAQ INSTALL README debian/README.Debian \
+		debian/copyright \
+		$(INST)/records-common/usr/share/doc/records-common
+	install -m0644 \
+		debian/changelog \
+		$(INST)/records-common/usr/share/doc/records-common/changelog.Debian
+	install -m0644 \
+		NEWS \
+		ChangeLog \
+		doc/records.ps \
+		$(INST)/records-common/usr/share/doc/records-common
+	install -m0644 \
+		src/records-templ.tex \
+		$(INST)/records-common/usr/share/doc/records-common/examples
+	find $(INST)/records-common/usr/share/doc/records-common \
+		-type f -a \! -name '*.gz' -a \! -name 'copyright' -print0 \
+		| xargs -0 --no-run-if-empty gzip -9f --
+	install -m0644 src/records-autoloads.el src/records-dindex.el	\
+		src/records.el src/records.el src/records-index.el      \
+		src/records-load.el src/records-pkg.el 			\
+		src/records-search.el src/records-tex.el 		\
+		src/records-util.el src/records-vars.el			\
+		src/records-version.el
+		$(INST)/records-common/usr/share/emacs/site-lisp/records
+
+install-records-gnuemacs: test build
+	install -d -m0755 $(INST)/records-gnuemacs/usr/share/doc
+	ln -sf records-common $(INST)/records-gnuemacs/usr/share/doc/records-gnuemacs
+
+install-records-xemacs: test build
+	install -d -m0755 $(INST)/records-xemacs/usr/share/doc
+	ln -sf records-common $(INST)/records-xemacs/usr/share/doc/records-xemacs
+
+install: \
+	install-records-common \
+	install-records-gnuemacs \
+	install-records-xemacs
+
+make-maintscripts-%:
+	@[ ! -e "debian/prerm.$*" ] || $(call SED_INSTALL,$*,debian/prerm.$*,$(INST)/$*/DEBIAN/prerm,0755)
+	@[ ! -e "debian/postinst.$*" ] || $(call SED_INSTALL,$*,debian/postinst.$*,$(INST)/$*/DEBIAN/postinst,0755)
+
+make-debian-%:
+	install -d -m0755 $(INST)/$*/DEBIAN
+
+make-package-%:
+	set -e; if [ -d $(INST)/$*/etc ]; then \
+		cd $(INST)/$* && find ./etc -type f \
+		| sed 's/^\.//g' >DEBIAN/conffiles.tmp ;\
+		chmod 0644 DEBIAN/conffiles.tmp ;\
+		mv DEBIAN/conffiles.tmp DEBIAN/conffiles ;\
+	fi
+	dpkg-gencontrol -isp -p$* -P$(INST)/$*
+	dpkg --build $(INST)/$* ..
+
+# $(call SED_INSTALL,package,from,to,mode)
+SED_INSTALL = \
+	echo "sed_install PACKAGE=$(1) $(2) $(3)" ;\
+	set -e ;\
+	sed 's/^PACKAGE=.*/PACKAGE=$(1)/' <$(2) >$(3).tmp ;\
+	chmod $(4) $(3).tmp ;\
+	mv $(3).tmp $(3)
+
+make-emacsen-%:
+	install -d \
+		$(INST)/records-$*/usr/lib/emacsen-common/packages/install \
+		$(INST)/records-$*/usr/lib/emacsen-common/packages/remove \
+		$(INST)/records-$*/etc/emacs/site-start.d
+
+	@$(call SED_INSTALL,records-$*,debian/emacsen-install,$(INST)/records-$*/usr/lib/emacsen-common/packages/install/records-$*,0755)
+	@$(call SED_INSTALL,records-$*,debian/emacsen-remove,$(INST)/records-$*/usr/lib/emacsen-common/packages/remove/records-$*,0755)
+	@$(call SED_INSTALL,records-$*,debian/emacsen-startup,$(INST)/records-$*/etc/emacs/site-start.d/50records-$*.el,0644)
+
+	@$(call SED_INSTALL,records-$*,debian/postinst-emacsen,$(INST)/records-$*/DEBIAN/postinst,0755)
+	@$(call SED_INSTALL,records-$*,debian/prerm-emacsen,$(INST)/records-$*/DEBIAN/prerm,0755)
+
+binary-indep-records-common: test install-records-common \
+		make-debian-records-common \
+		make-maintscripts-records-common \
+		make-package-records-common
+
+binary-indep-records-gnuemacs: test install-records-gnuemacs \
+		make-debian-records-gnuemacs make-emacsen-gnuemacs \
+		make-package-records-gnuemacs
+
+binary-indep-records-xemacs: test install-records-xemacs \
+		make-debian-records-xemacs \
+		make-emacsen-xemacs \
+		make-package-records-xemacs
+
+binary-indep: binary-indep-records-common \
+	binary-indep-records-gnuemacs binary-indep-records-xemacs
+
+binary-arch:
+
+binary: binary-indep binary-arch
+
+.PHONY: testdir testroot test config info ps build clean \
+	install-records-common install-records-gnuemacs \
+	install-records-xemacs install binary-indep-records-common \
+	binary-indep-records-gnuemacs binary-indep-records-xemacs \
+	binary-indep binary-arch binary