/emacs
/emacs.debhelper.log
/emacs.substvars
-/emacs25
-/emacs25-bin-common
-/emacs25-bin-common.README.Debian
-/emacs25-bin-common.debhelper.log
-/emacs25-bin-common.lintian-overrides
-/emacs25-bin-common.postinst
-/emacs25-bin-common.postrm
-/emacs25-bin-common.prerm
-/emacs25-bin-common.substvars
-/emacs25-common
-/emacs25-common.README.Debian
-/emacs25-common.debhelper.log
-/emacs25-common.docs
-/emacs25-common.links
-/emacs25-common.lintian-overrides
-/emacs25-common.postinst
-/emacs25-common.prerm
-/emacs25-common.substvars
-/emacs25-el
-/emacs25-el.debhelper.log
-/emacs25-el.prerm
-/emacs25-el.substvars
-/emacs25-lucid
-/emacs25-lucid.README.Debian
-/emacs25-lucid.debhelper.log
-/emacs25-lucid.desktop
-/emacs25-lucid.lintian-overrides
-/emacs25-lucid.menu
-/emacs25-lucid.postinst
-/emacs25-lucid.postinst.debhelper
-/emacs25-lucid.postrm.debhelper
-/emacs25-lucid.prerm
-/emacs25-lucid.substvars
-/emacs25-nox
-/emacs25-nox.README.Debian
-/emacs25-nox.debhelper.log
-/emacs25-nox.desktop
-/emacs25-nox.links
-/emacs25-nox.lintian-overrides
-/emacs25-nox.menu
-/emacs25-nox.postinst
-/emacs25-nox.postinst.debhelper
-/emacs25-nox.postrm
-/emacs25-nox.postrm.debhelper
-/emacs25-nox.prerm
-/emacs25-nox.substvars
-/emacs25.README.Debian
-/emacs25.debhelper.log
-/emacs25.desktop
-/emacs25.links
-/emacs25.lintian-overrides
-/emacs25.menu
-/emacs25.postinst
-/emacs25.postinst.debhelper
-/emacs25.postrm
-/emacs25.postrm.debhelper
-/emacs25.prerm
-/emacs25.substvars
-/emacsVER-common.README.00
-/emacsVER-common.README.01
+/emacs-gtk
+/emacs-bin-common
+/emacs-bin-common.README.Debian
+/emacs-bin-common.debhelper.log
+/emacs-bin-common.lintian-overrides
+/emacs-bin-common.postinst
+/emacs-bin-common.postrm
+/emacs-bin-common.prerm
+/emacs-bin-common.substvars
+/emacs-common
+/emacs-common.README.Debian
+/emacs-common.debhelper.log
+/emacs-common.docs
+/emacs-common.links
+/emacs-common.lintian-overrides
+/emacs-common.postinst
+/emacs-common.prerm
+/emacs-common.substvars
+/emacs-el
+/emacs-el.debhelper.log
+/emacs-el.prerm
+/emacs-el.substvars
+/emacs-lucid
+/emacs-lucid.README.Debian
+/emacs-lucid.debhelper.log
+/emacs-lucid.desktop
+/emacs-lucid.lintian-overrides
+/emacs-lucid.menu
+/emacs-lucid.postinst
+/emacs-lucid.postinst.debhelper
+/emacs-lucid.postrm.debhelper
+/emacs-lucid.prerm
+/emacs-lucid.substvars
+/emacs-nox
+/emacs-nox.README.Debian
+/emacs-nox.debhelper.log
+/emacs-nox.desktop
+/emacs-nox.links
+/emacs-nox.lintian-overrides
+/emacs-nox.menu
+/emacs-nox.postinst
+/emacs-nox.postinst.debhelper
+/emacs-nox.postrm
+/emacs-nox.postrm.debhelper
+/emacs-nox.prerm
+/emacs-nox.substvars
+/emacs-gtk.README.Debian
+/emacs-gtk.debhelper.log
+/emacs-gtk.desktop
+/emacs-gtk.links
+/emacs-gtk.lintian-overrides
+/emacs-gtk.menu
+/emacs-gtk.postinst
+/emacs-gtk.postinst.debhelper
+/emacs-gtk.postrm
+/emacs-gtk.postrm.debhelper
+/emacs-gtk.prerm
+/emacs-gtk.substvars
+/emacs-common.README.00
+/emacs-common.README.01
/files
/tmp-alt-list
\#*\#
+emacs (25.2+1-6~1.gbp1353b0) UNRELEASED; urgency=medium
+
+ ** SNAPSHOT build @1353b03c55df949fb408c7148c7fe95628f5118b **
+
+ * UNRELEASED
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 04 Aug 2017 19:04:28 -0500
+
emacs25 (25.2+1-6) unstable; urgency=high
* Block remote code execution via enriched text. Add
-Source: emacs25
+Source: emacs
Section: editors
Priority: optional
Maintainer: Rob Browning <rlb@defaultvalue.org>
Homepage: http://www.gnu.org/software/emacs/
Standards-Version: 3.7.2
-Package: emacs25-lucid
+Package: emacs-lucid
Architecture: any
-Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: emacs25, emacsen, editor, info-browser, mail-reader, news-reader
-Suggests: emacs25-common-non-dfsg
-Conflicts: emacs25-gtk, emacs25-nox
-Replaces: emacs25-gtk, emacs25-nox
+Depends: emacs-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: emacs-common-non-dfsg
+Conflicts: emacs-gtk, emacs-nox
+Replaces: emacs-gtk, emacs-nox
Description: GNU Emacs editor (with Lucid GUI support)
GNU Emacs is the extensible self-documenting text editor. This
package contains a version of Emacs with support for a graphical user
interface based on the Lucid toolkit (instead of the GTK+ interface
- provided by the emacs25-gtk package). Until some known GTK+
+ provided by the emacs-gtk package). Until some known GTK+
problems are fixed, this version may help avoid crashing Emacs during
an emacsclient disconnect. See
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and
https://bugzilla.gnome.org/show_bug.cgi?id=85715 for more
information.
-Package: emacs25-lucid-dbg
+Package: emacs-lucid-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: emacs25-lucid (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs25-lucid
+Depends: emacs-lucid (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs-lucid
GNU Emacs is the extensible self-documenting text editor. This
- package contains the debugging symbols for the emacs25-lucid
+ package contains the debugging symbols for the emacs-lucid
package.
-Package: emacs25-nox
+Package: emacs-nox
Architecture: any
-Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: emacs25, editor, emacsen, info-browser, mail-reader, news-reader
-Suggests: emacs25-common-non-dfsg
-Conflicts: emacs25-gtk, emacs25-lucid
-Replaces: emacs25-gtk, emacs25-lucid
+Depends: emacs-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: emacs-common-non-dfsg
+Conflicts: emacs-gtk, emacs-lucid
+Replaces: emacs-gtk, emacs-lucid
Description: GNU Emacs editor (without GUI support)
GNU Emacs is the extensible self-documenting text editor. This
package contains a version of Emacs compiled without support for X,
and provides only a text terminal interface.
-Package: emacs25-nox-dbg
+Package: emacs-nox-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: emacs25-nox (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs25-nox
+Depends: emacs-nox (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs-nox
GNU Emacs is the extensible self-documenting text editor. This
- package contains the debugging symbols for the emacs25-nox
+ package contains the debugging symbols for the emacs-nox
package.
-Package: emacs25-gtk
+Package: emacs-gtk
Architecture: any
-Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: emacs25, editor, emacsen, info-browser, mail-reader, news-reader
-Suggests: emacs25-common-non-dfsg
-Conflicts: emacs25-lucid, emacs25-nox
-Replaces: emacs25-lucid, emacs25-nox
+Depends: emacs-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: emacs-common-non-dfsg
+Conflicts: emacs-lucid, emacs-nox
+Replaces: emacs-lucid, emacs-nox
Description: GNU Emacs editor (with GTK+ GUI support)
GNU Emacs is the extensible self-documenting text editor. This
package contains a version of Emacs with a graphical user interface
based on GTK+ (instead of the Lucid toolkit provided by the
- emacs25-lucid package).
+ emacs-lucid package).
-Package: emacs25-gtk-dbg
+Package: emacs-gtk-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: emacs25-gtk (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs25-gtk
+Depends: emacs-gtk (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs-gtk
GNU Emacs is the extensible self-documenting text editor. This
- package contains the debugging symbols for the emacs25-gtk package.
+ package contains the debugging symbols for the emacs-gtk package.
-Package: emacs25-bin-common
+Package: emacs-bin-common
Architecture: any
-Depends: emacs25-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: emacs-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: GNU Emacs editor's shared, architecture dependent files
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture dependent infrastructure
- that's shared by emacs25-gtk, emacs25-lucid, and emacs25-nox.
+ that's shared by emacs-gtk, emacs-lucid, and emacs-nox.
-Package: emacs25-common
+Package: emacs-common
Architecture: all
Depends: emacsen-common (>= 2.0.8), install-info, ${shlibs:Depends}, ${misc:Depends}
-Recommends: emacs25-el
-Suggests: emacs25-el, emacs25-common-non-dfsg, ncurses-term
-Conflicts: emacs25-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
+Recommends: emacs-el
+Suggests: emacs-el, emacs-common-non-dfsg, ncurses-term
+Conflicts: emacs-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
Breaks: apel (<< 10.8+0.20120427-4)
Description: GNU Emacs editor's shared, architecture independent infrastructure
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture independent infrastructure
- that's shared by emacs25-gtk, emacs25-lucid, and emacs25-nox.
+ that's shared by emacs-gtk, emacs-lucid, and emacs-nox.
-Package: emacs25-el
+Package: emacs-el
Architecture: all
-Depends: emacs25-common (= ${source:Version}), ${misc:Depends}
+Depends: emacs-common (= ${source:Version}), ${misc:Depends}
Description: GNU Emacs LISP (.el) files
GNU Emacs is the extensible self-documenting text editor.
This package contains the elisp sources for the convenience of users,
+++ /dev/null
-Source: @DEB_FLAVOR@
-Section: editors
-Priority: optional
-Maintainer: Rob Browning <rlb@defaultvalue.org>
-Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
- dbus-x11,
- gnupg-agent,
- libgif-dev | libungif4-dev,
- libtiff-dev,
- procps,
- xaw3dg-dev,
- libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
- libgpm-dev [linux-any], libdbus-1-dev,
- autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
- debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
- libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
- libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libmagick++-6.q16-dev,
- libacl1-dev,
- liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
- zlib1g-dev
-Homepage: http://www.gnu.org/software/emacs/
-Standards-Version: 3.7.2
-
-Package: @DEB_FLAVOR@-lucid
-Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader
-Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-nox
-Replaces: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-nox
-Description: GNU Emacs editor (with Lucid GUI support)
- GNU Emacs is the extensible self-documenting text editor. This
- package contains a version of Emacs with support for a graphical user
- interface based on the Lucid toolkit (instead of the GTK+ interface
- provided by the @DEB_FLAVOR@-gtk package). Until some known GTK+
- problems are fixed, this version may help avoid crashing Emacs during
- an emacsclient disconnect. See
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and
- https://bugzilla.gnome.org/show_bug.cgi?id=85715 for more
- information.
-
-Package: @DEB_FLAVOR@-lucid-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: @DEB_FLAVOR@-lucid (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for @DEB_FLAVOR@-lucid
- GNU Emacs is the extensible self-documenting text editor. This
- package contains the debugging symbols for the @DEB_FLAVOR@-lucid
- package.
-
-Package: @DEB_FLAVOR@-nox
-Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
-Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid
-Replaces: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid
-Description: GNU Emacs editor (without GUI support)
- GNU Emacs is the extensible self-documenting text editor. This
- package contains a version of Emacs compiled without support for X,
- and provides only a text terminal interface.
-
-Package: @DEB_FLAVOR@-nox-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: @DEB_FLAVOR@-nox (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for @DEB_FLAVOR@-nox
- GNU Emacs is the extensible self-documenting text editor. This
- package contains the debugging symbols for the @DEB_FLAVOR@-nox
- package.
-
-Package: @DEB_FLAVOR@-gtk
-Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: editor, emacsen, info-browser, mail-reader, news-reader
-Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox
-Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox
-Description: GNU Emacs editor (with GTK+ GUI support)
- GNU Emacs is the extensible self-documenting text editor. This
- package contains a version of Emacs with a graphical user interface
- based on GTK+ (instead of the Lucid toolkit provided by the
- @DEB_FLAVOR@-lucid package).
-
-Package: @DEB_FLAVOR@-gtk-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: @DEB_FLAVOR@-gtk (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for @DEB_FLAVOR@-gtk
- GNU Emacs is the extensible self-documenting text editor. This
- package contains the debugging symbols for the @DEB_FLAVOR@-gtk package.
-
-Package: @DEB_FLAVOR@-bin-common
-Architecture: any
-Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Emacs editor's shared, architecture dependent files
- GNU Emacs is the extensible self-documenting text editor.
- This package contains the architecture dependent infrastructure
- that's shared by @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
-
-Package: @DEB_FLAVOR@-common
-Architecture: all
-Depends: emacsen-common (>= 2.0.8), install-info, ${shlibs:Depends}, ${misc:Depends}
-Recommends: @DEB_FLAVOR@-el
-Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg, ncurses-term
-Conflicts: @DEB_FLAVOR@-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
-Breaks: apel (<< 10.8+0.20120427-4)
-Description: GNU Emacs editor's shared, architecture independent infrastructure
- GNU Emacs is the extensible self-documenting text editor.
- This package contains the architecture independent infrastructure
- that's shared by @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
-
-Package: @DEB_FLAVOR@-el
-Architecture: all
-Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${misc:Depends}
-Description: GNU Emacs LISP (.el) files
- GNU Emacs is the extensible self-documenting text editor.
- This package contains the elisp sources for the convenience of users,
- saving space in the main package for small systems.
The original source for this package can be found at
git://git.savannah.gnu.org/emacs.git under the
emacs-25.2 tag. That tag was used to create the
- Debian upstream archive (emacs25_25.2+1.orig.tar.xz)
+ Debian upstream archive (emacs_1:25.2+1.orig.tar.xz)
after making adjustments to comply with the DFSG (see below).
- Please see /usr/share/doc/emacs25-common/README.Debian.gz for a
+ Please see /usr/share/doc/emacs-common/README.Debian.gz for a
description of the Debian specific differences from the upstream
version.
The original source for this package can be found at
git://git.savannah.gnu.org/emacs.git under the
emacs-@UPSTREAM_VERSION@ tag. That tag was used to create the
- Debian upstream archive (@DEB_FLAVOR@_@DEBSRC_VERSION@.orig.tar.xz)
+ Debian upstream archive (emacs_@DEBSRC_VERSION@.orig.tar.xz)
after making adjustments to comply with the DFSG (see below).
- Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a
+ Please see /usr/share/doc/emacs-common/README.Debian.gz for a
description of the Debian specific differences from the upstream
version.
--- /dev/null
+emacs-bin-common binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail
+emacs-bin-common binary: binary-without-manpage usr/bin/b2m.emacs
+emacs-bin-common binary: binary-without-manpage usr/bin/ctags.emacs
+emacs-bin-common binary: binary-without-manpage usr/bin/ebrowse.emacs
+emacs-bin-common binary: binary-without-manpage usr/bin/emacsclient.emacs
+emacs-bin-common binary: binary-without-manpage usr/bin/etags.emacs
+emacs-bin-common binary: binary-without-manpage usr/bin/grep-changelog.emacs
+emacs-bin-common binary: binary-without-manpage usr/bin/rcs-checkin.emacs
--- /dev/null
+#!/bin/sh
+
+set -e
+
+ALTERNATIVES="@ALTERNATIVES@"
+BIN_PRIORITY="@BIN_PRIORITY@"
+
+# update-alternatives on things that collide with xemacs, other editors
+for i in ${ALTERNATIVES}
+do
+ update-alternatives \
+ --install "/usr/bin/$i" "$i" "/usr/bin/$i.emacs" "$BIN_PRIORITY" \
+ --slave "/usr/share/man/man1/$i.1.gz" "$i.1.gz" \
+ "/usr/share/man/man1/$i.emacs.1.gz"
+done
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh
+
+set -e
+
+ALTERNATIVES="@ALTERNATIVES@"
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != upgrade ]
+then
+ for i in ${ALTERNATIVES}
+ do
+ update-alternatives --remove "$i" /usr/bin/$i.emacs
+ done
+fi
+
+#DEBHELPER#
--- /dev/null
+This file details the Debian specific changes to Emacs.
+
+The following tags may be used in the sections below: Patch, Status,
+Author, Added-by, Provided-by, and Date. When known, Author is used
+to indicate the person believed to have written the relevant code.
+Provided-by may be used to indicate the person who submitted the code
+to Debian, and Added-by indicates the person who actually added the
+code to the Debian package.
+
+* 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.
+
+* 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 add --without-toolkit-scrollbars where indicated and
+ rebuild.
+
+@@PATCH_LIST_HERE@@
+
+Local Variables:
+mode: outline
+outline-regexp: " *\\*+"
+End:
--- /dev/null
+BUGS
+README
+debian/README.add-on-package-maintainers
--- /dev/null
+emacs-common binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs
--- /dev/null
+#!/bin/sh
+
+set -e
+
+FULL=@FULL_VERSION@
+
+# Create the site-lisp dir if we're allowed
+
+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
+
+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
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh
+
+set -e
+
+FULL=@FULL_VERSION@
+
+set +e
+# Only remove these directories if they're empty.
+rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null
+rmdir /usr/local/share/emacs/${FULL} 2>/dev/null
+set -e
+
+#DEBHELPER#
--- /dev/null
+[Desktop Entry]
+Version=1.0
+Name=Emacs (Terminal)
+GenericName=Text Editor
+Comment=GNU Emacs is an extensible, customizable text editor - and more
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+TryExec=/usr/bin/emacs
+Exec=/usr/bin/emacs -nw %F
+Icon=emacs
+Type=Application
+Terminal=true
+Categories=Utility;Development;TextEditor;
+Keywords=Text;Editor;
--- /dev/null
+[Desktop Entry]
+Version=1.0
+Name=Emacs (GUI)
+GenericName=Text Editor
+Comment=GNU Emacs is an extensible, customizable text editor - and more
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+TryExec=/usr/bin/emacs
+Exec=/usr/bin/emacs %F
+Icon=emacs
+Type=Application
+Terminal=false
+Categories=Utility;Development;TextEditor;
+StartupWMClass=Emacs
+Keywords=Text;Editor;
--- /dev/null
+@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm
+@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm
--- /dev/null
+#!/bin/sh
+
+set -e
+
+update-alternatives \
+ --install /usr/bin/emacs emacs \
+ /usr/bin/emacs-@X_SUPPORT@ @BIN_PRIORITY@ \
+ --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
+ /usr/share/man/man1/emacs.emacs.1.gz \
+
+update-alternatives \
+ --install /usr/bin/editor editor \
+ /usr/bin/emacs 0 \
+ --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
+ /usr/share/man/man1/emacs.emacs.1.gz
+
+# emacsen-common registration.
+/usr/lib/emacsen-common/emacs-install emacs
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh
+
+set -e
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != upgrade ]
+then
+ update-alternatives --verbose --remove editor /usr/bin/emacs
+ update-alternatives --verbose --remove emacs /usr/bin/emacs-@X_SUPPORT@
+fi
+
+# emacsen-common registration.
+/usr/lib/emacsen-common/emacs-remove emacs
+
+#DEBHELPER#
+++ /dev/null
-@PKG_NAME@ binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail
-@PKG_NAME@ binary: binary-without-manpage usr/bin/b2m.@DEB_FLAVOR@
-@PKG_NAME@ binary: binary-without-manpage usr/bin/ctags.@DEB_FLAVOR@
-@PKG_NAME@ binary: binary-without-manpage usr/bin/ebrowse.@DEB_FLAVOR@
-@PKG_NAME@ binary: binary-without-manpage usr/bin/emacsclient.@DEB_FLAVOR@
-@PKG_NAME@ binary: binary-without-manpage usr/bin/etags.@DEB_FLAVOR@
-@PKG_NAME@ binary: binary-without-manpage usr/bin/grep-changelog.@DEB_FLAVOR@
-@PKG_NAME@ binary: binary-without-manpage usr/bin/rcs-checkin.@DEB_FLAVOR@
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-FLAVOR=@DEB_FLAVOR@
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-ALTERNATIVES="@ALTERNATIVES@"
-BIN_PRIORITY=@BIN_PRIORITY@
-
-# update-alternatives on things that collide with xemacs, other editors
-for i in ${ALTERNATIVES}
-do
- update-alternatives \
- --install /usr/bin/$i $i /usr/bin/$i.${FLAVOR} ${BIN_PRIORITY} \
- --slave /usr/share/man/man1/$i.1.gz $i.1.gz \
- /usr/share/man/man1/$i.${FLAVOR}.1.gz
-done
-
-#DEBHELPER#
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-FLAVOR=@DEB_FLAVOR@
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-ALTERNATIVES="@ALTERNATIVES@"
-
-# update-alternatives on things that collide with xemacs, other editors
-if [ "$1" != "upgrade" ]
-then
- for i in ${ALTERNATIVES}
- do
- update-alternatives --remove $i /usr/bin/$i.${FLAVOR}
- done
-fi
-
-#DEBHELPER#
-
+++ /dev/null
-This file details the Debian specific changes to Emacs.
-
-The following tags may be used in the sections below: Patch, Status,
-Author, Added-by, Provided-by, and Date. When known, Author is used
-to indicate the person believed to have written the relevant code.
-Provided-by may be used to indicate the person who submitted the code
-to Debian, and Added-by indicates the person who actually added the
-code to the Debian package.
-
-* 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.
-
-* 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 add --without-toolkit-scrollbars where indicated and
- rebuild.
-
-@@PATCH_LIST_HERE@@
-
-Local Variables:
-mode: outline
-outline-regexp: " *\\*+"
-End:
+++ /dev/null
-BUGS
-README
-debian/README.add-on-package-maintainers
+++ /dev/null
-@PKG_NAME@ binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-
-# Create the site-lisp dir for this flavor if we're allowed
-
-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
-
-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
-
-#DEBHELPER#
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-MINOR=@MINOR_VERSION@
-FULL=@FULL_VERSION@
-
-set +e
-# Only remove these directories if they're empty.
-rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null
-rmdir /usr/local/share/emacs/${FULL} 2>/dev/null
-set -e
-
-#DEBHELPER#
+++ /dev/null
-[Desktop Entry]
-Version=1.0
-Name=GNU Emacs @MENU_VERSION@ (Terminal)
-GenericName=Text Editor
-Comment=GNU Emacs is an extensible, customizable text editor - and more
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-TryExec=/usr/bin/@DEB_FLAVOR@
-Exec=/usr/bin/@DEB_FLAVOR@ -nw %F
-Icon=@DEB_FLAVOR@
-Type=Application
-Terminal=true
-Categories=Utility;Development;TextEditor;
-Keywords=Text;Editor;
+++ /dev/null
-
-Please see /usr/share/doc/@PKG_NAME@-common/ as the primary
-documentation directory.
+++ /dev/null
-
-Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/ as the primary
-documentation directory.
+++ /dev/null
-[Desktop Entry]
-Version=1.0
-Name=GNU Emacs @MENU_VERSION@ (GUI)
-GenericName=Text Editor
-Comment=GNU Emacs is an extensible, customizable text editor - and more
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-TryExec=/usr/bin/@DEB_FLAVOR@
-Exec=/usr/bin/@DEB_FLAVOR@ %F
-Icon=@DEB_FLAVOR@
-Type=Application
-Terminal=false
-Categories=Utility;Development;TextEditor;
-StartupWMClass=Emacs
-Keywords=Text;Editor;
+++ /dev/null
-@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm
-@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-FLAVOR=@DEB_FLAVOR@
-
-update-alternatives \
- --install /usr/bin/emacs emacs \
- /usr/bin/${FLAVOR}-@X_SUPPORT@ @BIN_PRIORITY@ \
- --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
- /usr/share/man/man1/emacs.${FLAVOR}.1.gz \
- --slave /usr/share/icons/hicolor/scalable/apps/emacs.svg emacs.svg \
- /usr/share/icons/hicolor/scalable/apps/${FLAVOR}.svg \
- --slave /usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg \
- emacs-document.svg \
- /usr/share/icons/hicolor/scalable/mimetypes/${FLAVOR}-document.svg \
- --slave /usr/share/icons/hicolor/16x16/apps/emacs.png emacs-16x16.png \
- /usr/share/icons/hicolor/16x16/apps/${FLAVOR}.png \
- --slave /usr/share/icons/hicolor/24x24/apps/emacs.png emacs-24x24.png \
- /usr/share/icons/hicolor/24x24/apps/${FLAVOR}.png \
- --slave /usr/share/icons/hicolor/32x32/apps/emacs.png emacs-32x32.png \
- /usr/share/icons/hicolor/32x32/apps/${FLAVOR}.png \
- --slave /usr/share/icons/hicolor/48x48/apps/emacs.png emacs-48x48.png \
- /usr/share/icons/hicolor/48x48/apps/${FLAVOR}.png \
- --slave /usr/share/icons/hicolor/128x128/apps/emacs.png emacs-128x128.png \
- /usr/share/icons/hicolor/128x128/apps/${FLAVOR}.png
-
-update-alternatives \
- --install /usr/bin/editor editor \
- /usr/bin/${FLAVOR} 0 \
- --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
- /usr/share/man/man1/emacs.${FLAVOR}.1.gz
-
-# emacsen-common registration.
-/usr/lib/emacsen-common/emacs-install ${FLAVOR}
-
-#DEBHELPER#
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-MAJOR=@MAJOR_VERSION@
-FLAVOR=@DEB_FLAVOR@
-
-# update-alternatives on things that collide with xemacs, other editors
-if [ "$1" != "upgrade" ]
-then
- update-alternatives --remove emacs /usr/bin/${FLAVOR}-@X_SUPPORT@
- update-alternatives --remove editor /usr/bin/${FLAVOR}
-fi
-
-# emacsen-common registration.
-/usr/lib/emacsen-common/emacs-remove ${FLAVOR}
-
-#DEBHELPER#
# Copyright 1994,1995 Ian Jackson
# Copyright 2004-2005 Jérôme Marant <jerome@debian.org>
-# Copyright 1998-2015 Rob Browning <rlb@defaultvalue.org>
+# Copyright 1998-2017 Rob Browning <rlb@defaultvalue.org>
# Originally copied from the GNU Hello Debian rules file (1.3).
# Modified for emacs by Mark Eichin <eichin@kitten.gen.ma.us>.
# before the last '-'
debsrc_ver := $(shell $(pf); echo $(debian_ver) | perl -pe 's/-[^-]+$$//o')
-# The flavor (i.e. emacs21) currently matches the source package name.
-flavor := $(src_name)
-
-info_subdir := emacs-$(major_ver)
-
######################################################################
# Customizable variables
main_dir_info_files := efaq.info
# Files that the build stage depends on (may also be listed in other vars).
-persistent_autogen_build_files := debian/control debian/copyright
+persistent_autogen_build_files := debian/copyright
nonpersistent_autogen_build_files :=
# These files must always exist, i.e. can't ever be cleaned.
persistent_autogen_install_files :=
nonpersistent_autogen_install_files := \
- debian/$(flavor)-bin-common.lintian-overrides \
- debian/$(flavor)-bin-common.postinst \
- debian/$(flavor)-bin-common.prerm \
- debian/$(flavor)-common.README.Debian \
- debian/$(flavor)-common.docs \
- debian/$(flavor)-common.lintian-overrides \
- debian/$(flavor)-common.postinst \
- debian/$(flavor)-common.prerm \
- debian/$(flavor)-term.desktop \
- debian/$(flavor)-nox.README.Debian \
- debian/$(flavor)-nox.lintian-overrides \
- debian/$(flavor)-nox.postinst \
- debian/$(flavor)-nox.prerm \
- debian/$(flavor)-lucid.README.Debian \
- debian/$(flavor)-lucid.desktop \
- debian/$(flavor)-lucid.lintian-overrides \
- debian/$(flavor)-lucid.postinst \
- debian/$(flavor)-lucid.prerm \
- debian/$(flavor)-gtk.README.Debian \
- debian/$(flavor)-gtk.desktop \
- debian/$(flavor)-gtk.lintian-overrides \
- debian/$(flavor)-gtk.postinst \
- debian/$(flavor)-gtk.prerm
+ debian/emacs-bin-common.lintian-overrides \
+ debian/emacs-bin-common.postinst \
+ debian/emacs-bin-common.prerm \
+ debian/emacs-common.README.Debian \
+ debian/emacs-common.postinst \
+ debian/emacs-common.prerm \
+ debian/emacs-nox.lintian-overrides \
+ debian/emacs-nox.postinst \
+ debian/emacs-nox.prerm \
+ debian/emacs-lucid.lintian-overrides \
+ debian/emacs-lucid.postinst \
+ debian/emacs-lucid.prerm \
+ debian/emacs-gtk.lintian-overrides \
+ debian/emacs-gtk.postinst \
+ debian/emacs-gtk.prerm
autogen_build_files := \
$(nonpersistent_autogen_build_files) $(persistent_autogen_build_files)
# Build directories
-pkgdir_common := $(CURDIR)/debian/$(flavor)-common
-pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common
-pkgdir_gtk := $(CURDIR)/debian/$(flavor)-gtk
-pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox
-pkgdir_lucid := $(CURDIR)/debian/$(flavor)-lucid
-pkgdir_el := $(CURDIR)/debian/$(flavor)-el
+pkgdir_common := $(CURDIR)/debian/emacs-common
+pkgdir_bin_common := $(CURDIR)/debian/emacs-bin-common
+pkgdir_gtk := $(CURDIR)/debian/emacs-gtk
+pkgdir_nox := $(CURDIR)/debian/emacs-nox
+pkgdir_lucid := $(CURDIR)/debian/emacs-lucid
+pkgdir_el := $(CURDIR)/debian/emacs-el
install_dir_gtk := $(CURDIR)/debian/install-gtk
install_dir_nox := $(CURDIR)/debian/install-nox
install_dir_lucid := $(CURDIR)/debian/install-lucid
-local_lpath := /etc/$(flavor):/etc/emacs
+local_lpath := /etc/emacs
local_lpath := $(local_lpath):/usr/local/share/emacs/$(runtime_ver)/site-lisp
local_lpath := $(local_lpath):/usr/local/share/emacs/site-lisp
local_lpath := $(local_lpath):/usr/share/emacs/$(runtime_ver)/site-lisp
local_lpath_install \
:= $(pkgdir_common)/$(subst :,:$(pkgdir_common)/,$(local_lpath))
-define testdir
- dh_testdir debian/emacsVER.postinst
-endef
-
# If we ever need to do the stripping outside of dh_strip, just add an
# INSTALL_STRIP="-s" to the make vars below.
define emacs_inst
$(MAKE) -C debian/$(1) install \
DESTDIR=$(2) \
- infodir=/usr/share/info/emacs-$(major_ver) \
+ infodir=/usr/share/info/emacs \
localstatedir=/var
endef
-e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \
-e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \
-e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \
- -e "s|\@DEB_FLAVOR\@|$(flavor)|go;" \
-e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \
- -e "s|\@INFO_FILES\@|$(main_dir_info_files)|go;" \
- -e "s|\@INFO_SUBDIR\@|$(info_subdir)|go;" \
-e "s|\@X_SUPPORT\@|$(xsupport)|go;" \
-e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \
-e "s|\@MOVEMAIL_BIN\@|$(movemail_bin)|go;" \
# so dh pattern rule doesn't try to handle this target
true
-debian/$(flavor)-gtk.%: xsupport := "gtk"
-debian/$(flavor)-gtk.%: pkg_name := $(flavor)-gtk
+debian/emacs-gtk.%: xsupport := "gtk"
+debian/emacs-gtk.%: pkg_name := emacs-gtk
-debian/$(flavor)-nox.%: xsupport := "nox"
-debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox
+debian/emacs-nox.%: xsupport := "nox"
+debian/emacs-nox.%: pkg_name := emacs-nox
-debian/$(flavor)-lucid.%: xsupport := "lucid"
-debian/$(flavor)-lucid.%: pkg_name := $(flavor)-lucid
+debian/emacs-lucid.%: xsupport := "lucid"
+debian/emacs-lucid.%: pkg_name := emacs-lucid
-debian/$(flavor)-common.%: pkg_name := $(flavor)-common
-debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common
+debian/emacs-common.%: pkg_name := emacs-common
+debian/emacs-bin-common.%: pkg_name := emacs-bin-common
debian/%: debian/%.in debian/changelog debian/rules
$(call deb_sub,$<,$@)
-debian/$(flavor)-bin-common.%: debian/emacsVER-bin-common.% debian/changelog
- $(call deb_sub,$<,$@)
-
-debian/$(flavor)-common.%: debian/emacsVER-common.% debian/changelog
- $(call deb_sub,$<,$@)
-
-debian/$(flavor)-el.%: debian/emacsVER-el.% debian/changelog
- $(call deb_sub,$<,$@)
-
-debian/$(flavor)-gtk.%: debian/emacsVER.% debian/changelog
- $(call deb_sub,$<,$@)
-
-debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog
+debian/emacs-nox.%: debian/emacsVAR.% debian/changelog debian/rules
$(call deb_sub,$<,$@)
-debian/$(flavor)-lucid.%: debian/emacsVER.% debian/changelog
+debian/emacs-gtk.%: debian/emacsVAR.% debian/changelog debian/rules
$(call deb_sub,$<,$@)
-debian/$(flavor)-term.desktop: debian/emacsVER-term.desktop debian/changelog
+debian/emacs-lucid.%: debian/emacsVAR.% debian/changelog debian/rules
$(call deb_sub,$<,$@)
-debian/$(flavor)-common.README.Debian: \
- debian/emacsVER-common.README debian/patches/*.patch debian/patches/series \
+debian/emacs-common.README.Debian: \
+ debian/emacs-common.README.in debian/patches/*.patch debian/patches/series \
debian/rules debian/patch-to-news
cd debian && \
- csplit -s -f emacsVER-common.README. \
- emacsVER-common.README '/@@PATCH_LIST_HERE@@/'
- cp debian/emacsVER-common.README.00 debian/emacsVER-common.README.tmp
+ csplit -s -f emacs-common.README. \
+ emacs-common.README.in '/@@PATCH_LIST_HERE@@/'
+ cp debian/emacs-common.README.00 debian/emacs-common.README.tmp
for p in $$($(quilt) series); do \
- debian/patch-to-news "$$p" >> debian/emacsVER-common.README.tmp \
- && echo >> debian/emacsVER-common.README.tmp; \
+ debian/patch-to-news "$$p" >> debian/emacs-common.README.tmp \
+ && echo >> debian/emacs-common.README.tmp; \
done
tail -n +2 \
- < debian/emacsVER-common.README.01 \
- >> debian/emacsVER-common.README.tmp
- mv debian/emacsVER-common.README.tmp $@
+ < debian/emacs-common.README.01 \
+ >> debian/emacs-common.README.tmp
+ mv debian/emacs-common.README.tmp $@
# common configure flags
confflags += --prefix=/usr
confflags_gtk += --with-x-toolkit=gtk3
# For those who prefer the old-style non-toolkit scrollbars, just
# change the assignment below to --without-toolkit-scroll-bars. The
-# resulting emacsXY package will have the old scrollbars.
+# resulting emacs-gtk package will have the old scrollbars.
confflags_gtk += --with-toolkit-scroll-bars
# nox configure flags
debian/build-src
cd debian/build-src && ./autogen.sh
mkdir debian/build-lucid debian/build-nox debian/build-gtk
- # Create one VPATH build per-flavor
+ # Create one VPATH build per-config
$(call cfg_tree,debian/build-gtk,$(confflags_gtk))
$(call cfg_tree,debian/build-nox,$(confflags_nox))
$(call cfg_tree,debian/build-lucid,$(confflags_lucid))
install -d $(2)/usr/bin/
test -f $(1)/usr/bin/emacs-*
- cp -a $(1)/usr/bin/emacs-* $(2)/usr/bin/$(flavor)-$(4)
- dh_link -p$(3) usr/bin/$(flavor)-$(4) usr/bin/$(flavor)
+ cp -a $(1)/usr/bin/emacs-* $(2)/usr/bin/emacs-$(4)
install -d $(2)/usr/share/emacs/$(runtime_ver)/etc
cp -a $(1)/usr/share/emacs/$(runtime_ver)/etc/DOC \
install -d $(2)/usr/share/man/man1
dh_link -p$(3) \
- usr/share/man/man1/emacs.$(flavor).1.gz \
- usr/share/man/man1/$(flavor).1.gz
- dh_link -p$(3) \
- usr/share/man/man1/emacs.$(flavor).1.gz \
- usr/share/man/man1/$(flavor)-$(4).1.gz
+ usr/share/man/man1/emacs.1.gz \
+ usr/share/man/man1/emacs-$(4).1.gz
+
+ dh_link -p$(3) usr/share/doc/emacs-common usr/share/doc/$(3)
+
endef
override_dh_auto_install: $(autogen_install_files)
$(call emacs_inst,build-gtk,$(install_dir_gtk))
##################################################
- # emacsXY-common
- ifneq (,$(findstring $(flavor)-common, $(shell dh_listpackages)))
+ # emacs-common
+ ifneq (,$(findstring emacs-common, $(shell dh_listpackages)))
install -d $(pkgdir_common)
cp -a $(install_dir_gtk)/* $(pkgdir_common)
rm -r $(pkgdir_common)/usr/bin
rm -r $(pkgdir_common)/usr/lib
- cd $(pkgdir_common)/usr/share/appdata \
- && mv emacs.appdata.xml $(flavor).appdata.xml
-
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \
&& test -f DOC
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \
&& rm DOC
# lisp path directories
- install -d $(pkgdir_common)/etc/$(flavor)/site-start.d
- install -d $(pkgdir_common)/usr/share/$(flavor)
-
- # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs
- # to be in share/FLAVOR so that as we upgrade from 21.1 to 21.2,
- # etc., add-on package bits don't get left behind.
- mv $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/site-lisp \
- $(pkgdir_common)/usr/share/$(flavor)
- dh_link -p$(flavor)-common usr/share/$(flavor)/site-lisp \
- usr/share/emacs/$(runtime_ver)/site-lisp
-
- # This is a duplicate of the file in FLAVOR/site-lisp
- rm $(pkgdir_common)/usr/share/emacs/site-lisp/subdirs.el
+ install -d $(pkgdir_common)/etc/emacs/site-start.d
+ install -d $(pkgdir_common)/usr/share/emacs/site-lisp
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
&& convert hicolor/16x16/apps/emacs.{png,xpm}
# Remove emacs23 icon versions
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
- && rm hicolor/*/apps/emacs23.*
+ && rm hicolor/*/apps/emacs{22,23}.*
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
&& rm hicolor/*/mimetypes/emacs-document23.svg
cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
&& rm emacs-document23.svg
- # Fixup image files in unversioned directories (version
- # unversioned images) and prepare for update-alternatives.
- cd $(pkgdir_common)/usr/share/icons/hicolor \
- && mv scalable/apps/emacs.svg scalable/apps/${flavor}.svg \
- && mv 16x16/apps/emacs.png 16x16/apps/${flavor}.png \
- && mv 24x24/apps/emacs.png 24x24/apps/${flavor}.png \
- && mv 32x32/apps/emacs.png 32x32/apps/${flavor}.png \
- && mv 48x48/apps/emacs.png 48x48/apps/${flavor}.png \
- && mv 128x128/apps/emacs.png 128x128/apps/${flavor}.png
-
- cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
- && mv emacs-document.svg ${flavor}-document.svg
-
# Remove redundant emacs.desktop file.
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/emacs.desktop
rm $(pkgdir_common)/usr/share/applications/emacs.desktop
gunzip $(pkgdir_common)/usr/share/man/man1/*.gz
- perl -pi -e "s|man1/etags\\.1|man1/etags\\.$(flavor)\\.1|" \
- $(pkgdir_common)/usr/share/man/man1/ctags.1
-
cd $(pkgdir_common)/usr/share/man/man1/ && \
- for f in *.1; do mv $$f $$(basename $${f} .1).$(flavor).1; done
+ for f in *.1; do mv $$f $$(basename $${f} .1).emacs.1; done
# At least etc/COPYING is needed by M-x describe-copying.
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING
- dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
+ dh_link -pemacs-common /usr/share/common-licenses/GPL-3 \
usr/share/emacs/$(runtime_ver)/etc/COPYING
- dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
+ dh_link -pemacs-common /usr/share/common-licenses/GPL-3 \
usr/share/emacs/$(runtime_ver)/lisp/COPYING
$(pf); cd $(pkgdir_common) && \
# Remove extraneous info dir files. These may not exist if dpkg
# is 1.5.4 or newer.
- rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir
- rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old
-
- # Remove the shared game score directory as a simple way to
- # avoid a conflict with other flavors of Emacs. Since
- # Debian's update-game-score binary isn't setuid, that
- # directory is never used.
- rm $(pkgdir_common)/var/games/emacs/tetris-scores
- rm $(pkgdir_common)/var/games/emacs/snake-scores
- rmdir $(pkgdir_common)/var/games/emacs/
- rmdir $(pkgdir_common)/var/games/
- rmdir $(pkgdir_common)/var/
+ rm -f $(pkgdir_common)/usr/share/info/emacs/dir
+ rm -f $(pkgdir_common)/usr/share/info/emacs/dir.old
endif
##################################################
- # emacsXY-bin-common
- ifneq (,$(findstring $(flavor)-bin-common, $(shell dh_listpackages)))
+ # emacs-bin-common
+ ifneq (,$(findstring emacs-bin-common, $(shell dh_listpackages)))
# Move common binaries to emacs-bin-common.
install -d $(pkgdir_bin_common)/usr
cp -a $(install_dir_gtk)/usr/bin $(pkgdir_bin_common)/usr
chmod g+s $(pkgdir_bin_common)/$(movemail_bin)
# Set up alternatives.
- alternatives=`ls $(pkgdir_bin_common)/usr/bin | xargs` && \
- set -x && \
- for f in debian/$(flavor)-bin-common.*; \
- do \
- perl -pwi -e "s|\@ALTERNATIVES\@|$${alternatives}|go" $$f ; \
- done
+ alternatives=$$(ls $(pkgdir_bin_common)/usr/bin) \
+ && set -x \
+ && paths=($$(echo debian/emacs-bin-common.*)) \
+ && for f in "$${paths[@]%.in}"; \
+ do \
+ perl -pwi -e "s|\@ALTERNATIVES\@|$${alternatives}|go" "$$f" ; \
+ done
for f in `ls $(pkgdir_bin_common)/usr/bin`; \
do \
mv $(pkgdir_bin_common)/usr/bin/$$f \
- $(pkgdir_bin_common)/usr/bin/$$f.$(flavor) ; \
+ $(pkgdir_bin_common)/usr/bin/$$f.emacs ; \
done
endif
##################################################
- # emacsXY
- ifneq (,$(findstring $(flavor), $(shell dh_listpackages)))
+ # emacs-gtk
+ ifneq (,$(findstring emacs, $(shell dh_listpackages)))
$(call install_common_binpkg_bits,\
- $(install_dir_gtk),$(pkgdir_gtk),$(flavor)-gtk,gtk)
+ $(install_dir_gtk),$(pkgdir_gtk),emacs-gtk,gtk)
# install desktop entries
install -d $(pkgdir_gtk)/usr/share/applications
install -m 0644 \
- debian/$(flavor).desktop \
- debian/$(flavor)-term.desktop \
+ debian/emacs.desktop \
+ debian/emacs-term.desktop \
$(pkgdir_gtk)/usr/share/applications/
endif
##################################################
- # emacsXY-nox
- ifneq (,$(findstring $(flavor)-nox, $(shell dh_listpackages)))
+ # emacs-nox
+ ifneq (,$(findstring emacs-nox, $(shell dh_listpackages)))
$(call emacs_inst,build-nox,$(install_dir_nox))
$(call install_common_binpkg_bits,\
- $(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox)
+ $(install_dir_nox),$(pkgdir_nox),emacs-nox,nox)
# install desktop entry
install -d $(pkgdir_gtk)/usr/share/applications
install -m 0644 \
- debian/$(flavor)-term.desktop $(pkgdir_gtk)/usr/share/applications/
+ debian/emacs-term.desktop $(pkgdir_gtk)/usr/share/applications/
rm -rf $(install_dir_nox)
endif
##################################################
- # emacsXY-lucid
- ifneq (,$(findstring $(flavor)-lucid, $(shell dh_listpackages)))
+ # emacs-lucid
+ ifneq (,$(findstring emacs-lucid, $(shell dh_listpackages)))
$(call emacs_inst,build-lucid,$(install_dir_lucid))
$(call install_common_binpkg_bits,\
- $(install_dir_lucid),$(pkgdir_lucid),$(flavor)-lucid,lucid)
+ $(install_dir_lucid),$(pkgdir_lucid),emacs-lucid,lucid)
# install desktop entries
install -d $(pkgdir_lucid)/usr/share/applications
install -m 0644 \
- debian/$(flavor)-lucid.desktop \
- debian/$(flavor)-term.desktop \
+ debian/emacs.desktop \
+ debian/emacs-term.desktop \
$(pkgdir_lucid)/usr/share/applications/
rm -rf $(install_dir_lucid)
endif
##################################################
- # emacsXY-el
- ifneq (,$(findstring $(flavor)-el, $(shell dh_listpackages)))
+ # emacs-el
+ ifneq (,$(findstring emacs-el, $(shell dh_listpackages)))
install -d $(pkgdir_el)
$(pf); \
(cd $(install_dir_gtk) && find -name "*.el" -o -name "*.el.gz" -print0 \
.PHONY: override_dh_strip
override_dh_strip:
- dh_strip -p$(flavor)-gtk --dbg-package=$(flavor)-gtk-dbg
- dh_strip -p$(flavor)-lucid --dbg-package=$(flavor)-lucid-dbg
- dh_strip -p$(flavor)-nox --dbg-package=$(flavor)-nox-dbg
+ dh_strip -pemacs-gtk --dbg-package=emacs-gtk-dbg
+ dh_strip -pemacs-lucid --dbg-package=emacs-lucid-dbg
+ dh_strip -pemacs-nox --dbg-package=emacs-nox-dbg
dh_strip
# This won't be necessary once strip-nondeterminism is fixed.
.PHONY: override_dh_strip_nondeterminism
override_dh_strip_nondeterminism:
- if grep "$(flavor)-el" <(dh_listpackages); then \
- cp -a debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz \
+ if grep "emacs-el" <(dh_listpackages); then \
+ cp -a debian/emacs-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz \
debian/elgz-canary; \
fi
cd debian && \
path="$${line#* }"; \
touch --date=@"$$ts" "$$path"; \
done < elgz-info
- if grep -q "$(flavor)-el" <(dh_listpackages); then \
+ if grep -q "emacs-el" <(dh_listpackages); then \
set -e; \
test ! debian/elgz-canary -nt \
- debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \
+ debian/emacs-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \
test ! debian/elgz-canary -ot \
- debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \
+ debian/emacs-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \
fi
override_dh_testdir:
- $(testdir)
+ dh_testdir debian/emacsVAR.postinst
override_dh_fixperms:
dh_fixperms -X$(movemail_bin)
debian/build-gtk \
debian/elgz-canary \
debian/elgz-info \
- debian/emacsVER-common.README.00 \
- debian/emacsVER-common.README.01 \
+ debian/emacs-common.README.00 \
+ debian/emacs-common.README.01 \
debian/install-lucid \
debian/install-nox \
debian/install-gtk
projects / emacs.git / commitdiff