Debian Emacs Devel Commit: rev 54 - emacs21/pkg/trunk/debian

[Rob Browning]

Author: rlb
Date: 2004-02-28 00:13:48 +0100 (Sat, 28 Feb 2004)
New Revision: 54

Modified:
   emacs21/pkg/trunk/debian/changelog
   emacs21/pkg/trunk/debian/rules
Log:
* fixup latest debian/changelog entries to match Jerome's style.
* make sure bin/emacs doesn't end up in emacsXY-bin-common.


Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-02-26 23:27:23 UTC (rev 53)
+++ emacs21/pkg/trunk/debian/changelog	2004-02-27 23:13:48 UTC (rev 54)
@@ -46,37 +46,37 @@
 
   * test -n "${major_ver}" in a few places so that we don't accidentally
     generate bad output files from our .in files. [rlb]
-    - (debian/rules)
+    - debian/rules
 
   * truncate aclocal.m4 during autofiles-sync so that old bits won't kill new
     autoconf run.  Also ignore autom4te.cache when generating
     autofiles.diff. [rlb]
-    - (debian/rules)
+    - debian/rules
   
   * fix bug in prepare-release autodiff prompt handling. [rlb]
-    - (debian/rules)
+    - debian/rules
 
   * update configure.in for newer autoconf versions. [rlb]
-    - (autoconf-updates.dpatch)
+    - autoconf-updates.dpatch
 
   * add an emacsXY-bin-common package containing all the architecture
     specific bits, so that emacsXY-common can be architecture independent.
     This should save many megabytes * architectures in the debian pool.
     [rlb] (closes: #232888, #233345)
-    - (debian/rules): move some build-* code from debian/ scripts to rules
+    - debian/rules: move some build-* code from debian/ scripts to rules
       and adjust to build emacsXY-bin-common.
-    - (debian/emacs-common.postinst debian/emacs-common.prerm): some code
+    - debian/emacs-common.postinst debian/emacs-common.prerm: some code
       moved to new emacs-bin-common scripts.
-    - (debian/emacs-common.postrm): deleted.
-    - (debian/emacs-bin-common.postinst): new file.
-    - (debian/emacs-bin-common.prerm): new file.
-    - (debian/emacs-bin-common.postrm): new file.
-    - (debian/build-common-pkg): deleted - code now in debian/rules.
-    - (debian/build--pkg): deleted - code now in debian/rules.
-    - (debian/emacs-el.postinst): deleted - was empty.
-    - (debian/control.in): add emacsXY-bin-common and adjust other entries.
-    - (debian/fix-debian-scripts): deleted - no longer used.
-    - (debian/build-binary-pkg): adjusted to handle more of the common code.
+    - debian/emacs-common.postrm: deleted.
+    - debian/emacs-bin-common.postinst: new file.
+    - debian/emacs-bin-common.prerm: new file.
+    - debian/emacs-bin-common.postrm: new file.
+    - debian/build-common-pkg: deleted - code now in debian/rules.
+    - debian/build--pkg: deleted - code now in debian/rules.
+    - debian/emacs-el.postinst: deleted - was empty.
+    - debian/control.in: add emacsXY-bin-common and adjust other entries.
+    - debian/fix-debian-scripts: deleted - no longer used.
+    - debian/build-binary-pkg: adjusted to handle more of the common code.
   
  -- Rob Browning <rlb@defaultvalue.org>  Thu, 26 Feb 2004 12:13:50 -0600
 

Modified: emacs21/pkg/trunk/debian/rules
===================================================================
--- emacs21/pkg/trunk/debian/rules	2004-02-26 23:27:23 UTC (rev 53)
+++ emacs21/pkg/trunk/debian/rules	2004-02-27 23:13:48 UTC (rev 54)
@@ -684,6 +684,7 @@
         # make sure it's only one file
 	test -f debian/pkg-bin-common/usr/bin/emacs-*
 	rm debian/pkg-bin-common/usr/bin/emacs-*
+	rm debian/pkg-bin-common/usr/bin/emacs
 	cd debian/pkg-bin-common/usr/lib/emacs/${runtime_ver}/${target}/ \
 	  && test `ls fns-*.el | wc -l` -eq 1 \
 	  && rm fns-*.el