[emacs21 commit] cdf31d2060fbe53e94c9b621ee08f872e5c905d2
Jérôme Marant
jerome at marant.org
Fri Oct 6 18:00:24 UTC 2006
commit cdf31d2060fbe53e94c9b621ee08f872e5c905d2
Author: Jérôme Marant <jerome at marant.org>
Date: Fri Oct 6 20:00:24 2006 +0200
Add a new dummy `emacs' package which depends on the latest
Emacs release
diff --git a/changelog b/changelog
index 9b749e2..bde73ea 100644
--- a/changelog
+++ b/changelog
@@ -30,7 +30,15 @@ emacs21 (21.4a+1-1) unstable; urgency=lo
* Bump Standards-Version to 3.7.2 [Jérôme Marant]
- debian/control.in
- -- Jerome Marant <jerome at debian.org> Wed, 4 Oct 2006 11:09:43 +0200
+ * Add a new dummy `emacs' package which depends on the latest
+ Emacs release (closes: #82687)
+ - debian/control.in: added new entry for `emacs' package.
+ - debian/control: re-generated.
+ - debian/emacs.*: renamed to debian/emacsVER.*
+ - debian/emacs-*.*: renamed to debian/emacsVER-*.*
+ - debian/rules: changed accordingly.
+
+ -- Jerome Marant <jerome at debian.org> Fri, 6 Oct 2006 19:30:06 +0200
emacs21 (21.4a-6.2) unstable; urgency=low
diff --git a/control b/control
index fec016a..4415533 100644
--- a/control
+++ b/control
@@ -6,6 +6,17 @@ Uploaders: Jerome Marant <jerome at debian.
Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 4), libxaw7-dev, sharutils
Standards-Version: 3.7.2
+Package: emacs
+Section: editors
+Priority: optional
+Architecture: all
+Depends: emacs21 | emacs21-nox
+Provides: emacsen, editor, info-browser, mail-reader, news-reader
+Description: The GNU Emacs editor
+ GNU Emacs is the extensible self-documenting text editor.
+ This package is a dummy package depending on the lastest
+ Emacs release.
+
Package: emacs21
Section: editors
Priority: optional
diff --git a/control.in b/control.in
index 8e4fcb4..b12db8c 100644
--- a/control.in
+++ b/control.in
@@ -6,6 +6,17 @@ Uploaders: Jerome Marant <jerome at debian.
Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 4), libxaw7-dev, sharutils
Standards-Version: 3.7.2
+Package: emacs
+Section: editors
+Priority: optional
+Architecture: all
+Depends: emacs at MAJOR_VERSION@ | emacs at MAJOR_VERSION@-nox
+Provides: emacsen, editor, info-browser, mail-reader, news-reader
+Description: The GNU Emacs editor
+ GNU Emacs is the extensible self-documenting text editor.
+ This package is a dummy package depending on the lastest
+ Emacs release.
+
Package: emacs at MAJOR_VERSION@
Section: editors
Priority: optional
diff --git a/emacs-bin-common.postinst b/emacs-bin-common.postinst
deleted file mode 100644
index f82bfb6..0000000
--- a/emacs-bin-common.postinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-INFOFILES="@INFOFILES@"
-ALTERNATIVES="@ALTERNATIVES@"
-
-PRIORITY=24
-
-# update-alternatives on things that collide with xemacs, other editors
-for i in ctags etags emacsclient
-do
- update-alternatives \
- --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} ${PRIORITY} \
- --slave /usr/share/man/man1/$i.1.gz $i.1.gz \
- /usr/share/man/man1/$i.1emacs${MAJOR}.gz
-done
-
-for i in ${ALTERNATIVES}
-do
- test $i = ctags && continue
- test $i = etags && continue
- test $i = emacs && continue
- test $i = emacsclient && continue
- update-alternatives --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} \
- ${PRIORITY}
-done
-
-#DEBHELPER#
-
diff --git a/emacs-bin-common.postrm b/emacs-bin-common.postrm
deleted file mode 100644
index 27efdc3..0000000
--- a/emacs-bin-common.postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-MOVEMAIL_BIN=@MOVEMAIL_BIN@
-
-# Legacy removal...
-if [ -e /etc/suid.conf -a -x /usr/sbin/suidunregister ]; then
- suidunregister -s emacs${MAJOR} ${MOVEMAIL_BIN}
-fi
-
-#DEBHELPER#
-
diff --git a/emacs-bin-common.prerm b/emacs-bin-common.prerm
deleted file mode 100644
index ba3ab86..0000000
--- a/emacs-bin-common.prerm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-INFOFILES="@INFOFILES@"
-ALTERNATIVES="@ALTERNATIVES@"
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
-then
- rm -f /usr/doc/@PKG_NAME@
-fi
-
-# update-alternatives on things that collide with xemacs, other editors
-if [ "$1" != "upgrade" ]
-then
- for i in ${ALTERNATIVES}
- do
- test $i = emacs && continue
- update-alternatives --remove $i /usr/bin/$i.emacs${MAJOR}
- done
-fi
-
-#DEBHELPER#
-
diff --git a/emacs-common.README b/emacs-common.README
deleted file mode 100644
index 76d3fa8..0000000
--- a/emacs-common.README
+++ /dev/null
@@ -1,35 +0,0 @@
-This file details the Debian specific changes to Emacs.
-
-* The Debian copy of the upstream source contains no .elc files.
-
- The .elc files have been removed because we always regenerate them
- and because Emacs modifies them in the source tree during the build
- process, even when using a VPATH build. This means that a "make
- clean" can't easily return the tree to the upstream state, resulting
- in a giant Debian binary diff. There are other solutions if this
- turns out to be a problem. If nothing else, we can keep the current
- infrastructure and just add the .elc files to protected_files in
- debian/rules. Removing the .elc files doesn't affect whether or not
- our source archive would match the upstream md5sum because we have
- to repackage it anyway to add leim support.
-
-* The etc/yow.lines file has been updated from the upstream development tree.
-
-The etc/yow.lines file in the Debian package is newer than the one in
-the original distribution. It has been copied from the upstream Emacs
-development tree.
-
-* The -i icon is the Emacs GNU.
-
-* Those who prefer the old-style scrollbars can edit debian/rules
-
- If you prefer the old-style, non-toolkit scrollbars, just edit
- debian/rules to uncomment the --without-toolkit-scrollbars line and
- rebuild.
-
-@@PATCH_LIST_HERE@@
-
-Local Variables:
-mode: outline
-outline-regexp: " *\\*+"
-End:
diff --git a/emacs-common.docs b/emacs-common.docs
deleted file mode 100644
index 8b0bc59..0000000
--- a/emacs-common.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-BUGS
-README
-debian/README.add-on-package-maintainers
diff --git a/emacs-common.postinst b/emacs-common.postinst
deleted file mode 100644
index e36a9ca..0000000
--- a/emacs-common.postinst
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-INFOFILES="@INFOFILES@"
-
-PRIORITY=24
-
-# Fix from Manoj so we don't clean up more than we should.
-if [ -f /usr/share/info/gnus.gz ]; then
- CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms info mh-e reftex sc \
- vip viper widget"
-else
- CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms gnus info message \
- mh-e reftex sc vip viper widget"
-fi
-
-# We have to clean these up because the old package didn't. The info
-# files were being removed in the postinst, not the prerm, and so
-# install-info wasn't doing anything because the files weren't there..
-for file in ${CRUFT_INFOFILES}
-do
- install-info --quiet --remove-exactly ${file} || true
-done
-
-for file in ${INFOFILES}
-do
- install-info --quiet --section Emacs Emacs \
- /usr/share/info/emacs-${MAJOR}/${file}.gz || true
-done
-
-# Create the site-lisp dir for this flavor if we're allowed
-
-#### Begin Bug fix hack for old emacs20 package brain damage.
-#
-# We have to handle /usr/local/share and /usr/local/share/emacs here
-# because emacs20 used to contain /usr/local/share :< . Normally
-# these dirs should have been handled exclusively by emacsen-common.
-
-parentdir=/usr/local
-newdir=share
-
-if [ -d ${parentdir} ]
-then
- if mkdir ${parentdir}/${newdir} 2>/dev/null
- then
- chown root:staff ${parentdir}/${newdir}
- chmod 2775 ${parentdir}/${newdir}
- fi
-fi
-
-parentdir=/usr/local/share
-newdir=emacs
-
-if [ -d ${parentdir} ]
-then
- if mkdir ${parentdir}/${newdir} 2>/dev/null
- then
- chown root:staff ${parentdir}/${newdir}
- chmod 2775 ${parentdir}/${newdir}
- fi
-fi
-
-parentdir=/usr/local/share/emacs
-newdir=site-lisp
-
-if [ -d ${parentdir} ]
-then
- if mkdir ${parentdir}/${newdir} 2>/dev/null
- then
- chown root:staff ${parentdir}/${newdir}
- chmod 2775 ${parentdir}/${newdir}
- fi
-fi
-
-#### End Bug fix hack for old emacs20 package brain damage.
-
-
-parentdir=/usr/local/share/emacs
-newdir=${FULL}
-
-if [ -d ${parentdir} ]
-then
- if mkdir ${parentdir}/${newdir} 2>/dev/null
- then
- chown root:staff ${parentdir}/${newdir}
- chmod 2775 ${parentdir}/${newdir}
- fi
-fi
-
-parentdir=/usr/local/share/emacs/${FULL}
-newdir=site-lisp
-
-if [ -d ${parentdir} ]
-then
- if mkdir ${parentdir}/${newdir} 2>/dev/null
- then
- chown root:staff ${parentdir}/${newdir}
- chmod 2775 ${parentdir}/${newdir}
- fi
-fi
-
-# emacsen-common/emacs-install used to be here.
-
-#DEBHELPER#
diff --git a/emacs-common.prerm b/emacs-common.prerm
deleted file mode 100644
index 7a27550..0000000
--- a/emacs-common.prerm
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-INFOFILES="@INFOFILES@"
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
-then
- rm -f /usr/doc/@PKG_NAME@
-fi
-
-for file in ${INFOFILES}
-do
- install-info --quiet --remove-exactly emacs-${MAJOR}/${file} || true
-done
-
-# emacsen-common/emacs-remove used to be here.
-
-(rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null && \
- rmdir /usr/local/share/emacs/${FULL} 2>/dev/null) || true
-
-#DEBHELPER#
diff --git a/emacs-el.prerm b/emacs-el.prerm
deleted file mode 100644
index 57b6e8d..0000000
--- a/emacs-el.prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/emacs${MAJOR}-el ]
-then
- rm -f /usr/doc/emacs${MAJOR}-el
-fi
-
-#DEBHELPER#
diff --git a/emacs.README b/emacs.README
deleted file mode 100644
index ceef862..0000000
--- a/emacs.README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Please see /usr/share/doc/emacs at MAJOR_VERSION@-common/ as the primary
-documentation directory.
diff --git a/emacs.desktop b/emacs.desktop
deleted file mode 100644
index 6392978..0000000
--- a/emacs.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Emacs @MAJOR_VERSION@ (X11)
-GenericName=Emacs
-Comment=GNU Emacs @MAJOR_VERSION@ Text Editor
-Exec=/usr/bin/emacs at MAJOR_VERSION@ -i
-TryExec=emacs at MAJOR_VERSION@
-Terminal=false
-Type=Application
-Icon=/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm
-Categories=Application;Utility;TextEditor;
-MimeType=text/plain
diff --git a/emacs.menu b/emacs.menu
deleted file mode 100644
index 7412c21..0000000
--- a/emacs.menu
+++ /dev/null
@@ -1,15 +0,0 @@
-?package(@PKG_NAME@):\
- needs="X11"\
- section="Apps/Editors"\
- title="Emacs @MAJOR_VERSION@ (X11)"\
- command="/usr/bin/emacs at MAJOR_VERSION@ -i"\
- icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
- hints="Text"
-
-?package(@PKG_NAME@):\
- needs="text"\
- section="Apps/Editors"\
- title="Emacs @MAJOR_VERSION@ (text)"\
- command="/usr/bin/emacs at MAJOR_VERSION@ -nw"\
- icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
- hints="Text"
diff --git a/emacs.postinst b/emacs.postinst
deleted file mode 100644
index 1e1c582..0000000
--- a/emacs.postinst
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-
-update-alternatives \
- --install /usr/bin/emacs emacs \
- /usr/bin/emacs${MAJOR}- at X_SUPPORT@ @BIN_PRIORITY@ \
- --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
- /usr/share/man/man1/emacs.1emacs${MAJOR}.gz
-
-update-alternatives \
- --install /usr/bin/editor editor \
- /usr/bin/emacs${MAJOR} 0 \
- --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
- /usr/share/man/man1/emacs.1emacs${MAJOR}.gz
-
-# emacsen-common registration.
-/usr/lib/emacsen-common/emacs-install emacs${MAJOR}
-
-#DEBHELPER#
-
diff --git a/emacs.postrm b/emacs.postrm
deleted file mode 100644
index c1fc8b9..0000000
--- a/emacs.postrm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
diff --git a/emacs.preinst b/emacs.preinst
deleted file mode 100644
index 1e75dfc..0000000
--- a/emacs.preinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-
-#DEBHELPER#
-
diff --git a/emacs.prerm b/emacs.prerm
deleted file mode 100644
index 079218b..0000000
--- a/emacs.prerm
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
-then
- rm -f /usr/doc/@PKG_NAME@
-fi
-
-# update-alternatives on things that collide with xemacs, other editors
-if [ "$1" != "upgrade" ]
-then
- update-alternatives --remove emacs /usr/bin/emacs${MAJOR}- at X_SUPPORT@
- update-alternatives --remove editor /usr/bin/emacs${MAJOR}
-fi
-
-# emacsen-common registration.
-/usr/lib/emacsen-common/emacs-remove emacs${MAJOR}
-
-#DEBHELPER#
-
diff --git a/emacsVER-bin-common.postinst b/emacsVER-bin-common.postinst
new file mode 100644
index 0000000..f82bfb6
--- /dev/null
+++ b/emacsVER-bin-common.postinst
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+ALTERNATIVES="@ALTERNATIVES@"
+
+PRIORITY=24
+
+# update-alternatives on things that collide with xemacs, other editors
+for i in ctags etags emacsclient
+do
+ update-alternatives \
+ --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} ${PRIORITY} \
+ --slave /usr/share/man/man1/$i.1.gz $i.1.gz \
+ /usr/share/man/man1/$i.1emacs${MAJOR}.gz
+done
+
+for i in ${ALTERNATIVES}
+do
+ test $i = ctags && continue
+ test $i = etags && continue
+ test $i = emacs && continue
+ test $i = emacsclient && continue
+ update-alternatives --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} \
+ ${PRIORITY}
+done
+
+#DEBHELPER#
+
diff --git a/emacsVER-bin-common.postrm b/emacsVER-bin-common.postrm
new file mode 100644
index 0000000..27efdc3
--- /dev/null
+++ b/emacsVER-bin-common.postrm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+MOVEMAIL_BIN=@MOVEMAIL_BIN@
+
+# Legacy removal...
+if [ -e /etc/suid.conf -a -x /usr/sbin/suidunregister ]; then
+ suidunregister -s emacs${MAJOR} ${MOVEMAIL_BIN}
+fi
+
+#DEBHELPER#
+
diff --git a/emacsVER-bin-common.prerm b/emacsVER-bin-common.prerm
new file mode 100644
index 0000000..ba3ab86
--- /dev/null
+++ b/emacsVER-bin-common.prerm
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+ALTERNATIVES="@ALTERNATIVES@"
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
+then
+ rm -f /usr/doc/@PKG_NAME@
+fi
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != "upgrade" ]
+then
+ for i in ${ALTERNATIVES}
+ do
+ test $i = emacs && continue
+ update-alternatives --remove $i /usr/bin/$i.emacs${MAJOR}
+ done
+fi
+
+#DEBHELPER#
+
diff --git a/emacsVER-common.README b/emacsVER-common.README
new file mode 100644
index 0000000..76d3fa8
--- /dev/null
+++ b/emacsVER-common.README
@@ -0,0 +1,35 @@
+This file details the Debian specific changes to Emacs.
+
+* The Debian copy of the upstream source contains no .elc files.
+
+ The .elc files have been removed because we always regenerate them
+ and because Emacs modifies them in the source tree during the build
+ process, even when using a VPATH build. This means that a "make
+ clean" can't easily return the tree to the upstream state, resulting
+ in a giant Debian binary diff. There are other solutions if this
+ turns out to be a problem. If nothing else, we can keep the current
+ infrastructure and just add the .elc files to protected_files in
+ debian/rules. Removing the .elc files doesn't affect whether or not
+ our source archive would match the upstream md5sum because we have
+ to repackage it anyway to add leim support.
+
+* The etc/yow.lines file has been updated from the upstream development tree.
+
+The etc/yow.lines file in the Debian package is newer than the one in
+the original distribution. It has been copied from the upstream Emacs
+development tree.
+
+* The -i icon is the Emacs GNU.
+
+* Those who prefer the old-style scrollbars can edit debian/rules
+
+ If you prefer the old-style, non-toolkit scrollbars, just edit
+ debian/rules to uncomment the --without-toolkit-scrollbars line and
+ rebuild.
+
+@@PATCH_LIST_HERE@@
+
+Local Variables:
+mode: outline
+outline-regexp: " *\\*+"
+End:
diff --git a/emacsVER-common.docs b/emacsVER-common.docs
new file mode 100644
index 0000000..8b0bc59
--- /dev/null
+++ b/emacsVER-common.docs
@@ -0,0 +1,3 @@
+BUGS
+README
+debian/README.add-on-package-maintainers
diff --git a/emacsVER-common.postinst b/emacsVER-common.postinst
new file mode 100644
index 0000000..e36a9ca
--- /dev/null
+++ b/emacsVER-common.postinst
@@ -0,0 +1,106 @@
+#!/bin/sh -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+
+PRIORITY=24
+
+# Fix from Manoj so we don't clean up more than we should.
+if [ -f /usr/share/info/gnus.gz ]; then
+ CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms info mh-e reftex sc \
+ vip viper widget"
+else
+ CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms gnus info message \
+ mh-e reftex sc vip viper widget"
+fi
+
+# We have to clean these up because the old package didn't. The info
+# files were being removed in the postinst, not the prerm, and so
+# install-info wasn't doing anything because the files weren't there..
+for file in ${CRUFT_INFOFILES}
+do
+ install-info --quiet --remove-exactly ${file} || true
+done
+
+for file in ${INFOFILES}
+do
+ install-info --quiet --section Emacs Emacs \
+ /usr/share/info/emacs-${MAJOR}/${file}.gz || true
+done
+
+# Create the site-lisp dir for this flavor if we're allowed
+
+#### Begin Bug fix hack for old emacs20 package brain damage.
+#
+# We have to handle /usr/local/share and /usr/local/share/emacs here
+# because emacs20 used to contain /usr/local/share :< . Normally
+# these dirs should have been handled exclusively by emacsen-common.
+
+parentdir=/usr/local
+newdir=share
+
+if [ -d ${parentdir} ]
+then
+ if mkdir ${parentdir}/${newdir} 2>/dev/null
+ then
+ chown root:staff ${parentdir}/${newdir}
+ chmod 2775 ${parentdir}/${newdir}
+ fi
+fi
+
+parentdir=/usr/local/share
+newdir=emacs
+
+if [ -d ${parentdir} ]
+then
+ if mkdir ${parentdir}/${newdir} 2>/dev/null
+ then
+ chown root:staff ${parentdir}/${newdir}
+ chmod 2775 ${parentdir}/${newdir}
+ fi
+fi
+
+parentdir=/usr/local/share/emacs
+newdir=site-lisp
+
+if [ -d ${parentdir} ]
+then
+ if mkdir ${parentdir}/${newdir} 2>/dev/null
+ then
+ chown root:staff ${parentdir}/${newdir}
+ chmod 2775 ${parentdir}/${newdir}
+ fi
+fi
+
+#### End Bug fix hack for old emacs20 package brain damage.
+
+
+parentdir=/usr/local/share/emacs
+newdir=${FULL}
+
+if [ -d ${parentdir} ]
+then
+ if mkdir ${parentdir}/${newdir} 2>/dev/null
+ then
+ chown root:staff ${parentdir}/${newdir}
+ chmod 2775 ${parentdir}/${newdir}
+ fi
+fi
+
+parentdir=/usr/local/share/emacs/${FULL}
+newdir=site-lisp
+
+if [ -d ${parentdir} ]
+then
+ if mkdir ${parentdir}/${newdir} 2>/dev/null
+ then
+ chown root:staff ${parentdir}/${newdir}
+ chmod 2775 ${parentdir}/${newdir}
+ fi
+fi
+
+# emacsen-common/emacs-install used to be here.
+
+#DEBHELPER#
diff --git a/emacsVER-common.prerm b/emacsVER-common.prerm
new file mode 100644
index 0000000..7a27550
--- /dev/null
+++ b/emacsVER-common.prerm
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
+then
+ rm -f /usr/doc/@PKG_NAME@
+fi
+
+for file in ${INFOFILES}
+do
+ install-info --quiet --remove-exactly emacs-${MAJOR}/${file} || true
+done
+
+# emacsen-common/emacs-remove used to be here.
+
+(rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null && \
+ rmdir /usr/local/share/emacs/${FULL} 2>/dev/null) || true
+
+#DEBHELPER#
diff --git a/emacsVER-el.prerm b/emacsVER-el.prerm
new file mode 100644
index 0000000..57b6e8d
--- /dev/null
+++ b/emacsVER-el.prerm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/emacs${MAJOR}-el ]
+then
+ rm -f /usr/doc/emacs${MAJOR}-el
+fi
+
+#DEBHELPER#
diff --git a/emacsVER.README b/emacsVER.README
new file mode 100644
index 0000000..ceef862
--- /dev/null
+++ b/emacsVER.README
@@ -0,0 +1,3 @@
+
+Please see /usr/share/doc/emacs at MAJOR_VERSION@-common/ as the primary
+documentation directory.
diff --git a/emacsVER.desktop b/emacsVER.desktop
new file mode 100644
index 0000000..6392978
--- /dev/null
+++ b/emacsVER.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Emacs @MAJOR_VERSION@ (X11)
+GenericName=Emacs
+Comment=GNU Emacs @MAJOR_VERSION@ Text Editor
+Exec=/usr/bin/emacs at MAJOR_VERSION@ -i
+TryExec=emacs at MAJOR_VERSION@
+Terminal=false
+Type=Application
+Icon=/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm
+Categories=Application;Utility;TextEditor;
+MimeType=text/plain
diff --git a/emacsVER.menu b/emacsVER.menu
new file mode 100644
index 0000000..7412c21
--- /dev/null
+++ b/emacsVER.menu
@@ -0,0 +1,15 @@
+?package(@PKG_NAME@):\
+ needs="X11"\
+ section="Apps/Editors"\
+ title="Emacs @MAJOR_VERSION@ (X11)"\
+ command="/usr/bin/emacs at MAJOR_VERSION@ -i"\
+ icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
+ hints="Text"
+
+?package(@PKG_NAME@):\
+ needs="text"\
+ section="Apps/Editors"\
+ title="Emacs @MAJOR_VERSION@ (text)"\
+ command="/usr/bin/emacs at MAJOR_VERSION@ -nw"\
+ icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
+ hints="Text"
diff --git a/emacsVER.postinst b/emacsVER.postinst
new file mode 100644
index 0000000..1e1c582
--- /dev/null
+++ b/emacsVER.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+
+update-alternatives \
+ --install /usr/bin/emacs emacs \
+ /usr/bin/emacs${MAJOR}- at X_SUPPORT@ @BIN_PRIORITY@ \
+ --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
+ /usr/share/man/man1/emacs.1emacs${MAJOR}.gz
+
+update-alternatives \
+ --install /usr/bin/editor editor \
+ /usr/bin/emacs${MAJOR} 0 \
+ --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
+ /usr/share/man/man1/emacs.1emacs${MAJOR}.gz
+
+# emacsen-common registration.
+/usr/lib/emacsen-common/emacs-install emacs${MAJOR}
+
+#DEBHELPER#
+
diff --git a/emacsVER.postrm b/emacsVER.postrm
new file mode 100644
index 0000000..c1fc8b9
--- /dev/null
+++ b/emacsVER.postrm
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
diff --git a/emacsVER.preinst b/emacsVER.preinst
new file mode 100644
index 0000000..1e75dfc
--- /dev/null
+++ b/emacsVER.preinst
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+
+#DEBHELPER#
+
diff --git a/emacsVER.prerm b/emacsVER.prerm
new file mode 100644
index 0000000..079218b
--- /dev/null
+++ b/emacsVER.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
+then
+ rm -f /usr/doc/@PKG_NAME@
+fi
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != "upgrade" ]
+then
+ update-alternatives --remove emacs /usr/bin/emacs${MAJOR}- at X_SUPPORT@
+ update-alternatives --remove editor /usr/bin/emacs${MAJOR}
+fi
+
+# emacsen-common registration.
+/usr/lib/emacsen-common/emacs-remove emacs${MAJOR}
+
+#DEBHELPER#
+
diff --git a/rules b/rules
index 138b2c1..34d241c 100755
--- a/rules
+++ b/rules
@@ -243,7 +243,7 @@ define checkdir
false; \
fi
dpkg-parsechangelog > /dev/null
- dh_testdir debian/emacs.postinst
+ dh_testdir debian/emacsVER.postinst
@if ! test -f src/emacs.c; \
then \
echo; \
@@ -470,20 +470,20 @@ debian-sync: $(persistent_autogen_files)
.PHONY: force-debian-sync debian-sync
debian/$(flavor)-common.README.Debian: \
- debian/emacs-common.README debian/patches/*.diff debian/patches/series
+ debian/emacsVER-common.README debian/patches/*.diff debian/patches/series
cd debian && \
- csplit -s -f emacs-common.README. \
- emacs-common.README '/@@PATCH_LIST_HERE@@/'
- cp debian/emacs-common.README.00 debian/emacs-common.README.tmp
+ csplit -s -f emacsVER-common.README. \
+ emacsVER-common.README '/@@PATCH_LIST_HERE@@/'
+ cp debian/emacsVER-common.README.00 debian/emacsVER-common.README.tmp
for p in $$(quilt series); do quilt header $$p; done \
- >> debian/emacs-common.README.tmp
+ >> debian/emacsVER-common.README.tmp
tail +2 \
- < debian/emacs-common.README.01 >> debian/emacs-common.README.tmp
- mv debian/emacs-common.README.tmp $@
+ < debian/emacsVER-common.README.01 >> debian/emacsVER-common.README.tmp
+ mv debian/emacsVER-common.README.tmp $@
-deb_trash += debian/emacs-common.README.tmp
-deb_trash += debian/emacs-common.README.00
-deb_trash += debian/emacs-common.README.01
+deb_trash += debian/emacsVER-common.README.tmp
+deb_trash += debian/emacsVER-common.README.00
+deb_trash += debian/emacsVER-common.README.01
debian/%: debian/%.in debian/changelog
$(call deb_sub,$(notdir $<),$(notdir $@))
@@ -596,6 +596,17 @@ define debinst_bin
endef
##################################################
+# emacs
+.PHONY: binary-dummy
+binary-dummy: pkg_name := emacs
+binary-dummy: debian/stamp/build $(debpkgfiles)
+ $(checkroot)
+ $(checkdir)
+ dh_clean -k
+
+ $(call debinst_indep,$(pkg_name))
+
+##################################################
# emacsXY-el
.PHONY: binary-el
binary-el: pkg_name := $(flavor)-el
@@ -617,7 +628,7 @@ binary-el: debian/stamp/build $(debpkgfi
(cd $(pkgdir_el) && tar xpf -)
rm -rf $(pkgdir_el).tmp
- $(call deb_sub,emacs-el.prerm,$(flavor)-el.prerm)
+ $(call deb_sub,emacsVER-el.prerm,$(flavor)-el.prerm)
$(call debinst_indep,$(flavor)-el)
deb_trash += debian/$(flavor)-el.prerm
@@ -704,9 +715,9 @@ binary-common: debian/stamp/build $(debp
$(pkgdir_common)/usr/share/info/emacs-$(major_ver)/$$f; \
done
- $(call deb_sub,emacs-common.docs,$(flavor)-common.docs)
- $(call deb_sub,emacs-common.postinst,$(flavor)-common.postinst)
- $(call deb_sub,emacs-common.prerm,$(flavor)-common.prerm)
+ $(call deb_sub,emacsVER-common.docs,$(flavor)-common.docs)
+ $(call deb_sub,emacsVER-common.postinst,$(flavor)-common.postinst)
+ $(call deb_sub,emacsVER-common.prerm,$(flavor)-common.prerm)
$(call debinst_indep,$(flavor)-common)
@@ -757,14 +768,14 @@ # `echo fns-*.elc | perl -pe 's/^fns
# /usr/share/doc/emacs$(major_ver) directory
install -d debian/$(pkgdir)/usr/share/doc/$(pkg_name)
- $(call deb_sub,emacs.README,$(pkg_name).README.Debian)
- $(call deb_sub,emacs.menu,$(pkg_name).menu)
- $(call deb_sub,emacs.postinst,$(pkg_name).postinst)
- $(call deb_sub,emacs.prerm,$(pkg_name).prerm)
- $(call deb_sub,emacs.postrm,$(pkg_name).postrm)
+ $(call deb_sub,emacsVER.README,$(pkg_name).README.Debian)
+ $(call deb_sub,emacsVER.menu,$(pkg_name).menu)
+ $(call deb_sub,emacsVER.postinst,$(pkg_name).postinst)
+ $(call deb_sub,emacsVER.prerm,$(pkg_name).prerm)
+ $(call deb_sub,emacsVER.postrm,$(pkg_name).postrm)
# FIXME: this is wrong for -nox
- $(call deb_sub,emacs.desktop,$(pkg_name).desktop)
+ $(call deb_sub,emacsVER.desktop,$(pkg_name).desktop)
if test "$(xsupport)" = x; \
then \
@@ -858,10 +869,10 @@ binary-bin-common: debian/stamp/build $(
# /usr/share/doc/$(flavor) directory
install -d debian/$(pkgdir)/usr/share/doc/$(flavor)-bin-common/
- $(call deb_sub,emacs.README,$(pkg_name).README.Debian)
- $(call deb_sub,emacs-bin-common.postinst,$(pkg_name).postinst)
- $(call deb_sub,emacs-bin-common.prerm,$(pkg_name).prerm)
- $(call deb_sub,emacs-bin-common.postrm,$(pkg_name).postrm)
+ $(call deb_sub,emacsVER.README,$(pkg_name).README.Debian)
+ $(call deb_sub,emacsVER-bin-common.postinst,$(pkg_name).postinst)
+ $(call deb_sub,emacsVER-bin-common.prerm,$(pkg_name).prerm)
+ $(call deb_sub,emacsVER-bin-common.postrm,$(pkg_name).postrm)
perl -pi -e 's/\n/ /gmo;' debian/tmp-alt-list
perl -w -p -i \
@@ -882,7 +893,7 @@ deb_trash += debian/$(flavor)-bin-common
deb_trash += debian/$(flavor)-bin-common.prerm
deb_trash += debian/$(flavor)-bin-common.postrm
-binary-indep: binary-el binary-common
+binary-indep: binary-dummy binary-el binary-common
binary-arch: binary-x binary-nox binary-bin-common
More information about the pkg-emacs-commits
mailing list