--- emacs-snapshot-20061105.orig/debian/control +++ emacs-snapshot-20061105/debian/control @@ -0,0 +1,72 @@ +Source: emacs-snapshot +Section: editors +Priority: optional +Maintainer: Romain Francoise +Build-Depends: libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libgtk2.0-dev, autotools-dev, autoconf (>= 2.54), dpkg-dev (>> 1.10.0), dpatch (>= 2.0.9), debhelper (>= 5.0.0), libxaw7-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] +Standards-Version: 3.7.2 + +Package: emacs-snapshot-common +Section: editors +Priority: optional +Architecture: all +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends} +Suggests: emacs-snapshot-el +Conflicts: emacs-snapshot-el (<< ${Source-Version}), w3-el, dictionaries-common (<< 0.60.0), emacs-snapshot (<< 1:20060120-2), emacs-snapshot-gtk (<< 1:20060120-2), emacs-snapshot-nox (<< 1:20060120-2) +Description: The GNU Emacs editor's common infrastructure + GNU Emacs is the extensible self-documenting text editor. + This package contains the infrastructure common between emacs-snapshot, + emacs-snapshot-gtk and emacs-snapshot-nox. + +Package: emacs-snapshot-bin-common +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-common (= ${source:Version}), ${shlibs:Depends} +Conflicts: emacs-snapshot (<< 1:20060120-2), emacs-snapshot-gtk (<< 1:20060120-2), emacs-snapshot-nox (<< 1:20060120-2) +Description: The 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 emacs-snapshot, emacs-snapshot-gtk and + emacs-snapshot-nox. + +Package: emacs-snapshot +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The GNU Emacs editor (development snapshot) + GNU Emacs is the extensible self-documenting text editor. + +Package: emacs-snapshot-gtk +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacs-snapshot, emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The GNU Emacs editor (with GTK+ 2.x support) + GNU Emacs is the extensible self-documenting text editor. + This package contains a version of Emacs compiled with support for GTK+ 2.x. + +Package: emacs-snapshot-nox +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacs-snapshot, emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The GNU Emacs editor (without X support) + GNU Emacs is the extensible self-documenting text editor. + This package contains a version of Emacs compiled without support for X. + +Package: emacs-snapshot-el +Section: editors +Priority: optional +Architecture: all +Depends: emacs-snapshot-common (= ${Source-Version}) +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. --- emacs-snapshot-20061105.orig/debian/emacs-bin-common.overrides.lintian +++ emacs-snapshot-20061105/debian/emacs-bin-common.overrides.lintian @@ -0,0 +1,7 @@ +@PKG_NAME@: setgid-binary usr/lib/emacs/@FULL_VERSION@/@TARGET@/movemail 2755 root/mail +@PKG_NAME@: manpage-section-mismatch usr/share/man/man1/emacs.1@SRC_NAME@.gz:22 1@SRC_NAME@ != 1 +@PKG_NAME@: manpage-section-mismatch usr/share/man/man1/emacsclient.1@SRC_NAME@.gz:1 1@SRC_NAME@ != 1 +@PKG_NAME@: manpage-section-mismatch usr/share/man/man1/etags.1@SRC_NAME@.gz:4 1@SRC_NAME@ != 1 +@PKG_NAME@: binary-without-manpage ctags.@SRC_NAME@ +@PKG_NAME@: binary-without-manpage emacsclient.@SRC_NAME@ +@PKG_NAME@: binary-without-manpage etags.@SRC_NAME@ --- emacs-snapshot-20061105.orig/debian/bug.script.in +++ emacs-snapshot-20061105/debian/bug.script.in @@ -0,0 +1,32 @@ +#!/bin/sh + +exec >&3 + +echo "-- Emacs odds and ends:" +TMP=`mktemp` +cat >$TMP <&1 +rm -f $TMP +echo + +echo "-- /usr/share/@BIN_NAME@/:" +ls --format=long --almost-all --recursive /usr/share/@BIN_NAME@ +echo + +echo "-- /usr/share/emacs/site-lisp/:" +ls --format=long --almost-all --recursive /usr/share/emacs/site-lisp +echo + +echo "-- /var/lib/emacs-snapshot/:" +ls --format=long --almost-all --recursive /var/lib/emacs-snapshot +echo + +# If grep-dctrl is installed, get more info +if test -x /usr/bin/grep-status; then + echo "-- Packages related to Emacs:" + grep-status -FDepends emacs -sPackage,Version,Status + echo +fi --- emacs-snapshot-20061105.orig/debian/control.in +++ emacs-snapshot-20061105/debian/control.in @@ -0,0 +1,72 @@ +Source: @SRC_NAME@ +Section: editors +Priority: optional +Maintainer: Romain Francoise +Build-Depends: libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libgtk2.0-dev, autotools-dev, autoconf (>= @AC_PREREQ@), dpkg-dev (>> 1.10.0), dpatch (>= 2.0.9), debhelper (>= 5.0.0), libxaw7-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] +Standards-Version: 3.7.2 + +Package: @BIN_NAME@-common +Section: editors +Priority: optional +Architecture: all +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends} +Suggests: @BIN_NAME@-el +Conflicts: @BIN_NAME@-el (<< ${Source-Version}), w3-el, dictionaries-common (<< 0.60.0), @BIN_NAME@ (<< 1:20060120-2), @BIN_NAME@-gtk (<< 1:20060120-2), @BIN_NAME@-nox (<< 1:20060120-2) +Description: The GNU Emacs editor's common infrastructure + GNU Emacs is the extensible self-documenting text editor. + This package contains the infrastructure common between @BIN_NAME@, + @BIN_NAME@-gtk and @BIN_NAME@-nox. + +Package: @BIN_NAME@-bin-common +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-common (= ${source:Version}), ${shlibs:Depends} +Conflicts: @BIN_NAME@ (<< 1:20060120-2), @BIN_NAME@-gtk (<< 1:20060120-2), @BIN_NAME@-nox (<< 1:20060120-2) +Description: The 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 @BIN_NAME@, @BIN_NAME@-gtk and + @BIN_NAME@-nox. + +Package: @BIN_NAME@ +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The GNU Emacs editor@FLAVOUR_DESC@ + GNU Emacs is the extensible self-documenting text editor. + +Package: @BIN_NAME@-gtk +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: @BIN_NAME@, emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The GNU Emacs editor (with GTK+ 2.x support) + GNU Emacs is the extensible self-documenting text editor. + This package contains a version of Emacs compiled with support for GTK+ 2.x. + +Package: @BIN_NAME@-nox +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: @BIN_NAME@, emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The GNU Emacs editor (without X support) + GNU Emacs is the extensible self-documenting text editor. + This package contains a version of Emacs compiled without support for X. + +Package: @BIN_NAME@-el +Section: editors +Priority: optional +Architecture: all +Depends: @BIN_NAME@-common (= ${Source-Version}) +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. --- emacs-snapshot-20061105.orig/debian/emacs-common.menu.in +++ emacs-snapshot-20061105/debian/emacs-common.menu.in @@ -0,0 +1,7 @@ +?package(@PKG_NAME@):\ + needs="text"\ + section="Apps/Editors"\ + title="@MENU_TITLE@ (text)"\ + command="/usr/bin/@BIN_NAME@ -nw"\ + icon="/usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm"\ + hints="Text" --- emacs-snapshot-20061105.orig/debian/patches/debian-emacs-manpage.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-emacs-manpage.dpatch @@ -0,0 +1,82 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-emacs-manpage.dpatch by Rob Browning +## +## DP: ** Some documentation references to /usr/local/ have been changed to /usr. +## DP: Provided by: Rob Browning + +@DPATCH@ +diff -urNad /home/rlb/deb/emacs21/trunk/etc/emacs.1 trunk/etc/emacs.1 +--- /home/rlb/deb/emacs21/trunk/etc/emacs.1 2004-05-18 22:17:22.000000000 +0200 ++++ trunk/etc/emacs.1 2004-05-18 22:22:33.000000000 +0200 +@@ -201,7 +201,7 @@ + window in reverse video. + .TP + .B \-i +-Use the "kitchen sink" bitmap icon when iconifying the ++Use the Emacs icon when iconifying the + .I Emacs + window. + .TP +@@ -253,7 +253,7 @@ + .IR X (1) + for more information. + The width and height are specified in characters; the default is 80 by +-24. See the Emacs manual, section "Options for Window Size and Position", ++40. See the Emacs manual, section "Options for Window Size and Position", + for information on how window sizes interact + with selecting or deselecting the tool bar and menu bar. + .PP +@@ -430,29 +430,29 @@ + manual is also included in the Emacs source distribution. + .PP + .SH FILES +-/usr/local/info - files for the Info documentation browser ++/usr/share/info - files for the Info documentation browser + (a subsystem of Emacs) to refer to. Currently not much of Unix + is documented here, but the complete text of the Emacs reference + manual is included in a convenient tree structured form. + +-/usr/local/share/emacs/$VERSION/src - C source files and object files ++/usr/share/emacs/$VERSION/src - C source files and object files + + /usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files + that define most editing commands. Some are preloaded; + others are autoloaded from this directory when used. + +-/usr/local/share/emacs/$VERSION/etc - various programs that are used with ++/usr/share/emacs/$VERSION/etc - various programs that are used with + GNU Emacs, and some files of information. + +-/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation ++/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation + strings for the Lisp primitives and preloaded Lisp functions + of GNU Emacs. They are stored here to reduce the size of + Emacs proper. + +-/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs ++/usr/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs + vs. other versions of Emacs. + .br +-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering ++/usr/share/emacs/$VERSION/etc/SERVICE lists people offering + various services to assist users of GNU Emacs, including education, + troubleshooting, porting and customization. + .br +@@ -460,7 +460,7 @@ + programs in the Emacs Lisp extension language, which has not yet been fully + documented. + +-/usr/local/com/emacs/lock - holds lock files that are made for all ++/usr/com/emacs/lock - holds lock files that are made for all + files being modified in Emacs, to prevent simultaneous modification + of one file by two users. + +@@ -487,7 +487,7 @@ + Send requests to be added to mailing lists to the special list + info-gnu-emacs-request@prep.ai.mit.edu (or the corresponding UUCP + address). For more information about Emacs mailing lists, see the +-file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be ++file /usr/share/emacs/$VERSION/etc/MAILINGLISTS. Bugs tend actually to be + fixed if they can be isolated, so it is in your interest to report + them in such a way that they can be easily reproduced. + .PP --- emacs-snapshot-20061105.orig/debian/patches/debian-browse-url.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-browse-url.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-browse-url.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** Emacs honors the Debian `x-www-browser' alternative. +## DP: On Debian systems, default commands can be customized using the Debian +## DP: alternatives system. This patch makes Emacs honor the `x-www-browser' +## DP: alternative when determining the default browser to use. +## DP: Provided by: Romain Francoise + +## Note: this patch voluntarily skips the x-www-browser alternative if +## the alternative is set to `auto'. This is because the browser +## priorities are set by the package maintainers and appear to be quite +## random; using Emacs's idea of a default browser is better than using +## whatever browser is pointed to by the automatic alternative. + +@DPATCH@ +diff -urNad emacs-snapshot-20060615~/lisp/net/browse-url.el emacs-snapshot-20060615/lisp/net/browse-url.el +--- emacs-snapshot-20060615~/lisp/net/browse-url.el 2006-05-20 06:29:38.000000000 +0200 ++++ emacs-snapshot-20060615/lisp/net/browse-url.el 2006-06-17 15:19:30.000000000 +0200 +@@ -550,7 +550,7 @@ + :type '(repeat (string :tag "Argument")) + :group 'browse-url) + +-(defcustom browse-url-generic-program nil ++(defcustom browse-url-generic-program "x-www-browser" + "*The name of the browser program used by `browse-url-generic'." + :type '(choice string (const :tag "None" nil)) + :group 'browse-url) +@@ -858,6 +858,14 @@ + xterm, MMM, and then W3." + (apply + (cond ++ ((and browse-url-generic-program ++ (executable-find browse-url-generic-program) ++ (executable-find "/usr/sbin/update-alternatives") ++ (not (string-match ++ "status is auto" ++ (shell-command-to-string ++ "/usr/sbin/update-alternatives --display x-www-browser")))) ++ 'browse-url-generic) + ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) + ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) + ((executable-find browse-url-firefox-program) 'browse-url-firefox) --- emacs-snapshot-20061105.orig/debian/patches/debian-emacs-news.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-emacs-news.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-emacs-news.dpatch by Rob Browning +## +## DP: ** Mention Debian-specific changes in the Emacs NEWS file. +## DP: Provided by: Rob Browning + +@DPATCH@ +diff -urNad /home/rlb/deb/emacs21/trunk/etc/NEWS trunk/etc/NEWS +--- /home/rlb/deb/emacs21/trunk/etc/NEWS 2005-04-25 22:16:07.314736040 +0200 ++++ trunk/etc/NEWS 2005-04-25 22:16:55.360431984 +0200 +@@ -15,6 +15,11 @@ + so we will look at it and add it to the manual. + + ++* Debian specific changes to Emacs ++ ++Please see /usr/share/doc/emacs-snapshot-common/README.Debian. ++ ++ + * Installation Changes in Emacs 22.1 + + ** Emacs includes now support for loading image libraries on demand. --- emacs-snapshot-20061105.orig/debian/patches/debian-emacs-bug.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-emacs-bug.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-emacs-bug.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** M-x report-emacs-bug includes the Debian version. +## DP: Provided by: Romain Francoise +## DP: +## DP: ** M-x report-emacs-bug CCs the report to the Debian maintainers. +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad emacs-snapshot-20060811~/lisp/mail/emacsbug.el emacs-snapshot-20060811/lisp/mail/emacsbug.el +--- emacs-snapshot-20060811~/lisp/mail/emacsbug.el 2006-02-06 13:31:40.000000000 +0100 ++++ emacs-snapshot-20060811/lisp/mail/emacsbug.el 2006-08-13 19:19:27.000000000 +0200 +@@ -89,7 +89,7 @@ + (with-current-buffer (get-buffer-create "*Messages*") + (point-max-marker))) + (compose-mail reporting-address +- topic) ++ topic '(("Cc" . "emacs-snapshot@packages.debian.org"))) + ;; The rest of this does not execute + ;; if the user was asked to confirm and said no. + (rfc822-goto-eoh) +@@ -137,6 +137,11 @@ + (add-text-properties (1+ user-point) (point) prompt-properties) + + (insert "\n\nIn " (emacs-version) "\n") ++ (insert " (Debian emacs-snapshot package, version " ++ (substring (shell-command-to-string ++ "dpkg -s emacs-snapshot-common|grep ^Version:") ++ 9 -1) ++ ")\n") + (if (fboundp 'x-server-vendor) + (condition-case nil + (insert "X server distributor `" (x-server-vendor) "', version " --- emacs-snapshot-20061105.orig/debian/patches/debian-menu.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-menu.dpatch @@ -0,0 +1,66 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-menu.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** Debian-related items were added to the Help menu. +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad emacs-snapshot-20060114~/lisp/menu-bar.el emacs-snapshot-20060114/lisp/menu-bar.el +--- emacs-snapshot-20060114~/lisp/menu-bar.el 2005-12-23 12:36:08.000000000 +0100 ++++ emacs-snapshot-20060114/lisp/menu-bar.el 2006-01-14 21:22:52.000000000 +0100 +@@ -1300,6 +1300,28 @@ + (info "elisp") + (Info-index topic)) + ++(defun debian-emacs-changelog () ++ "Display the Debian changelog file for this package." ++ (interactive) ++ (view-file "/usr/share/doc/emacs-snapshot-common/changelog.Debian.gz") ++ (goto-address)) ++ ++(defun debian-emacs-news () ++ "Display the Debian NEWS file for this package." ++ (interactive) ++ (view-file "/usr/share/doc/emacs-snapshot-common/NEWS.Debian.gz") ++ (goto-address)) ++ ++(defun debian-emacs-readme () ++ "Display the Debian README file for this package." ++ (interactive) ++ ;; Force opening of this file in outline mode, even if the other mode ++ ;; is present. ++ (let ((auto-mode-alist (cons '("debian/README.Debian$" . outline-mode) ++ auto-mode-alist))) ++ (view-file "/usr/share/doc/emacs-snapshot-common/README.Debian") ++ (goto-address))) ++ + (define-key menu-bar-apropos-menu [apropos-documentation] + '(menu-item "Search Documentation Strings..." apropos-documentation + :help +@@ -1383,7 +1405,7 @@ + (define-key menu-bar-help-menu [about] + '(menu-item "About Emacs" display-splash-screen + :help "Display version number, copyright info, and basic help")) +-(define-key menu-bar-help-menu [sep2] ++(define-key menu-bar-help-menu [sep3] + '("--")) + (define-key menu-bar-help-menu [finder-by-keyword] + '(menu-item "Find Emacs Packages" finder-by-keyword +@@ -1400,6 +1422,17 @@ + (define-key menu-bar-help-menu [apropos] + (list 'menu-item "Search Documentation" menu-bar-apropos-menu)) ++(define-key menu-bar-help-menu [sep2] ++ '("--")) ++(define-key menu-bar-help-menu [debian-emacs-changelog] ++ '(menu-item "Debian ChangeLog" debian-emacs-changelog ++ :help "Display the Debian changelog")) ++(define-key menu-bar-help-menu [debian-emacs-news] ++ '(menu-item "Debian News" debian-emacs-news ++ :help "Display the NEWS.Debian file")) ++(define-key menu-bar-help-menu [debian-emacs-readme] ++ '(menu-item "Debian README" debian-emacs-readme ++ :help "Display the README.Debian file")) + (define-key menu-bar-help-menu [sep1] + '("--")) + (define-key menu-bar-help-menu [report-emacs-bug] --- emacs-snapshot-20061105.orig/debian/patches/debian-default-mta-parameters.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-default-mta-parameters.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-default-mta-parameters.dpatch by Rob Browning +## +## DP: ** The default for message-sendmail-f-is-evil has been changed to t. +## DP: This is correct for Debian systems where we know the MTA should be +## DP: trusted. +## DP: Provided by: Rob Browning + +@DPATCH@ +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el trunk/lisp/gnus/message.el +--- /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el 2005-04-25 21:03:02.847276408 +0200 ++++ trunk/lisp/gnus/message.el 2005-04-25 21:06:15.133044528 +0200 +@@ -717,9 +717,14 @@ + (const never) + (const ask))) + +-(defcustom message-sendmail-f-is-evil nil ++;; message-sendmail-f-is-evil is nil here in the upstream source, but ++;; sendmail works right under Debian Linux, so we want t. [was ++;; orignally reported for emacs 19 as debian#7051] ++(defcustom message-sendmail-f-is-evil t + "*Non-nil means don't add \"-f username\" to the sendmail command line. +-Doing so would be even more evil than leaving it out." ++Doing so would be even more evil than leaving it out. ++Under Debian/GNU/Linux, sendmail works right, so it should be safe for ++this to be set to true." + :group 'message-sending + :link '(custom-manual "(message)Mail Variables") + :type 'boolean) --- emacs-snapshot-20061105.orig/debian/patches/debian-font-lock-tty.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-font-lock-tty.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-font-lock-tty.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** Comment text is font-locked on 8-color ttys. +## DP: This patch undoes an upstream change and makes emacs-snapshot +## DP: behave as emacs21 did on 8-color ttys: comment text is +## DP: font-locked by default. +## DP: +## DP: Upstream decided to make comment text appear as regular text and +## DP: only fontify comment delimiters, which would probably trigger +## DP: numerous bug reports about comments not being font-locked on +## DP: ttys. +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./lisp/font-lock.el /tmp/dpep-work.G5puCE/emacs-snapshot-20050805100000/lisp/font-lock.el +--- ./lisp/font-lock.el 2005-07-19 13:31:31.000000000 +0200 ++++ /tmp/dpep-work.G5puCE/emacs-snapshot-20050805100000/lisp/font-lock.el 2005-08-05 10:35:31.000000000 +0200 +@@ -1700,9 +1700,9 @@ + (((class color) (min-colors 16) (background dark)) + (:foreground "red1")) + (((class color) (min-colors 8) (background light)) +- ) ++ (:foreground "red")) + (((class color) (min-colors 8) (background dark)) +- ) ++ (:foreground "red1")) + (t (:weight bold :slant italic))) + "Font Lock mode face used to highlight comments." + :group 'font-lock-highlighting-faces) --- emacs-snapshot-20061105.orig/debian/patches/debian-licenses-location.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-licenses-location.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-licenses-location.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** (describe-copying) uses /usr/share/common-licenses/GPL +## DP: On Debian systems, the full text of the GPL is available from the +## DP: /usr/share/common-licenses directory. The COPYING file included +## DP: in the Emacs distribution is not installed in `data-directory', +## DP: so `describe-copying' has been modified accordingly. +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./lisp/help.el /tmp/dpep-work.n6Ycu5/emacs-snapshot-20050819140000/lisp/help.el +--- ./lisp/help.el 2005-08-07 00:13:43.000000000 +0200 ++++ /tmp/dpep-work.n6Ycu5/emacs-snapshot-20050819140000/lisp/help.el 2005-08-24 10:57:05.000000000 +0200 +@@ -293,7 +293,7 @@ + (defun describe-copying () + "Display info on how you may redistribute copies of GNU Emacs." + (interactive) +- (view-file (expand-file-name "COPYING" data-directory)) ++ (view-file "/usr/share/common-licenses/GPL") + (goto-char (point-min))) + + (defun describe-project () --- emacs-snapshot-20061105.orig/debian/patches/debian-vc-bfn.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-vc-bfn.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-vc-bfn.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** No errors are signalled if buffer-file-name is "". +## DP: This patch adds two safeguards against VC errors that can be +## DP: signalled at save time if the buffer uses the empty string as +## DP: buffer-file-name. ERC, for example, uses this to set +## DP: buffer-file-name to a string value but computes the real value +## DP: when the buffer is saved since log files often contain the date +## DP: and time of saving in the filename. +## DP: +## DP: Similar changes have been submitted upstream but rejected +## DP: (upstream says buffer-file-name must be a valid filename or nil, +## DP: but nothing else). +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./lisp/vc-hooks.el /tmp/dpep-work.2yX4Cn/emacs-snapshot-20050805100000/lisp/vc-hooks.el +--- ./lisp/vc-hooks.el 2005-07-05 01:08:58.000000000 +0200 ++++ /tmp/dpep-work.2yX4Cn/emacs-snapshot-20050805100000/lisp/vc-hooks.el 2005-08-05 11:21:43.000000000 +0200 +@@ -336,7 +336,10 @@ + backend is tried first." + (let (handler) + (cond +- ((string-match vc-ignore-dir-regexp (file-name-directory file)) nil) ++ ((and ++ (file-name-directory file) ++ (string-match vc-ignore-dir-regexp (file-name-directory file))) ++ nil) + ((and (boundp 'file-name-handler-alist) + (setq handler (find-file-name-handler file 'vc-registered))) + ;; handler should set vc-backend and return t if registered +@@ -457,7 +460,7 @@ + ;; - `removed' + ;; - `copied' and `moved' (might be handled by `removed' and `added') + (or (vc-file-getprop file 'vc-state) +- (if (vc-backend file) ++ (if (and (> (length file) 0) (vc-backend file)) + (vc-file-setprop file 'vc-state + (vc-call state-heuristic file))))) + --- emacs-snapshot-20061105.orig/debian/patches/debian-rpath.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-rpath.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-rpath.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** Emacs is built without RPATH. +## DP: On Debian, binaries must not contain an RPATH section (and in +## DP: this case, it's redundant with system-wide library paths). +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad emacs-snapshot-20061027~/configure emacs-snapshot-20061027/configure +--- emacs-snapshot-20061027~/configure 2006-10-27 20:21:16.000000000 +0200 ++++ emacs-snapshot-20061027/configure 2006-10-27 20:22:25.000000000 +0200 +@@ -8566,7 +8566,7 @@ + if test "${x_libraries}" != NONE; then + if test -n "${x_libraries}"; then + LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` +- LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` ++ LD_SWITCH_X_SITE_AUX="" + fi + x_default_search_path="" + x_search_path=${x_libraries} --- emacs-snapshot-20061105.orig/debian/patches/debian-emacs-flavor.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-emacs-flavor.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-emacs-flavor.dpatch by Rob Browning +## +## DP: ** Define a Debian-specific Emacs flavor. +## DP: Provided by: Rob Browning + +@DPATCH@ +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/startup.el trunk/lisp/startup.el +--- /home/rlb/deb/emacs21/trunk/lisp/startup.el 2004-05-18 22:36:39.000000000 +0200 ++++ trunk/lisp/startup.el 2004-05-18 22:40:42.000000000 +0200 +@@ -285,6 +285,10 @@ + + (defvar normal-top-level-add-subdirs-inode-list nil) + ++(defconst debian-emacs-flavor 'emacs-snapshot ++ "A symbol representing the particular debian flavor of emacs running. ++Something like 'emacs20, 'xemacs20, etc.") ++ + (defvar no-blinking-cursor nil) + + (defvar pure-space-overflow nil +@@ -784,9 +788,18 @@ + ;; Run the site-start library if it exists. The point of this file is + ;; that it is run before .emacs. There is no point in doing this after + ;; .emacs; that is useless. +- (if site-run-file +- (load site-run-file t t)) ++ ;; (if site-run-file ++ ;; (load site-run-file t t)) + ++ ;; Debian version of site-start. ++ (if site-run-file ++ (progn ++ ;; Load all the debian package snippets. ++ ;; It's in here because we want -q to kill it too. ++ (if (load "debian-startup" t t nil) ++ (debian-startup debian-emacs-flavor)) ++ ;; Now the normal site file... ++ (load site-run-file t t nil))) + ;; Sites should not disable this. Only individuals should disable + ;; the startup message. + (setq inhibit-startup-message nil) --- emacs-snapshot-20061105.orig/debian/patches/debian-default-info-directory.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-default-info-directory.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-default-info-directory.dpatch by Rob Browning +## +## DP: ** Info-default-directory-list includes /usr/share/info/emacs-MAJOR +## DP: Info-default-directory-list was modified to reflect the install +## DP: location of the info files. This location allows multiple emacsen to +## DP: coexist on the same Debian system. +## DP: Provided by: Rob Browning + +@DPATCH@ +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/site-init.el trunk/lisp/site-init.el +--- /home/rlb/deb/emacs21/trunk/lisp/site-init.el 1969-12-31 18:00:00.000000000 -0600 ++++ trunk/lisp/site-init.el 2003-09-11 01:16:53.000000000 -0500 +@@ -0,0 +1,3 @@ ++(setq Info-default-directory-list ++ ;; the command line info doesn't seem to need this, but emacs does. ++ (append Info-default-directory-list '("/usr/share/info/emacs-snapshot/"))) + + --- emacs-snapshot-20061105.orig/debian/patches/debian-mail-from-style.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-mail-from-style.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-mail-from-style.dpatch by Romain Francoise +## +## DP: ** `mail-from-style' is set to 'system-default by default. +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad emacs-snapshot-20051207~/lisp/mail/sendmail.el emacs-snapshot-20051207/lisp/mail/sendmail.el +--- emacs-snapshot-20051207~/lisp/mail/sendmail.el 2005-12-07 20:36:57.000000000 +0100 ++++ emacs-snapshot-20051207/lisp/mail/sendmail.el 2005-12-07 20:39:18.000000000 +0100 +@@ -49,7 +49,7 @@ + :version "22.1") + + ;;;###autoload +-(defcustom mail-from-style 'angles ++(defcustom mail-from-style 'system-default + "Specifies how \"From:\" fields look. + + If `nil', they contain just the return address like: --- emacs-snapshot-20061105.orig/debian/patches/debian-cssc-vc-backend.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-cssc-vc-backend.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-cssc-vc-backend.dpatch by Rob Browning +## +## DP: ** Use CSSC instead of SCCS. +## DP: SCCS isn't in Debian, use CSSC as replacement. +## DP: Provided by: Rob Browning + +@DPATCH@ +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el trunk/lisp/vc-hooks.el +--- v/home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el 2004-05-18 22:43:49.000000000 +0200 ++++ trunk/lisp/vc-hooks.el 2004-05-18 22:44:32.000000000 +0200 +@@ -71,8 +71,8 @@ + :group 'vc) + + (defcustom vc-path +- (if (file-directory-p "/usr/sccs") +- '("/usr/sccs") ++ (if (file-directory-p "/usr/lib/cssc") ++ '("/usr/lib/cssc") + nil) + "*List of extra directories to search for version control commands." + :type '(repeat directory) --- emacs-snapshot-20061105.orig/debian/patches/00list +++ emacs-snapshot-20061105/debian/patches/00list @@ -0,0 +1,16 @@ +debian-version-mention +debian-cssc-vc-backend +debian-default-info-directory +debian-default-mta-parameters +debian-emacs-flavor +debian-emacs-manpage +debian-emacs-news +debian-mail-from-style +debian-menu +debian-font-lock-tty +debian-vc-bfn +debian-licenses-location +debian-rpath +debian-dp-split +debian-browse-url +debian-emacs-bug --- emacs-snapshot-20061105.orig/debian/patches/debian-dp-split.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-dp-split.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian-dp-split.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ** Windows can be split horizontally in `display-buffer'. +## DP: A new variable named `display-buffer-prefer-horizontal-split' +## DP: allows for a horizontal split of windows created by +## DP: `display-buffer', instead of the default vertical split. +## DP: Provided by: Romain Francoise + +@DPATCH@ +diff -urNad emacs-snapshot-20060330~/src/window.c emacs-snapshot-20060330/src/window.c +--- emacs-snapshot-20060330~/src/window.c 2006-03-20 23:22:25.000000000 +0100 ++++ emacs-snapshot-20060330/src/window.c 2006-04-01 18:47:33.000000000 +0200 +@@ -215,6 +215,10 @@ + + int window_deletion_count; + ++/* Prefer horizontal split in `display-buffer'? */ ++ ++int display_buffer_prefer_horizontal_split; ++ + /* Used by the function window_scroll_pixel_based */ + + static int window_scroll_pixel_based_preserve_y; +@@ -3556,7 +3560,9 @@ + && (EQ (window, selected_window) + || EQ (XWINDOW (window)->parent, Qnil)) + && window_height (window) >= window_min_height << 1) +- window = Fsplit_window (window, Qnil, Qnil); ++ window = Fsplit_window (window, Qnil, ++ display_buffer_prefer_horizontal_split ++ ? Qt : Qnil); + else + window = Fget_lru_window (frames, Qnil); + /* If Fget_lru_window returned nil, try other approaches. */ +@@ -7196,6 +7202,11 @@ + If there is only one window, it is split regardless of this value. */); + split_height_threshold = 500; + ++ DEFVAR_BOOL ("display-buffer-prefer-horizontal-split", &display_buffer_prefer_horizontal_split, ++ doc: /* *Non-nil means prefer horizontal split when splitting windows ++in `display-buffer'. */); ++ display_buffer_prefer_horizontal_split = 0; ++ + DEFVAR_INT ("window-min-height", &window_min_height, + doc: /* *Delete any window less than this tall (including its mode line). */); + window_min_height = 4; --- emacs-snapshot-20061105.orig/debian/patches/debian-version-mention.dpatch +++ emacs-snapshot-20061105/debian/patches/debian-version-mention.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## debian-version-mention.dpatch by Rob Browning +## +## DP: ** (emacs-version) has been modified to indicate Debian modifications. +## DP: Provided by: Rob Browning + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ +--- emacs21-21.2.orig/lisp/version.el ++++ emacs21-21.2/lisp/version.el +@@ -55,8 +55,8 @@ + (interactive "P") + (let ((version-string + (format (if (not (interactive-p)) +- "GNU Emacs %s (%s%s%s)\n of %s on %s" +- "GNU Emacs %s (%s%s%s) of %s on %s") ++ "GNU Emacs %s (%s%s%s)\n of %s on %s, modified by Debian" ++ "GNU Emacs %s (%s%s%s) of %s on %s, modified by Debian") + emacs-version + system-configuration + (cond ((featurep 'motif) --- emacs-snapshot-20061105.orig/debian/docs +++ emacs-snapshot-20061105/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +BUGS +CONTRIBUTE +README --- emacs-snapshot-20061105.orig/debian/emacs.xpm +++ emacs-snapshot-20061105/debian/emacs.xpm @@ -0,0 +1,222 @@ +/* XPM */ +static char * gnu_bits[] = { +"32 32 187 2", +" c None", +". c #696584", +"+ c #645F7C", +"@ c #5F5B76", +"# c #635F7C", +"$ c #5F5A76", +"% c #635E7B", +"& c #DCDBE1", +"* c #CFCED7", +"= c #B8B5C7", +"- c #ADA9C1", +"; c #A6A3B9", +"> c #9995A9", +", c #78748C", +"' c #676280", +") c #878398", +"! c #C2C0CD", +"~ c #9591AE", +"{ c #9B97B3", +"] c #BDBACC", +"^ c #9C98B3", +"/ c #A9A6B9", +"( c #67627D", +"_ c #625D7A", +": c #5E5A75", +"< c #8D89A0", +"[ c #A9A5BC", +"} c #938FAB", +"| c #B4B2C5", +"1 c #F8F8FA", +"2 c #E4E3EA", +"3 c #BCB9CB", +"4 c #9390A5", +"5 c #8B87A1", +"6 c #918DA9", +"7 c #BAB7C9", +"8 c #FFFFFF", +"9 c #F1F1F4", +"0 c #B4B1C4", +"a c #9D99AF", +"b c #5D5974", +"c c #8E8AA5", +"d c #A3A0B6", +"e c #F8F8F9", +"f c #9F9CB3", +"g c #8C88A3", +"h c #938FA9", +"i c #C6C4D1", +"j c #B7B4C5", +"k c #9D99B1", +"l c #5C5873", +"m c #8985A0", +"n c #B5B3C4", +"o c #F0F0F3", +"p c #A6A3B7", +"q c #9B98AE", +"r c #5C5872", +"s c #88849D", +"t c #A6A3B6", +"u c #F8F7F9", +"v c #C3C1CE", +"w c #9996AB", +"x c #5B5772", +"y c #85819A", +"z c #9491A7", +"A c #E0DFE6", +"B c #C2C0CC", +"C c #8C88A0", +"D c #9894A9", +"E c #5A5671", +"F c #838097", +"G c #B2B0BE", +"H c #F7F7F8", +"I c #D8D7DE", +"J c #928FA4", +"K c #9491A5", +"L c #5A5670", +"M c #817D95", +"N c #A9A6B6", +"O c #A8A5B6", +"P c #928FA3", +"Q c #59556F", +"R c #7E7B91", +"S c #BEBDC8", +"T c #AEACBA", +"U c #908DA0", +"V c #5B5771", +"W c #58546D", +"X c #65617A", +"Y c #E0DFE4", +"Z c #8E8B9E", +"` c #7A778D", +" . c #5A566F", +".. c #57536C", +"+. c #58546F", +"@. c #A19EAE", +"#. c #EAEAED", +"$. c #F5F4F6", +"%. c #A19FAE", +"&. c #625F78", +"*. c #77748A", +"=. c #59556E", +"-. c #56526B", +";. c #807D90", +">. c #D5D4DA", +",. c #9693A3", +"'. c #767387", +"). c #55516A", +"!. c #534F68", +"~. c #9491A1", +"{. c #F4F4F6", +"]. c #9E9CAA", +"^. c #5D5971", +"/. c #737084", +"(. c #545068", +"_. c #504D64", +":. c #F4F4F5", +"<. c #DEDDE2", +"[. c #5A576D", +"}. c #716F81", +"|. c #56526A", +"1. c #524F67", +"2. c #4D4A61", +"3. c #9A99A6", +"4. c #848292", +"5. c #6F6C7F", +"6. c #545169", +"7. c #514E65", +"8. c #4A475D", +"9. c #6B697B", +"0. c #D2D1D6", +"a. c #F4F3F5", +"b. c #9998A4", +"c. c #6C6A7B", +"d. c #535067", +"e. c #504C64", +"f. c #474459", +"g. c #747282", +"h. c #D1D0D5", +"i. c #E8E8EA", +"j. c #8C8A97", +"k. c #676576", +"l. c #4E4B62", +"m. c #444156", +"n. c #727080", +"o. c #E8E7EA", +"p. c #8A8996", +"q. c #656374", +"r. c #524F66", +"s. c #423F53", +"t. c #B8B7BE", +"u. c #D0CFD4", +"v. c #4E4B5E", +"w. c #636171", +"x. c #4C485E", +"y. c #434054", +"z. c #3F3C4F", +"A. c #575465", +"B. c #CFCED3", +"C. c #646272", +"D. c #504C62", +"E. c #49465B", +"F. c #4B475D", +"G. c #3D3A4C", +"H. c #494657", +"I. c #7A7884", +"J. c #B7B6BC", +"K. c #DADADD", +"L. c #4F4B61", +"M. c #464257", +"N. c #49455B", +"O. c #3A3748", +"P. c #5E5C6A", +"Q. c #908E98", +"R. c #C1C0C6", +"S. c #F3F2F4", +"T. c #777581", +"U. c #464357", +"V. c #474458", +"W. c #434053", +"X. c #3C3A4A", +"Y. c #373544", +"Z. c #444155", +"`. c #454256", +" + c #403D4F", +".+ c #423F52", +"++ c #444154", +" ", +" . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + . ", +" # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ # ", +" % $ & * = - - - - - - - - - - - - - - - - - - ; > , $ % ", +" ' $ ) ! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ { ] ] ^ ~ ~ ~ ~ ~ ~ ~ ~ / ( $ ' ", +" _ : < [ } } } } } } } } } } } } | 1 2 3 } } } } } } } 4 : _ ", +" : : 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 8 8 9 0 6 6 6 6 6 a : : ", +" b b c c c c c c c c c c c c c c d e 8 8 8 e c c c c c f b b ", +" b b g g g g g g g g g g g g h i e 8 8 8 8 j g g g g g k b b ", +" l l m m m m m m m m m m m n o 8 8 8 8 o p m m m m m m q l l ", +" r r s s s s s s s s s t o 8 8 8 8 u v s s s s s s s s w r r ", +" x x y y y y y y y z A 8 8 8 8 8 B C y y y y y y y y y D x x ", +" E E F F F F F F G H 8 8 8 8 I J F F F F F F F F F F F K l E ", +" L L M M M M M N 8 8 8 8 H O M M M M M M M M M M M M M P r L ", +" Q Q R R R R R S 8 8 8 8 T R R R R R R R R R R R R R R U V Q ", +" W W x x x x x X Y 8 8 8 Z x x x x x x x x x x x x x x ` .W ", +" ....+.+.+.+.+.+.+.@.#.8 $.%.&.+.+.+.+.+.+.+.+.+.+.+.+.*.=... ", +" -.-.-.-.-.-.-.-.;.>.8 8 8 8 8 ,.-.-.-.-.-.-.-.-.-.-.-.'.W -. ", +" ).).!.!.!.!.!.~.8 8 8 8 {.].^.!.!.!.!.!.!.!.!.!.!.!.!./...). ", +" (.(._._._._._.:.8 8 8 <.[._._._._._._._._._._._._._._.}.|.(. ", +" 1.1.2.2.2.2.2.3.8 8 8 4.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.5.6.1. ", +" 7.7.8.8.8.8.8.8.9.0.8 a.b.8.8.8.8.8.8.8.8.8.8.8.8.8.8.c.d.7. ", +" e.e.f.f.f.f.f.f.f.f.g.h.8 i.j.f.f.f.f.f.f.f.f.f.f.f.f.k.(.e. ", +" l.l.m.m.m.m.m.m.m.m.m.m.n.o.8 o.p.m.m.m.m.m.m.m.m.m.m.q.r.l. ", +" 2.2.s.s.s.s.s.s.s.s.s.s.s.s.t.8 8 u.v.s.s.s.s.s.s.s.s.w.7.2. ", +" x.x.y.z.z.z.z.z.z.z.z.z.z.z.A.8 8 8 B.z.z.z.z.z.z.z.z.C.D.x. ", +" E.F.f.G.G.G.G.G.G.G.G.H.I.J.8 8 8 8 K.G.G.G.G.G.G.G.G.k.L.E. ", +" M.N.N.y.O.O.O.O.O.O.O.O.P.Q.R.S.R.T.O.O.O.O.O.O.O.O.y.N.N.M. ", +" U.V.V.W.X.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.X.W.V.V.U. ", +" Z.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.Z. ", +" +.+++++++++++++++++++++++++++++++++++++++++.+ + ", +" "}; --- emacs-snapshot-20061105.orig/debian/mangle-info +++ emacs-snapshot-20061105/debian/mangle-info @@ -0,0 +1,17 @@ +#!/usr/bin/perl -w -i + +use English; +use strict; + +$RS = undef; + +my $prefix = $ENV{"DEBIAN_INFO_PREFIX"}; + +my $x = <>; +if(!($x =~ m/^(\s*START-INFO-DIR-ENTRY\s+\*\s*[^:]+:\s*)\(([^\)]+)\)/mo)) { + die "Couldn't find START-INFO-DIR-ENTRY."; +} + +print ${PREMATCH}; +print "$1($prefix/$2)"; +print ${POSTMATCH}; --- emacs-snapshot-20061105.orig/debian/emacs.desktop +++ emacs-snapshot-20061105/debian/emacs.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=@MENU_TITLE@ (@SUB_FLAVOR@) +GenericName=Emacs +Comment=GNU @MENU_TITLE@ Text Editor +Exec=/usr/bin/@BIN_NAME@-@X_SUPPORT@ +TryExec=@BIN_NAME@ +Terminal=false +Type=Application +Icon=/usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm +Categories=Application;Utility;TextEditor; +MimeType=text/plain --- emacs-snapshot-20061105.orig/debian/emacs.menu.in +++ emacs-snapshot-20061105/debian/emacs.menu.in @@ -0,0 +1,7 @@ +?package(@PKG_NAME@):\ + needs="X11"\ + section="Apps/Editors"\ + title="@MENU_TITLE@ (@SUB_FLAVOR@)"\ + command="/usr/bin/@BIN_NAME@-@X_SUPPORT@"\ + icon="/usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm"\ + hints="Text" --- emacs-snapshot-20061105.orig/debian/bug.control.in +++ emacs-snapshot-20061105/debian/bug.control.in @@ -0,0 +1,2 @@ +report-with: @BIN_NAME@-common @BIN_NAME@-bin-common @BIN_NAME@ @BIN_NAME@-gtk @BIN_NAME@-nox @BIN_NAME@-el emacsen-common +package-status: dictionaries-common --- emacs-snapshot-20061105.orig/debian/emacs-common.postrm +++ emacs-snapshot-20061105/debian/emacs-common.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/README.in +++ emacs-snapshot-20061105/debian/README.in @@ -0,0 +1,24 @@ +emacs-snapshot for Debian -*- outline -*- +------------------------- + +* Notes about emacs-snapshot + +These packages are based on the initial packaging work of Jérôme Marant +and Rob Browning (assisted by numerous contributors) and are maintained +by Romain Francoise . + +This version of Emacs has support for GTK+ widgets. The default +version (emacs-snapshot) still uses Lucid, a separate binary package +(emacs-snapshot-gtk) is available if you want GTK+ support. + +Several major packages have been updated or added in Emacs 22. In +particular, Gnus is now at version 5.11. If you had been using the +version of Gnus shipped in Emacs 21, starting Gnus 5.11 may convert +files automatically and generally alter your data. Make sure you have +good backups. + +To meet other emacs-snapshot users, join #emacs-snapshot@irc.freenode.net. + +* Debian-specific patches + +@@PATCH_LIST_HERE@@ --- emacs-snapshot-20061105.orig/debian/emacs-common.prerm +++ emacs-snapshot-20061105/debian/emacs-common.prerm @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +BIN_NAME=@BIN_NAME@ +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFO_SUBDIR=@INFO_EMACSDIR@ +INFOFILES="@INFOFILES@" + +for file in ${INFOFILES} +do + install-info --quiet --remove-exactly ${INFO_SUBDIR}/${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# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs-common.overrides.linda +++ emacs-snapshot-20061105/debian/emacs-common.overrides.linda @@ -0,0 +1 @@ +Tag: extra-license-file --- emacs-snapshot-20061105.orig/debian/emacs-common.docs +++ emacs-snapshot-20061105/debian/emacs-common.docs @@ -0,0 +1,3 @@ +README +BUGS +README.add-on-package-maintainers --- emacs-snapshot-20061105.orig/debian/emacs-bin-common.postinst +++ emacs-snapshot-20061105/debian/emacs-bin-common.postinst @@ -0,0 +1,30 @@ +#!/bin/sh -e + +BIN_NAME=@BIN_NAME@ +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 ctags etags emacsclient +do + update-alternatives \ + --install /usr/bin/$i $i /usr/bin/$i.${BIN_NAME} ${BIN_PRIORITY} \ + --slave /usr/share/man/man1/$i.1.gz $i.1.gz \ + /usr/share/man/man1/$i.1${BIN_NAME}.gz +done + +for i in ${ALTERNATIVES} +do + test $i = ctags && continue + test $i = etags && continue + test $i = emacsclient && continue + update-alternatives --install /usr/bin/$i $i /usr/bin/$i.${BIN_NAME} \ + ${BIN_PRIORITY} +done + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs-el.prerm +++ emacs-snapshot-20061105/debian/emacs-el.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs.postrm +++ emacs-snapshot-20061105/debian/emacs.postrm @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/NEWS +++ emacs-snapshot-20061105/debian/NEWS @@ -0,0 +1,38 @@ +emacs-snapshot (1:20060120-2) unstable; urgency=low + + * It is now possible to install the -x, -gtk and -nox binary packages + concurrently. The new alternative `emacs-snapshot' determines which + package owns the /usr/bin/emacs-snapshot command. + + -- Romain Francoise Sat, 28 Jan 2006 10:37:05 +0100 + +emacs-snapshot (20050805100000-1) unstable; urgency=low + + * This is the first official release of emacs-snapshot in Debian. These + packages are based on the initial packaging work of Jérôme Marant and + Rob Browning (assisted by numerous contributors) and are maintained by + Romain Francoise . + + Note: emacs-snapshot contains a version of the GNU Emacs editor built + from CVS HEAD. As such, it can contain bugs and issues that make it + unsuitable for general use. Experience shows that grave bugs are, + however, quite rare and it should be stable enough for everyday use. + + This version of Emacs adds support for GTK+ widgets. The default + version (emacs-snapshot) still uses Lucid, a new binary package + (emacs-snapshot-gtk) is available if you want GTK+ support. + + Several major packages have been updated or added in Emacs 22. In + particular, Gnus is now at version 5.11. If you had been using the + version of Gnus shipped in Emacs 21, starting Gnus 5.11 may convert + files automatically and generally alter your data. Make sure you have + good backups. + + The complete list of patches applied to the upstream source is + available from /usr/share/doc/emacs-snapshot-common/README.Debian. + + -- Romain Francoise Fri, 5 Aug 2005 14:25:36 +0200 + +Local Variables: +coding: utf-8 +End: --- emacs-snapshot-20061105.orig/debian/emacs.prerm +++ emacs-snapshot-20061105/debian/emacs.prerm @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +# Remove our subflavor alternative, unless we're upgrading. +if [ "$1" != "upgrade" ] +then + update-alternatives --remove @BIN_NAME@ /usr/bin/@BIN_NAME@-@X_SUPPORT@ +fi + +# Unregister ourselves as a subflavor of this flavor +rm -f /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-@X_SUPPORT@ + +# If we're the last installed subflavor, call `emacs-remove' and +# unregister various alternatives. +F=`ls /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-* 2>/dev/null || true` +if [ -n "$F" ]; then + echo "@BIN_NAME@ subflavors still installed, not uninstalling flavor..." +else + /usr/lib/emacsen-common/emacs-remove @BIN_NAME@ + update-alternatives --remove emacs /usr/bin/@BIN_NAME@ + update-alternatives --remove editor /usr/bin/@BIN_NAME@ +fi + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs-common.overrides.lintian +++ emacs-snapshot-20061105/debian/emacs-common.overrides.lintian @@ -0,0 +1,4 @@ +@PKG_NAME@: extra-license-file usr/share/emacs/@FULL_VERSION@/etc/copying.paper +@PKG_NAME@: script-not-executable ./usr/share/emacs/@FULL_VERSION@/etc/ulimit.hack +@PKG_NAME@: wrong-name-for-upstream-changelog usr/share/doc/@PKG_NAME@/changelogs +@PKG_NAME@: menu-command-not-in-package /usr/share/menu/@PKG_NAME@:7 /usr/bin/@BIN_NAME@ --- emacs-snapshot-20061105.orig/debian/emacs-el.overrides.linda +++ emacs-snapshot-20061105/debian/emacs-el.overrides.linda @@ -0,0 +1,2 @@ +# linda is stupid, copyright.el.gz isn't a copyright file +Tag: compressed-copyright --- emacs-snapshot-20061105.orig/debian/emacs.overrides.linda +++ emacs-snapshot-20061105/debian/emacs.overrides.linda @@ -0,0 +1,2 @@ +# This warning doesn't make a lot of sense... +Tag: package-b-d-on-autostar --- emacs-snapshot-20061105.orig/debian/compat +++ emacs-snapshot-20061105/debian/compat @@ -0,0 +1 @@ +5 --- emacs-snapshot-20061105.orig/debian/emacs.overrides.lintian +++ emacs-snapshot-20061105/debian/emacs.overrides.lintian @@ -0,0 +1 @@ +@PKG_NAME@: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm --- emacs-snapshot-20061105.orig/debian/changelog +++ emacs-snapshot-20061105/debian/changelog @@ -0,0 +1,1062 @@ +emacs-snapshot (1:20061105-1) unstable; urgency=low + + * The "My Descent into Madness" release. + + * New snapshot, still taken from HEAD. + + * debian/emacs.postinst: Install the `emacs' and `editor' alternatives + only once per flavor (closes: #394960). + * debian/emacs.prerm: Remove the `emacs' and `editor' alternatives only + once per flavor. Cleanups. + * debian/emacs.preinst: Handle alternatives upgrade from previous + emacs-snapshot versions. + + -- Romain Francoise Sun, 5 Nov 2006 11:27:33 +0100 + +emacs-snapshot (1:20061027-1) unstable; urgency=low + + * New snapshot, still taken from HEAD but corresponding to the first + Emacs 22 pretest release: Emacs 22.0.90. + + * debian/patches/debian-rpath.dpatch: Resync. + + -- Romain Francoise Fri, 27 Oct 2006 20:24:33 +0200 + +emacs-snapshot (1:20061022-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 22 Oct 2006 18:57:28 +0200 + +emacs-snapshot (1:20061015-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 15 Oct 2006 19:10:18 +0200 + +emacs-snapshot (1:20061009-1) unstable; urgency=low + + * The "No explosions, no crashes, no fights" release. + + * New snapshot, fixes mouse-3 clicks in org-mode (closes: #389914). + + -- Romain Francoise Mon, 9 Oct 2006 20:01:03 +0200 + +emacs-snapshot (1:20061003-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Tue, 3 Oct 2006 22:01:39 +0200 + +emacs-snapshot (1:20060923-1) unstable; urgency=low + + * The "Old schemes of shattered dreams" release. + + * New snapshot, includes a change to make movemail actually *use* + liblockfile, it was linked in but unused which is dangerous and a + violation of Policy (§11.6). + + * debian/rules: Give -Wl,--as-needed a try to see if it breaks some + architectures; it kills many useless library dependencies (12 for + emacs-gtk and 2 for emacs). + + * debian/emacs.postinst: Register editor.1.gz too (as a slave), thanks + to Elias Kunnas via Launchpad (https://launchpad.net/bugs/52699). + + * debian/control.in: Build-Depend on libpng12-dev, not libpng3-dev. + * debian/control: Regenerate. + + -- Romain Francoise Sat, 23 Sep 2006 19:00:41 +0200 + +emacs-snapshot (1:20060915-1) unstable; urgency=low + + * The "Grip it by the husk" release. + + * New snapshot. + + * debian/rules: Set SITELOAD_PURESIZE_EXTRA to 5000 in CFLAGS. + * debian/patches/debian-puresize.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 8 Sep 2006 21:39:45 +0200 + +emacs-snapshot (1:20060908-1) unstable; urgency=low + + * The "Fifteen steps, then a sheer drop" release. + + * New snapshot. + + * debian/control.in: Use ${source:Version} for the dependency between + emacs-bin-common and emacs-common. + * debian/control: Regenerate. + + * debian/rules: + + Check for pure space overflow after dump for each subflavor. + + Set alternative priority to 23 (closes: #386496). + + * debian/patches/debian-sendmail-program.dpatch: Dropped. + * debian/patches/00list: Update. + + * debian/patches/debian-puresize.dpatch: *Really* resync with upstream. + + -- Romain Francoise Fri, 8 Sep 2006 21:10:58 +0200 + +emacs-snapshot (1:20060901-1) unstable; urgency=low + + * The "Campershell dreams" release. + + * New snapshot. + + * debian/control.in: Don't Build-Depend on libasound2-dev on kfreebsd-*, + thanks to Petr Salinger (closes: #384492). + * debian/control: Regenerate. + + * debian/patches/debian-sendmail-program.dpatch: New patch, hardcode + location of sendmail in paths.el instead of trying to do the right + thing from the build environment (closes: #385542). + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 1 Sep 2006 22:43:37 +0200 + +emacs-snapshot (1:20060824-1) unstable; urgency=low + + * The "Sweetness follows" release. + + * New snapshot. + + * debian/control.in: Drop Build-Depends on mailx (closes: #383814). + * debian/control: Regenerate. + + -- Romain Francoise Wed, 23 Aug 2006 22:02:14 +0200 + +emacs-snapshot (1:20060817-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-emacs-bug.dpatch: Also make `report-emacs-bug' + send a courtesy copy of the report to emacs-snapshot@packages.d.o. + + * debian/README.in: Mention #emacs-snapshot@irc.freenode.net. + + -- Romain Francoise Thu, 17 Aug 2006 19:42:49 +0200 + +emacs-snapshot (1:20060811-1) unstable; urgency=low + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + + -- Romain Francoise Fri, 11 Aug 2006 18:44:58 +0200 + +emacs-snapshot (1:20060806-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 6 Aug 2006 11:06:32 +0200 + +emacs-snapshot (1:20060730-1) unstable; urgency=low + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + * debian/README.in: Cosmetic change. + + -- Romain Francoise Sun, 30 Jul 2006 13:10:08 +0200 + +emacs-snapshot (1:20060712-2) unstable; urgency=low + + * debian/control.in: Delete extra newline. + * debian/control: Regenerate. + + -- Romain Francoise Thu, 13 Jul 2006 08:03:45 +0200 + +emacs-snapshot (1:20060712-1) unstable; urgency=low + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + + -- Romain Francoise Wed, 12 Jul 2006 19:31:50 +0200 + +emacs-snapshot (1:20060707-1) unstable; urgency=low + + * The "Cities underneath cities" release. + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + + * debian/docs: Add CONTRIBUTE and AUTHORS. + + * debian/patches/debian-emacs-bug.dpatch: New patch, make M-x + report-emacs-bug include the Debian version in the generated + mail buffer. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 7 Jul 2006 19:18:06 +0200 + +emacs-snapshot (1:20060629-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 29 Jun 2006 21:03:37 +0200 + +emacs-snapshot (1:20060623-1) unstable; urgency=low + + * The "Dearest Jane, I should've known better" release. + + * New snapshot, includes fix for exponents in TeX-mode (closes: #365026). + + * debian/control.in: Don't Build-Depend on libasound2-dev on hurd-i386, + thanks to Michael Banck (closes: #374436). + * debian/control: Regenerate. + + * debian/patches/debian-browse-url.dpatch: New patch, make Emacs honor + the x-www-browser alternative if no browser has been customized. + Note that the alternative will *not* be used if it's set to auto, due + to the apparent lack of good sense applied to this alternative's + priorities (closes: #373294). + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 23 Jun 2006 18:58:05 +0200 + +emacs-snapshot (1:20060615-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 15 Jun 2006 19:41:34 +0200 + +emacs-snapshot (1:20060609-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: Drop Build-Depends on gcc-4.1, now the default compiler. + * debian/control: Regenerate. + + * debian/rules: Don't set CC. + + -- Romain Francoise Fri, 9 Jun 2006 18:54:35 +0200 + +emacs-snapshot (1:20060602-1) unstable; urgency=low + + * The "Isabella Afterhours" release. + + * New snapshot: + + The menu bar can now be navigated with keys, via F10. + + Org-mode has been updated to version 4.35. + + * debian/rules: + + Build with gcc-4.1, hoping to solve long-standing FTBFS bugs on + m68k. This also allows us to finally get rid of -Wno-pointer-sign + (closes: #368023). + + Use 'tail -n +2' instead of 'tail +2', with thanks to Sven Joachim + (closes: #368846). + + * debian/control.in: Add Build-Depends on gcc-4.1. + * debian/control: Regenerate. + + * debian/patches/debian-puresize.dpatch: Resync with upstream. + * debian/patches/debian-menu.dpatch: Ditto. + + * debian/README.in: Remove reference to the Arch archive, it might go + away soon. + + * debian/copyright.in: Move Debian differences blurb closer to the top. + * debian/copyright: Regenerate. + + -- Romain Francoise Fri, 2 Jun 2006 19:58:14 +0200 + +emacs-snapshot (1:20060524-1) unstable; urgency=low + + * New snapshot: + + In Dired, `dired-goto-file' is now bound to j instead of M-g. + As a result of this change, it's now possible to use the new + error bindings in Dired buffers (M-g M-p, M-g M-n). + + Emacs can now play sounds via a native ALSA interface. + + Org-mode has been updated to version 4.33. + + * debian/control.in: Add Build-Depends on libasound2-dev. + * debian/control: Regenerate. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Wed, 24 May 2006 19:32:11 +0200 + +emacs-snapshot (1:20060518-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: Cleanups. + * debian/patches/tmp-fixes.dpatch: Revert crashy font selection changes. + + -- Romain Francoise Thu, 18 May 2006 21:33:28 +0200 + +emacs-snapshot (1:20060512-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/tmp-fixes.dpatch: Drop Ibuffer changes. + + -- Romain Francoise Fri, 12 May 2006 20:05:37 +0200 + +emacs-snapshot (1:20060505-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: + + libxaw7-dev pulls libxaw-headers, so there's no need to Build-Depend + on the latter. + + Bump Standards-Version to 3.7.2, no changes needed. + * debian/control: Regenerate. + + * debian/patches/tmp-fixes.dpatch: Drop help-mode changes. Revert buggy + change to ibuffer.el. + + -- Romain Francoise Fri, 5 May 2006 18:35:28 +0200 + +emacs-snapshot (1:20060427-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-puresize.h: Resync with upstream. + * debian/patches/tmp-fixes.dpatch: Drop recenter changes. + + -- Romain Francoise Thu, 27 Apr 2006 20:31:42 +0200 + +emacs-snapshot (1:20060420-1) unstable; urgency=low + + * New snapshot: + + RMAIL doesn't barf on MIME mail anymore (closes: #363327). + + org-mode now handles local links correctly (closes: #363328). + + Includes Tramp 2.0.53. + + History commands in comint-derived modes no longer clobber partial + inputs. + + * debian/patches/tmp-fixes.dpatch: Revert dodgy changes to recenter, and + buggy changes to help-mode. Just for safety. + + * debian/patches/debian-puresize.h: New patch, bump BASE_PURESIZE to + 1210000. This is needed to make room for Debian modifications in the + Emacs binary. + * debian/patches/00list: Update. + + * debian/copyright.in: Update copyright years and GFDL version, thanks + to Sven Joachim (closes: #363123). + * debian/copyright: Regenerate. + + -- Romain Francoise Thu, 20 Apr 2006 20:47:43 +0200 + +emacs-snapshot (1:20060415-2) unstable; urgency=low + + * debian/control.in: Add Build-Depends on libxaw-headers, libxaw7-dev. + * debian/control: Regenerate. + + -- Romain Francoise Mon, 17 Apr 2006 13:09:12 +0200 + +emacs-snapshot (1:20060415-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: Don't Build-Depend on gcc-3.3 on m68k. + * debian/control: Regenerate. + * debian/rules: Give up on compilation with gcc-3.3 on m68k. + + -- Romain Francoise Sat, 15 Apr 2006 19:20:16 +0200 + +emacs-snapshot (1:20060406-1) unstable; urgency=low + + * New snapshot. + + * debian/debian-dp-split.dpatch: Rename variable to the more logical + `display-buffer-prefer-horizontal-split'. + + * debian/emacs.desktop: Add text/plain to MimeTypes (closes: #360415). + + -- Romain Francoise Thu, 6 Apr 2006 20:17:32 +0200 + +emacs-snapshot (1:20060330-2) unstable; urgency=low + + * debian/patches/tmp-fixes.dpatch: Revert annoying changes that make + completion windows stay around in comint-derived modes. + * debian/debian-dp-split.dpatch: New patch, adds a new variable named + `display-buffer-prefer-vertical-split' which allows for a vertical + split of windows created by `display-buffer', instead of the default + horizontal split. This is very convenient on modern wide screens. + Requested by Cyril Bouthors . + * debian/patches/00list: Update. + + -- Romain Francoise Sat, 1 Apr 2006 19:18:43 +0200 + +emacs-snapshot (1:20060330-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 30 Mar 2006 20:19:28 +0200 + +emacs-snapshot (1:20060323-1) unstable; urgency=low + + * New snapshot: + + Ibuffer now uses the list of displayed group filters in M-j and + friends (closes: #357364). + + Probably fixes issues with the speed of fontification in large + buffers (see #358038, #358456). + + -- Romain Francoise Thu, 23 Mar 2006 19:50:31 +0100 + +emacs-snapshot (1:20060315-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Wed, 15 Mar 2006 20:22:24 +0100 + +emacs-snapshot (1:20060301-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Wed, 1 Mar 2006 21:27:33 +0100 + +emacs-snapshot (1:20060224-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 24 Feb 2006 19:12:07 +0100 + +emacs-snapshot (1:20060217-2) unstable; urgency=low + + * debian/rules: *Really* use gcc-3.3 on m68k. + + -- Romain Francoise Sat, 18 Feb 2006 12:47:08 +0100 + +emacs-snapshot (1:20060217-1) unstable; urgency=low + + * New snapshot, includes the fix for Tramp on Solaris (closes: #352149). + + * debian/control.in: Build-Depend on gcc-3.3 on m68k. + * debian/control: Regenerate. + * debian/rules: Build with gcc-3.3 on m68k. + + * debian/patches/tmp-fixes.dpatch: Revert changes that make C-h c insert + text in the current buffer. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 17 Feb 2006 20:02:28 +0100 + +emacs-snapshot (1:20060209-1) unstable; urgency=low + + * New snapshot: + + ERC has been updated to version 5.1.1. + + MH-E has been updated to version 7.91. + + * debian/rules: Apply patch from Stefan Schmitt + splitting the build target in subflavor targets. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Thu, 9 Feb 2006 19:32:23 +0100 + +emacs-snapshot (1:20060202-1) unstable; urgency=low + + * New snapshot: + + ERC (version 5.1) is now part of Emacs. + + Tramp has been updated to version 2.0.52. + + MH-E has been updated to version 7.90. + + Several cases where code run from signal handlers could clobber Lisp + data have been fixed, which should make Emacs more reliable. + + * debian/patches/tmp-fixes.dpatch: Drop last week's changes (included in + this new upstream snapshot). + + -- Romain Francoise Thu, 2 Feb 2006 20:53:10 +0100 + +emacs-snapshot (1:20060120-2) unstable; urgency=low + + * The "Everything in its right place" release. + + * Not a new upstream snapshot: the trunk appears to be a dangerous place + at the moment, let's give it some time to settle down. + * debian/patches/tmp-fixes.dpatch: Revert a change that makes C-a skip + over fields (closes: #349819), add a patch to fix the "cursors appear + in all windows when the echo area is active" syndrome, other minor + changes. + + * Introducing subflavors: + + It is now possible to install the -x, -gtk and -nox binary packages + concurrently, each installed package constitutes a "subflavor" of the + emacs-snapshot flavor. To make this possible, a number of files have + been moved from the binary packages to -common or -bin-common, and + /usr/bin/emacs-snapshot is now an alternative. + + In addition, the way the packages install menu entries has been + reworked: the text version entry is now installed in emacs-common, and + menu/desktop entries installed by the -x and -gtk subflavors now have + only one entry (which mentions the right subflavor instead of a plain + "X11"). + * debian/control.in: + + emacs no longer Conflicts/Replaces emacs-gtk, emacs-nox. + + emacs-gtk no longer Conflicts/Replaces emacs, emacs-nox. + + emacs-nox no longer Conflicts/Replaces emacs-gtk, emacs. + + emacs-common Conflicts with emacs{,-gtk,-nox} (<< 1:20060120-2) + + emacs-bin-common Conflicts with emacs{,-gtk,-nox} (<< 1:20060120-2) + * debian/control: Regenerate. + * debian/emacs.desktop: + + Use @SUB_FLAVOR@, not "X11". + + Run the subflavor command, not just @BIN_NAME@. + * debian/emacs.menu.in: Remove text entry, use @SUB_FLAVOR@. + * debian/emacs.postinst: + + Install the subflavor alternative. + + If we're the first subflavor of this flavor, call `emacs-install'. + + Register the subflavor in /var/lib/@BIN_NAME@/installed-subflavors. + * debian/emacs.prerm: + + Remove the subflavor alternative. + + Unregister the subflavor. + + If we were the last installed subflavor, call `emacs-remove'. + * debian/rules: + + Generate emacs-common.menu, expand *.menu.in (not only emacs.menu.in). + + Handle new replacement variable SUB_FLAVOR. + + Set emacs subflavor to "X11", emacs-gtk subflavor to "GTK". + + Install /var/lib/@BIN_NAME@/installed-subflavors in emacs-common. + + Move emacs.1emacs-snapshot.gz symlink to emacs-bin-common. + + Don't install the DOC file in binary packages, install it in + emacs-common. + + Don't ship a flavor symlink in binary packages (now an alternative). + + Don't remove the DOC file from the emacs-common tree. + + Call dh_installmenu in binary-indep target, too. + * debian/emacs-common.overrides.lintian: Add override to silence lintian + about the missing /usr/bin/emacs-snapshot. + * debian/NEWS: Mention subflavors. + + -- Romain Francoise Sat, 28 Jan 2006 14:55:50 +0100 + +emacs-snapshot (1:20060120-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Fri, 20 Jan 2006 18:35:44 +0100 + +emacs-snapshot (1:20060114-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-menu.dpatch: New patch, add Debian related items + to the Help menu (README, NEWS, changelog). + * debian/patches/00list: Update. + + -- Romain Francoise Sat, 14 Jan 2006 21:29:32 +0100 + +emacs-snapshot (1:20060109-1) unstable; urgency=low + + * New snapshot: + + Now supports IPv6 for client/server network processes. + + If the user interrupts `save-buffer', `buffer-backed-up' is now + correctly reset to nil (closes: #343705). + + * debian/patches/tmp-fixes.dpatch: Temporary patch reverting changes to + mouse.el that prevent a mouse-1 click from working in non-selected + windows, which is especially annoying in Gnus (closes: #347207). + * debian/patches/00list: Update. + + -- Romain Francoise Mon, 9 Jan 2006 19:32:53 +0100 + +emacs-snapshot (1:20060103-1) unstable; urgency=low + + * New snapshot: + + battery.el's ACPI code also tries /proc/acpi/thermal_zone/THM0 to get + the system temperature (closes: #344528). + + font-lock defaults are now set early and in all entry points, which + should hopefully fix fontification issues in Gnus (closes: #344610). + + Should now manage to byte-compile semantic (closes: #343709, #344999). + + The GTK+ file selector has been significantly improved. + + -- Romain Francoise Tue, 3 Jan 2006 20:06:13 +0100 + +emacs-snapshot (1:20051221-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Wed, 21 Dec 2005 14:53:27 +0100 + +emacs-snapshot (1:20051215-1) unstable; urgency=low + + * New snapshot: + + SPC doesn't complete file names in the minibuffer anymore. See the + FAQ for instructions on how to get the old behavior back. + + Characters are now translated in isearch, which makes it possible to + search for Cyrillic UTF-8 chars, etc (closes: #337600). + + The Emacs FAQ has been updated for the upcoming 22.1 release. + + * debian/patches/tmp-fixes.dpatch: Drop last week's changes, add a patch + from RMS fixing autoload problems leading to the recursive load of + newsticker.el (closes: #342846). + + * debian/copyright.in: Update with new Savannah CVS setup. + * debian/copyright: Regenerate. + + -- Romain Francoise Thu, 15 Dec 2005 20:16:20 +0100 + +emacs-snapshot (1:20051207-1) unstable; urgency=low + + * New snapshot: + + CC Mode has been updated to version 5.31 and doesn't infloop on + unbalanced bracket/paren expressions anymore (closes: #341716). + See for more info. + + tumme.el is now part of the Emacs distribution, as a replacement + for thumbs.el. + + * debian/patches/debian-mail-from-style.dpatch: Resync with upstream. + * debian/patches/tmp-fixes.dpatch: Temporary patch reverting changes to + `enlarge-window' that break `balance-windows', and changes to the + minibuffer maps that make SPC a regular character and not complete + anymore (these changes broke ido, perhaps others). + * debian/patches/00list: Update. + + -- Romain Francoise Wed, 7 Dec 2005 20:32:36 +0100 + +emacs-snapshot (1:20051202-1) unstable; urgency=low + + * New snapshot: + + More `hard-newline' changes have been reverted, fixing issues in + Gnus where messages would be sent as format=flowed without + warning (closes: #340988). + + hi-lock-mode has been revamped and should now work in special + buffers (see #339920). + + The Calc global entry point (`calc-dispatch') is now bound to `C-x *'. + + * debian/rules: + + Add a symlink to the Emacs NEWS file in /usr/share/doc/emacs-common + (suggested by Vincent Lefevre). + + Install emacs.xpm ourselves (it was previously added in the upstream + tarball manually). + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 2 Dec 2005 18:49:40 +0100 + +emacs-snapshot (1:20051124-1) unstable; urgency=low + + * New snapshot. + + * debian/bug.script.in: New file. + * debian/bug.presubj.in: Likewise. + * debian/bug.control.in: Likewise. + + * debian/rules: + + Install README.Debian for emacs-bin-common. + + Generate bug files from debian/bug.*.in. + + Install bug script and bug control file under /usr/share/bug for + all binary packages. Install presubj file for emacs, emacs-gtk + and emacs-nox. + + Misc cleanups. + + * debian/patches/tmp-fixes.dpatch: Temporary patch reverting hi-lock + changes that broke fontification in special buffers (Gnus, ERC, ...) + if hi-lock mode was on. With thanks to Jay Berkenbilt, Bill Wohler + and Michael Olson for their help in tracking down this problem + (closes: #339920). + * debian/patches/00list: Update. + + -- Romain Francoise Thu, 24 Nov 2005 20:24:28 +0100 + +emacs-snapshot (1:20051117-1) unstable; urgency=low + + * New snapshot: + + file-name-shadow-mode is now enabled by default. + + Emacs now has an icon of its own, instead of the GNU icon. + + Displaying a non-break space character in an overlay doesn't make + Emacs infloop in redisplay anymore (closes: #337151). + + `C-h d' now runs apropos-documentation. + + savehist.el has been updated to version 24. + + * debian/rules: + + Don't install the gnu icon. + + Fix installation of README.Debian for emacs{,-{gtk,nox,el}}. + + * debian/gnu-32x32.xpm: Remove. + * debian/README.in: Remove reference to the gnu icon. + + * debian/emacs.desktop: Use the new icon. + * debian/emacs.menu.in: Ditto. + * debian/emacs.overrides.lintian: Ditto. + + * debian/compat: Switch to debhelper compatibility level 5. + * debian/control.in: Build-Depend on debhelper (>= 5.0.0). + * debian/control: Regenerate. + + -- Romain Francoise Thu, 17 Nov 2005 19:00:40 +0100 + +emacs-snapshot (1:20051111-1) unstable; urgency=low + + * New snapshot: + + Font-Lock mode is now enabled by default. + + rcirc.el and newsticker.el have been updated to newer versions. + + -- Romain Francoise Fri, 11 Nov 2005 15:39:58 +0100 + +emacs-snapshot (1:20051103-1) unstable; urgency=low + + * New snapshot, includes a newer version of savehist.el (closes: #336976). + + * debian/rules: Source files are now compressed upstream, just move them + to emacs-el. + + -- Romain Francoise Thu, 3 Nov 2005 19:09:09 +0100 + +emacs-snapshot (1:20051027-1) unstable; urgency=low + + * New snapshot: + + eterm-color.ti now defines the correct terminal name (closes: #335241). + + Exiting when some buffers still have clients attached now prompts + only once (closes: #335444). + + -- Romain Francoise Thu, 27 Oct 2005 18:28:24 +0200 + +emacs-snapshot (1:20051020-1) unstable; urgency=low + + * New snapshot: + + Includes savehist.el, a package to save minibuffer histories between + sessions. + + Includes rcirc.el, a simple IRC client. + + Includes MH-E version 7.85. + + * debian/control.in: Delete Uploaders field. + * debian/control: Regenerate. + + -- Romain Francoise Thu, 20 Oct 2005 20:33:49 +0200 + +emacs-snapshot (1:20051014-1) unstable; urgency=low + + * New snapshot: + + Emacs now shows its icon by default in the GNOME task list and + elsewhere, the new option --no-bitmap-icon turns it off. + + Includes Tramp 2.0.51. + + * debian/control.in: + + Conflict with old versions of dictionaries-common since proper + support for emacs-snapshot was introduced in version 0.60.0, suggested + by Karl Chen (closes: #333409). + + Remove useless (but harmless) Replaces on emacs21, suggested by + Sven Joachim. + * debian/control: Regenerate. + + * debian/emacs.desktop: Remove -i switch. + * debian/emacs.menu.in: Likewise. + + * debian/patches/tmp-build-fix.dpatch: Drop. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 14 Oct 2005 18:10:18 +0200 + +emacs-snapshot (1:20051007-1) unstable; urgency=low + + * New snapshot: + + BibTeX mode now honors `sentence-end-double-space' and other filling + variables, thanks to Roland Winkler (closes: #330917). + + Autoloads in cua-base and ibuf-ext no longer explicitely request the + .el file (closes: #332315). + + Includes Speedbar version 1.0. + + * debian/patches/tmp-build-fix.dpatch: Temporary patch reverting + unimportant changes that break the emacs-nox build. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 7 Oct 2005 15:41:44 +0200 + +emacs-snapshot (1:20050929-1) unstable; urgency=low + + * The "Dittsche" release. + + * New snapshot. + + -- Romain Francoise Thu, 29 Sep 2005 08:52:15 +0200 + +emacs-snapshot (1:20050922-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 22 Sep 2005 08:23:16 +0200 + +emacs-snapshot (1:20050918-1) unstable; urgency=low + + * New snapshot. + + * Add linda overrides, bringing the override support level with lintian. + + debian/*.overrides: Rename to debian/*.overrides.lintian. + + debian/emacs-bin-common.overrides.linda: New file. + + debian/emacs-common.overrides.linda: Ditto. + + debian/emacs-el.overrides.linda: Ditto. + + debian/emacs.overrides.linda: Ditto. + + * debian/patches/debian-version-mention.dpatch: Fix patch description to + mention emacs-version and not version as the function modified. + + * debian/rules: + + Update lintian override filenames. + + Install linda overrides. + + Remove useless '--with-gif' confflag. + + -- Romain Francoise Sun, 18 Sep 2005 15:33:30 +0200 + +emacs-snapshot (1:20050908-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: Compress all files in emacs-el. + + -- Romain Francoise Thu, 8 Sep 2005 18:33:23 +0200 + +emacs-snapshot (1:20050901-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-rpath.dpatch: New file, disables RPATH in + emacs-x and emacs-gtk binaries. + * debian/patches/00list: Update. + + * debian/emacs-bin-common.overrides: Add overrides for man pages + installed as alternatives: their section is correct, and the binaries + do have man pages. + + * debian/emacs-common.overrides: Add override for the "wrong name for + upstream changelog" check: it's a directory, and it holds the (many) + upstream changelogs (and the top-level changelog is now symlinked, + too). + + * debian/rules: + + Strip the dpatch-list-patch header line. + + Symlink upstream top-level changelog. + + Swap fixed and variable parts in changelog file names. + + * debian/patches/debian-cssc-vc-backend.dpatch: Add "Provided by" line. + * debian/patches/debian-font-lock-tty.dpatch: Ditto. + * debian/patches/debian-licenses-location.dpatch: Ditto. + * debian/patches/debian-vc-bfn.dpatch: Ditto. + * debian/patches/debian-version-mention.dpatch: Ditto. + + -- Romain Francoise Thu, 1 Sep 2005 18:25:51 +0200 + +emacs-snapshot (1:20050825-1) unstable; urgency=low + + * New snapshot. + + * debian/emacs-bin-common.prerm: Fix buggy loop left over from + pre-unstable packaging, because of this no alternatives were actually + removed when emacs-bin-common was removed... (closes: #324870). + + * debian/emacs-bin-common.postinst: + + In emacs-snapshot, the binary named 'emacs' is moved out of the way + before expanding @ALTERNATIVES@ so it doesn't appear in the list. + Don't special-case for it in emacs-bin-common.postinst as it'll never + be there. + + Remove unused INFOFILES variable. + + * debian/rules: + + Add upstream changelogs in /usr/share/doc so that users can have + access to them without downloading 30M of sources. It doesn't make + much difference in a package that occupies more than 50M and has some + real value for users since emacs-snapshot is a constantly moving + target. + + Don't install menu items for emacs-nox. + + * debian/patches/debian-licenses-location.dpatch: New patch, modifies + `describe-copying' to find the full text of the GPL in the system-wide + location for licenses (/usr/share/common-licenses), the COPYING file + included in the Emacs distribution isn't installed (and differs from + the Debian version in whitespace only). + + * New versioning scheme: the overly large version number in previous + uploads triggered a bug in quinn-diff which resulted in emacs-snapshot + not appearing in q-d output and thus not being rebuilt on some archs. + The bug has been fixed in quinn-diff (thanks to Ryan Murray) but to + prevent any further damage, I'm changing the versioning scheme to + something sane (and mandated by Policy, see §3.2.1). + The historical versioning scheme was of doubtful value anyway. + + * debian/changelog: Delete trailing whitespace in pre-unstable entries. + + -- Romain Francoise Thu, 25 Aug 2005 18:35:13 +0200 + +emacs-snapshot (20050819140000-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: README.Debian is generated from the list of Debian + patches and its size varies depending on the number of patches, so + dh_compress sometimes compresses it, and sometimes not. To avoid + having to fix the references in debian/copyright and NEWS, forcibly + leave it uncompressed. + + * debian/patches/image-pbm-xbm.dpatch: Dropped (fixed upstream). + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 19 Aug 2005 18:34:53 +0200 + +emacs-snapshot (20050812140000-2) unstable; urgency=low + + * debian/patches/image-pbm-xbm.dpatch: New file, revert an upstream + change that erroneously removes the pbm and xbm image types. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 12 Aug 2005 20:00:22 +0200 + +emacs-snapshot (20050812140000-1) unstable; urgency=low + + * New snapshot: + + Fixes a bug triggered by GTK+ 2.6.9 where opened menus could + disappear randomly in emacs-snapshot-gtk (closes: #322307). + + Includes Tramp 2.0.50. + + * debian/patches/debian-emacs-news.dpatch: Fix reference to + README.Debian, it isn't compressed automatically in emacs-snapshot + (it's now installed by dh_installdocs). + + * debian/changelog: + + Fix name of NEWS file in previous entry. + + Add mode to the local variables section. + + * debian/rules: + + Set pkg_name for emacs-common and emacs-bin-common to fix the + generation of lintian override files. + + Set flavour description. + + Pipe dpatch-list-patch output to sed to generate outline compliant + headings, the outline regexp used in the emacs21 packages doesn't + match in emacs-snapshot, and it's simpler to have regular outline + sections in the file in the first place. + + * debian/copyright.in: + + Use the new FSF postal address (updated in COPYING in the Emacs + sources). + + Add 2005 to copyright years. + + Fix location of README.Debian. + * debian/copyright: Regenerate. + + * debian/patches/debian-font-lock-tty.dpatch: Add outline markers. + * debian/patches/debian-vc-bfn.dpatch: Ditto. + + * debian/patches/debian-cssc-vc-backend.dpatch: Add dpatch description + marker (caused an empty patch description in README.Debian). + + * debian/control.in: Add flavour description to the short description of + the main package, which is emacs-snapshot in this source package + (closes: #322180). + * debian/control: Regenerate. + + * debian/README.in: + + Add information section stolen from the initial NEWS entry. + + Remove paragraph about .elc files and Leim being added to the + upstream sources: these packages are built from a snapshot tarball for + which neither of these things is true. + + Remove local variables section. + + Add note about the baz archive. + + * debian/emacs.menu.in: Add -i option to the menu command item in order + to get the Emacs icon in the GNOME window list (and equivalent + features in other desktop environments). + * debian/emacs.desktop: Ditto. + + -- Romain Francoise Fri, 12 Aug 2005 17:51:10 +0200 + +emacs-snapshot (20050805100000-1) unstable; urgency=low + + * Initial snapshot release in unstable. See NEWS.Debian.gz for general + information on these packages. + + * debian/control.in: + + Set myself as Maintainer, Jerome and Rob as Uploaders. + + Bump dpatch build-dependency to dpatch (>= 2.0.9). + + Bump Standards-Version to 3.6.2, no changes needed. + + Fix Replaces line on emacs21. + * debian/control: Regenerate. + + * debian/rules: + + Add -Wno-pointer-sign to CFLAGS. + + Generate debian/README.Debian from the templates. + + * debian/NEWS: New file. + + * debian/patches/debian-font-lock-tty.dpatch: New file. + * debian/patches/debian-vc-bfn.dpatch: New file. + * debian/patches/00list: Update. + + * Several other minor changes, see the baz log. + + -- Romain Francoise Fri, 5 Aug 2005 14:41:18 +0200 + +emacs-snapshot (20050519215621-1) unstable; urgency=low + + * New snapshot release. + + * Do not force epaths re-generation after calls to configure any more + since configure now provides a '--enable-locallisppath' + - debian/rules: + + Add --enable-locallisppath option to confflags + + Remove epaths_force_cmd function + + Remove calls to epaths_force_cmd + + -- Jerome Marant Thu, 19 May 2005 22:07:33 +0200 + +emacs-snapshot (20050425220908-2) unstable; urgency=low + + * Merge fixes from Davide Salvetti + - debian/patches/misc-unseparated.dpatch: Remove hunks. + + * Incorporated fixes from Daniel Brockman : + - debian/rules: + + Don't prefix local_lpath paths with EMACS_COMMON + + Add new epaths_force_cmd + + Add calls to epaths_force_cmd after every call to configure + + Add new variable local_lpath_install which prefixes all + paths from local_lpath with EMACS_COMMON + + Set locallisppath to local_lpath_install at install-time + + -- Jerome Marant Thu, 12 May 2005 21:57:05 +0200 + +emacs-snapshot (20050425220908-1) unstable; urgency=low + + * New snapshot release. + + * Merge changes from 21.4a-1 + + * debian/control: + - Switch Maintainer and Uploaders fields. + - Build-depend on dpatch >= 2.0.9. + + * debian/rules: properly install emacs-snapshot-nox manpage. + + * debian/patches/misc-unseparated.dpatch: + - Fix docstring for message-sendmail-f-is-evil: the first line of a + docstring should be a complete sentence describing the function. + Thanks to Kai Großjohann + - Updated patch to etc/NEWS. + + -- Jerome Marant Mon, 25 Apr 2005 22:37:09 +0200 + +emacs-snapshot (20040508-1) unstable; urgency=low + + * Initial release. This package is branched from emacs21 21.3+1-5. + + * Port package to debhelper [Jérôme Marant] + - debian/control.in: added debhelper to build-dependencies. + - debian/control: regenerated. + - debian/rules + - debian/build-binary-pkg: removed. + - debian/compat: new file containing debhelper compatibility version. + - debian/docs: new file. + - debian/emacs-common.docs: new file. + + * Add GTK+ 2.x support (#179469, #194388) [Jérôme Marant] + - debian/control.in: add new package emacs-gtk + - debian/control: regenerated. + - debian/rules + + * Remove upstream applied patches [Jérôme Marant] + - debian/patches/scroll-margin.dpatch + - debian/patches/save-buffer.dpatch + - debian/patches/hurd-libio-glibc.dpatch + - debian/patches/detect-coding-iso2022.dpatch + - debian/patches/browse-url.dpatch + - debian/patches/battery-acpi-support.dpatch + + -- Jerome Marant Sat, 8 May 2004 14:42:33 +0200 --- emacs-snapshot-20061105.orig/debian/rules +++ emacs-snapshot-20061105/debian/rules @@ -0,0 +1,793 @@ +#!/usr/bin/make -f + +# Copyright 1994, 1995 Ian Jackson. +# Copyright 1998-2003 Rob Browning . +# Copyright 2004, 2005 Jérôme Marant . +# Copyright 2005, 2006 Romain Francoise . + +# Originally copied from the GNU Hello Debian rules file (1.3). +# modified for emacs by Mark Eichin +# modified for emacs20 by Rob Browning +# modified for emacs21 by Rob Browning +# modified for emacs-snapshot by Romain Francoise + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +SHELL = /bin/bash + +include /usr/share/dpatch/dpatch.make + +DEB_TRASH := + +# For now we assume that emacs' versioning scheme is always +# MAJOR.MINORtinyrev where MAJOR and MINOR are integers and tinyrev is +# an optional lowercase letter (or letters). We also assume that +# upstream uses a numbering scheme that sorts in a "Debian friendly" +# way. So far that's always been true. If it becomes false, some of +# the values below will have to be set manually. + +# At the moment, we try to make it so that a "debian/rules clean" will +# get you back to the same state you were in before "debian/rules +# build". With the original upstream source that's somewhat tricky +# because they ship the .elc files, but we need to re-build them when +# we patch the corresponding .el files. This is further complicated +# by the fact that any of these .el files may have macros, and if +# those are changed, then any other .el files that use those macros +# must also be recompiled. Over time (over the years), we've tried +# various ways to handle this problem, originally by trying to keep +# track of which files need to be recompiled and only recompiling +# those, then later by just re-building all the .elc files with "make +# bootstrap". In either case, if you don't want to have diff bloat, +# you have to do something to keep track of the original .elc files so +# you can restore them during make clean. + +# All of this was a lot of work, and was using quite a bit of +# unnecessary storage both in the .orig.tar.gz and during the package +# build. So in order to avoid this, and to dramatically simplify +# things, we now just remove the .elc files from the upstream +# distribution whenever we create the debian .orig.tar.gz file for a +# given upstream release. Since were always clobbering all of the +# .elc files during the package build anyway, this shouldn't be any +# great loss, and it also means that "debian/rules clean" is now a +# simple matter of little more than a "make distclean" followed by a +# purge of all the remaining .elc files. + +# NOTE -- emacs doesn't respect .elc files in VPATH build. They're +# modified in srcdir, not builddir. We don't worry about this because +# it shouldn't affect our builds ATM, but if we ever have more than +# one emacs configuration which could produce differing .elc files, +# we'll need to be careful -- probably have to build completely +# separate packages from completely separate source trees. + +# For now we handle the autofiles.diff file separately from the other +# dpatch patches. This is so that we don't have to worry about +# possible problems with unpatch after a failed automatic diff +# generation, and so we don't have to try to apply all the patches +# *except* the autofiles.dpatch during the automatic generation. + +# working directly on the source tree, rather than copying to +# debian/build-src to create the build-src has some drawbacks. In +# particular, it makes it a lot easier to get wedged if you don't put +# the source tree into the right state before starting to edit. If +# you make it so that you can't unpatch cleanly then you can get the +# tree into a can't go forward, can't go back state. + +###### Flavour-dependent variables ### + +# Generic title of menu entries +menu_title = Emacs Snapshot +flav_desc = development snapshot + +# Alternative priority +bin_priority = 23 + +# Info files subdirectory +info_emacsdir = emacs-snapshot + +info_title = Emacs Snapshot + +###################################### + +# The name of the Debian source package +src_name := $(shell dpkg-parsechangelog | egrep '^Source:') +src_name := $(shell echo ${src_name} | perl -pe 's/Source:\s+//o') + +# The binary package prefix is currently equal to the source name +bin_name := ${src_name} + +# The version from the changelog (i.e. 20.5-1) +debian_ver := $(shell dpkg-parsechangelog | egrep '^Version:') +debian_ver := $(shell echo ${debian_ver} | perl -pe 's/Version:\s+//o') +# The Debian revision (i.e. the 1 from 20.5-1) +# Always everything after the last '-' +debian_rev := $(shell echo ${debian_ver} | perl -pe 's/.*-//o') + +# This is the official upstream version defined by the emacs-version +# constant in lisp/version.el +nominal_ver := $(shell egrep 'defconst[[:space:]]*emacs-version' lisp/version.el) +nominal_ver := $(shell echo '${nominal_ver}' | sed -e 's;^[^"]*"\([^"]*\)".*$$;\1;') + +# This must be the version that's actually used at runtime for things +# like load-path. It may not be the same as the upstream version +# (i.e. when you have upstream 20.5a, the functional version may still +# be 20.5), so we do this by hand. +runtime_ver := $(shell echo ${nominal_ver} | perl -pe 's/[a-z]+$$//o') + +major_ver := $(shell echo ${runtime_ver} | perl -pe 's/\..*$$//o') +minor_ver := $(shell echo ${runtime_ver} | perl -pe 's/^[^.]*\.//o') + +# version for the debian source, i.e. if the upstream is 21.3, this +# might be 21.3, or it might be 21.3+1 if we've had to have more than +# one re-release of the upstream source. Rare, but it happens... +# Always everything before the last '-' +debsrc_ver := $(shell echo ${debian_ver} | perl -pe 's/-[^-]+$$//o') + +# Autoconf prerequisite +ac_prereq := $(shell egrep 'AC_PREREQ' configure.in) +ac_prereq := $(shell echo '${ac_prereq}' | sed -e 's;^[^(]*(\([^)]*\)).*$$;\1;') + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# We need extra pure space for Debian menu entries. +CFLAGS := -DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +LDFLAGS := -g -Wl,--as-needed + +INSTALL = install + +confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + +target := $(DEB_HOST_GNU_TYPE) +movemail_bin := usr/lib/emacs/${runtime_ver}/${target}/movemail + +# Info files that are going to show up in the main dir. +main_dir_info_files := $(shell grep "^../info" man/Makefile.in | \ + sed -e "s%../info/\([^:]*\).*$$%\1%" | sort) eintr elisp + +# Build directories +EMACS_COMMON = $(CURDIR)/debian/${bin_name}-common +EMACS_BIN_COMMON = $(CURDIR)/debian/${bin_name}-bin-common +EMACS = $(CURDIR)/debian/${bin_name} +EMACS_NOX = $(CURDIR)/debian/${bin_name}-nox +EMACS_GTK = $(CURDIR)/debian/${bin_name}-gtk +EMACS_EL = $(CURDIR)/debian/${bin_name}-el + +local_lpath := /etc/${bin_name}:/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 := ${local_lpath}:/usr/share/emacs/site-lisp + +# This shouldn't be needed as of 20.3 +local_lpath := ${local_lpath}:/usr/share/emacs/${runtime_ver}/leim + +# Installation local_lpath +local_lpath_install := $(EMACS_COMMON)/$(subst :,:$(EMACS_COMMON)/,${local_lpath}) + +# These files must always exist, i.e. can't ever be cleaned. +PERSISTENT_AUTOGEN_FILES := debian/control debian/copyright + +NONPERSISTENT_AUTOGEN_FILES := \ + debian/README.Debian \ + debian/README.binpkg \ + debian/bug.presubj \ + debian/bug.script \ + debian/bug.control \ + debian/${bin_name}.menu \ + debian/${bin_name}.preinst \ + debian/${bin_name}.postinst \ + debian/${bin_name}.prerm \ + debian/${bin_name}.postrm \ + debian/${bin_name}.overrides.lintian \ + debian/${bin_name}.overrides.linda \ + debian/${bin_name}.desktop \ + debian/${bin_name}-gtk.preinst \ + debian/${bin_name}-gtk.postinst \ + debian/${bin_name}-gtk.prerm \ + debian/${bin_name}-gtk.postrm \ + debian/${bin_name}-gtk.menu \ + debian/${bin_name}-gtk.overrides.lintian \ + debian/${bin_name}-gtk.desktop \ + debian/${bin_name}-nox.preinst \ + debian/${bin_name}-nox.postinst \ + debian/${bin_name}-nox.prerm \ + debian/${bin_name}-nox.postrm \ + debian/${bin_name}-nox.overrides.lintian \ + debian/${bin_name}-el.postinst \ + debian/${bin_name}-el.prerm \ + debian/${bin_name}-el.overrides.linda \ + debian/${bin_name}-common.postinst \ + debian/${bin_name}-common.prerm \ + debian/${bin_name}-common.postrm \ + debian/${bin_name}-common.overrides.lintian \ + debian/${bin_name}-common.overrides.linda \ + debian/${bin_name}-common.menu \ + debian/${bin_name}-bin-common.postinst \ + debian/${bin_name}-bin-common.prerm \ + debian/${bin_name}-bin-common.postrm \ + debian/${bin_name}-bin-common.overrides.lintian \ + debian/${bin_name}-bin-common.overrides.linda + +DEBPKGFILES := ${PERSISTENT_AUTOGEN_FILES} ${NONPERSISTENT_AUTOGEN_FILES} + +movemail_bin := usr/lib/emacs/${runtime_ver}/${target}/movemail + +define checkdir + test -f debian/emacs.postinst + @if ! test -f src/emacs.c; \ + then \ + echo; \ + echo -n "The upstream source does not appear to be available."; \ + echo " Please put the contents"; \ + echo -n "of ${src_name}_${debsrc_ver}.orig.tar.gz into the"; \ + echo " current directory."; \ + echo; \ + false; \ + fi +endef + +define update_debian_autofiles_dpatch + $(MAKE) debian/rules clean + # rm aclocal.m4 so it doesn't confuse newer autoconfs, but touch it + # so ./Makefile won't be upset if it's not recreated (b/c not needed). + (set -e; \ + echo -n "trap 'exit 230' EXIT"; \ + echo -n " && rm -f aclocal.m4 && touch aclocal.m4"; \ + echo -n " && aclocal"; \ + echo -n " && autoconf"; \ + echo -n " && rm -rf autom4te.cache"; \ + echo -n " && trap - EXIT"; \ + echo -n " && exit") \ + | dpatch-edit-patch patch autofiles +endef + +define expand_file_subst_vars + sed -e "s%@SRC_NAME@%${src_name}%g" \ + -e "s%@BIN_NAME@%${bin_name}%g" \ + -e "s%@PKG_NAME@%${pkg_name}%g" \ + -e "s%@FULL_VERSION@%${runtime_ver}%g" \ + -e "s%@MAJOR_VERSION@%${major_ver}%g" \ + -e "s%@MINOR_VERSION@%${minor_ver}%g" \ + -e "s%@PACKAGE_VERSION@%${debian_ver}%g" \ + -e "s%@DEBIAN_REV@%${deb_rev}%g" \ + -e "s%@NOMINAL_VERSION@%${nominal_ver}%g" \ + -e "s%@AC_PREREQ@%${ac_prereq}%g" \ + -e "s%@X_SUPPORT@%${xsupport}%g" \ + -e "s%@BIN_PRIORITY@%${bin_priority}%g" \ + -e "s%@INFO_EMACSDIR@%${info_emacsdir}%g" \ + -e "s%@INFO_FILES@%${main_dir_info_files}%g" \ + -e "s%@INFO_TITLE@%${info_title}%g" \ + -e "s%@MENU_TITLE@%${menu_title}%g" \ + -e "s%@TARGET@%${target}%g" \ + -e "s%@FLAVOUR_DESC@% (${flav_desc})%g" \ + -e "s%@SUB_FLAVOR@%${sub_flavor}%g" \ + > $@ < $< +endef + +check-vars: + @echo "current directory: $(CURDIR)" + @echo "debian_ver: ${debian_ver}" + @echo "debsrc_ver: ${debsrc_ver}" + @echo "debian_rev: ${debian_rev}" + @echo "nominal_ver: ${nominal_ver}" + @echo "runtime_ver: ${runtime_ver}" + @echo "major_ver: ${major_ver}" + @echo "minor_ver: ${minor_ver}" + @echo "autoconf prereq: ${ac_prereq}" +.PHONY: check-vars + +buildpackage: + ${checkdir} + if command -v debuild >/dev/null 2>&1 ; then \ + debuild \ + -i'\\+\\+pristine-trees|\\+\\+saved.*|,,.*|{arch}|\.arch-ids' ; \ + else \ + dpkg-buildpackage -D -rfakeroot -us -uc \ + -i'\\+\\+pristine-trees|\\+\\+saved.*|,,.*|{arch}|\.arch-ids' ; \ + fi +.PHONY: buildpackage + +# we don't sync this automatically on clean because it's expensive and +# should only be done by a maintainer with time to deal with any mess +# it might create. +autofiles-sync: + ${update_debian_autofiles_dpatch} +.PHONY: autofiles-sync + +debian-sync: ${PERSISTENT_AUTOGEN_FILES} + +# we use PHONY because deleting patches won't cause rebuild otherwise. +debian/README.Debian: debian/README.in debian/patches/*.dpatch + cd debian && csplit -s -f README. README.in '/@@PATCH_LIST_HERE@@/' + cp debian/README.00 debian/README.tmp + dpatch-list-patch | tail -n +2 | grep -v -e '^debian/patches/' | \ + sed 's@^ \*\*@\*\*@' >> debian/README.tmp + tail -n +2 < debian/README.01 >> debian/README.tmp + mv debian/README.tmp debian/README.Debian +.PHONY: debian/README.Debian +DEB_TRASH += debian/README.tmp debian/README.00 debian/README.01 + +debian/%: debian/%.in debian/changelog + ${expand_file_subst_vars} + +debian/${bin_name}.%: xsupport := "x" +debian/${bin_name}.%: pkg_name := ${bin_name} +debian/${bin_name}.%: sub_flavor := "X11" + +debian/${bin_name}-gtk.%: xsupport := "gtk" +debian/${bin_name}-gtk.%: pkg_name := ${bin_name}-gtk +debian/${bin_name}-gtk.%: sub_flavor := "GTK" + +debian/${bin_name}-nox.%: xsupport := "nox" +debian/${bin_name}-nox.%: pkg_name := ${bin_name}-nox + +debian/${bin_name}-common.%: pkg_name := ${bin_name}-common + +debian/${bin_name}-bin-common.%: pkg_name := ${bin_name}-bin-common + +debian/%.menu: debian/%.menu.in + ${expand_file_subst_vars} + +debian/${bin_name}.%: debian/emacs.% + ${expand_file_subst_vars} + +debian/${bin_name}-gtk.%: debian/emacs.% + ${expand_file_subst_vars} + +debian/${bin_name}-nox.%: debian/emacs.% + ${expand_file_subst_vars} + +debian/${bin_name}-el.%: debian/emacs-el.% + ${expand_file_subst_vars} + +debian/${bin_name}-common.%: debian/emacs-common.% + ${expand_file_subst_vars} + +debian/${bin_name}-bin-common.%: debian/emacs-bin-common.% + ${expand_file_subst_vars} + +define build_cmd + ${MAKE} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +endef + +define check_pure_space + src/emacs -batch --eval "(print pure-space-overflow)" 2>/dev/null \ + | grep -qx nil +endef + +emacs_inst = (${MAKE} install \ + INSTALL_STRIP="-s" \ + prefix=${1}/usr \ + sharedstatedir=${1}/var/lib \ + localstatedir=${1}/var \ + libexecdir=${1}/usr/lib \ + infodir=${1}/usr/share/info/${info_emacsdir} \ + mandir=${1}/usr/share/man \ + manext=.1${bin_name} \ + locallisppath=${local_lpath_install}) + +# Common confflags +confflags += --prefix=/usr +confflags += --sharedstatedir=/var/lib +confflags += --libexecdir=/usr/lib +confflags += --localstatedir=/var +confflags += --infodir=/usr/share/info +confflags += --mandir=/usr/share/man +confflags += --with-pop=yes +confflags += --enable-locallisppath=${local_lpath} + +# Emacs confflags +emacs_confflags := ${confflags} +emacs_confflags += --with-x=yes +emacs_confflags += --with-x-toolkit=athena +emacs_confflags += --with-toolkit-scroll-bars + +# Emacs-gtk confflags +emacs_gtk_confflags := ${confflags} +emacs_gtk_confflags += --with-x=yes +emacs_gtk_confflags += --with-x-toolkit=gtk + +# Emacs-nox confflags +emacs_nox_confflags := ${confflags} +emacs_nox_confflags += --with-x=no + + +build: patch build-stamp + +build-stamp: bootstrap emacs emacs-gtk emacs-nox + dh_testdir + touch $@ + +bootstrap: bootstrap-stamp +bootstrap-stamp: + dh_testdir + + # Emacs must be bootstraped at least once in order to + # generate .elc files + CFLAGS="${CFLAGS}" ./configure ${emacs_confflags} + ${build_cmd} bootstrap + ${build_cmd} distclean + + touch $@ + +emacs: bootstrap emacs-stamp +emacs-stamp: + dh_testdir + + # Build emacs + CFLAGS="${CFLAGS}" ./configure ${emacs_confflags} + ${build_cmd} + # Check for pure space overflow + ${check_pure_space} + # save binary from deletion + mv src/emacs src/x-emacs + ${build_cmd} distclean + + touch $@ + +emacs-gtk: bootstrap emacs-gtk-stamp +emacs-gtk-stamp: + dh_testdir + + # Build emacs-gtk + CFLAGS="${CFLAGS}" ./configure ${emacs_gtk_confflags} + ${build_cmd} + # Check for pure space overflow + ${check_pure_space} + # save binary from deletion + mv src/emacs src/gtk-emacs + ${build_cmd} distclean + + touch $@ + +emacs-nox: bootstrap emacs-nox-stamp +emacs-nox-stamp: + dh_testdir + + # Build emacs-nox + CFLAGS="${CFLAGS}" ./configure ${emacs_nox_confflags} + ${build_cmd} + # Check for pure space overflow + ${check_pure_space} + # save binary from deletion + mv src/emacs src/nox-emacs + + touch $@ + +debian-clean: + dh_testdir + dh_testroot + + rm -f ${NONPERSISTENT_AUTOGEN_FILES} + rm -f ${DEB_TRASH} + + dh_clean + +clean: unpatch debian-clean + + rm -f *-stamp + + # Force configuration in order to prevent any problem + # that may have been happening during the previous + # build + CFLAGS="${CFLAGS}" ./configure ${emacs_confflags} + -$(MAKE) maintainer-clean + + rm -f src/{x,nox,gtk}-emacs + + # Remove byte compiled files + find -name "*.elc" | xargs --no-run-if-empty rm + + # Remove info files + for f in ${main_dir_info_files} ; do \ + rm -f info/$$f* ; \ + done + + # Remove backup files + find -name '*~' | xargs --no-run-if-empty rm -f + +install: build $(DEBPKGFILES) + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + ################################################## + # emacs-common (preparation) + + # Install everything in emacs-common. Then any other + # package is based on it. + $(call emacs_inst,$(EMACS_COMMON)) + + rm -f $(EMACS_COMMON)/usr/bin/{emacs,emacs-*} + + # lisp path directories + $(INSTALL) -d $(EMACS_COMMON)/etc/${bin_name}/site-start.d + $(INSTALL) -d $(EMACS_COMMON)/usr/share/${bin_name} + + # We need scratch space in /var to register subflavors + $(INSTALL) -d $(EMACS_COMMON)/var/lib/${bin_name}/installed-subflavors + + # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs + # to be in share/emacs21 so that as we upgrade from 21.1 to 21.2, etc., + # add-on package bits don't get left behind. + mv $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/site-lisp \ + $(EMACS_COMMON)/usr/share/${bin_name} + dh_link -p${bin_name}-common usr/share/${bin_name}/site-lisp \ + usr/share/emacs/${runtime_ver}/site-lisp + + # This is a duplicate of the file in /site-lisp + rm $(EMACS_COMMON)/usr/share/emacs/site-lisp/subdirs.el + + # Install icon + cp debian/emacs.xpm \ + $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/etc/emacs.xpm + + chown root.mail $(EMACS_COMMON)/${movemail_bin} + chmod g+s $(EMACS_COMMON)/${movemail_bin} + + # Mangle info files + chmod 755 debian/mangle-info + for f in ${main_dir_info_files} ; do \ + DEBIAN_INFO_PREFIX=${info_emacsdir} \ + debian/mangle-info \ + $(EMACS_COMMON)/usr/share/info/${info_emacsdir}/$$f ; \ + done + + # Install changelogs -- remove this for stable Emacs releases + $(INSTALL) -D -m 0644 ChangeLog $(EMACS_COMMON)/usr/share/doc/${bin_name}-common/changelogs/changelog + for d in src lisp{,/gnus,/url,/mh-e} man lwlib lib-src leim ; do \ + $(INSTALL) -m 0644 $$d/ChangeLog \ + $(EMACS_COMMON)/usr/share/doc/${bin_name}-common/changelogs/`echo $$d|sed 's@/@.@'`.changelog ; \ + done + dh_link -p${bin_name}-common \ + usr/share/doc/${bin_name}-common/changelogs/changelog.gz \ + usr/share/doc/${bin_name}-common/changelog.gz + + # Symlink /usr/share/doc/emacs-common/NEWS to the Emacs NEWS file + dh_link -p${bin_name}-common \ + usr/share/emacs/${nominal_ver}/etc/NEWS \ + usr/share/doc/${bin_name}-common/NEWS + + # Get rid of unwanted dir file. + rm $(EMACS_COMMON)/usr/share/info/${info_emacsdir}/dir + + # make sure /usr/local dir doesn't exist + rm -rf $(EMACS_COMMON)/usr/local + + # Install overrides + $(INSTALL) -D -m 0644 debian/${bin_name}-common.overrides.lintian \ + $(EMACS_COMMON)/usr/share/lintian/overrides/${bin_name}-common + + $(INSTALL) -D -m 0644 debian/${bin_name}-common.overrides.linda \ + $(EMACS_COMMON)/usr/share/linda/overrides/${bin_name}-common + + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + $(EMACS_COMMON)/usr/share/bug/${bin_name}-common/script + $(INSTALL) -D -m 0644 debian/bug.control \ + $(EMACS_COMMON)/usr/share/bug/${bin_name}-common/control + + # Remove extra license files + rm -f $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/{etc,lisp}/COPYING + + ################################################## + # emacs-bin-common (preparation) + + # Move common binary to emacs-bin-common + $(INSTALL) -d $(EMACS_BIN_COMMON)/usr + mv $(EMACS_COMMON)/usr/bin $(EMACS_BIN_COMMON)/usr + mv $(EMACS_COMMON)/usr/lib $(EMACS_BIN_COMMON)/usr + + # Set alternatives + (alternatives=`ls $(EMACS_BIN_COMMON)/usr/bin | xargs` && \ + for f in debian/${bin_name}-bin-common.* ; do \ + sed -e "s%@ALTERNATIVES@%$$alternatives%g" \ + $$f > $$f.new ; \ + mv $$f.new $$f ; \ + done) + + for f in `ls $(EMACS_BIN_COMMON)/usr/bin`; \ + do \ + mv $(EMACS_BIN_COMMON)/usr/bin/$$f \ + $(EMACS_BIN_COMMON)/usr/bin/$$f.${bin_name} ; \ + done + + # Move man pages + $(INSTALL) -d $(EMACS_BIN_COMMON)/usr/share + mv $(EMACS_COMMON)/usr/share/man $(EMACS_BIN_COMMON)/usr/share + + # Fix manpages + perl -pi -e "s|man1/etags\\.1|man1/etags\\.1${bin_name}|" \ + $(EMACS_BIN_COMMON)/usr/share/man/man1/ctags.1${bin_name} + dh_link -p${bin_name}-bin-common usr/share/man/man1/emacs.1${bin_name}.gz \ + usr/share/man/man1/${bin_name}.1.gz + + # Install README.Debian + $(INSTALL) -D -m 0644 debian/README.binpkg \ + $(EMACS_BIN_COMMON)/usr/share/doc/${bin_name}-bin-common/README.Debian + + # Install overrides + $(INSTALL) -D -m 0644 debian/${bin_name}-bin-common.overrides.lintian \ + $(EMACS_BIN_COMMON)/usr/share/lintian/overrides/${bin_name}-bin-common + + $(INSTALL) -D -m 0644 debian/${bin_name}-bin-common.overrides.linda \ + $(EMACS_BIN_COMMON)/usr/share/linda/overrides/${bin_name}-bin-common + + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + $(EMACS_BIN_COMMON)/usr/share/bug/${bin_name}-bin-common/script + $(INSTALL) -D -m 0644 debian/bug.control \ + $(EMACS_BIN_COMMON)/usr/share/bug/${bin_name}-bin-common/control + + ################################################## + # emacs (preparation) + + $(INSTALL) -d $(EMACS)/usr/bin + cp src/x-emacs $(EMACS)/usr/bin/${bin_name}-x + + $(INSTALL) -d $(EMACS)/usr/share/man/man1 + dh_link -p${bin_name} usr/share/man/man1/emacs.1${bin_name}.gz \ + usr/share/man/man1/${bin_name}-x.1.gz + + # Install README.Debian + $(INSTALL) -D -m 0644 debian/README.binpkg \ + $(EMACS)/usr/share/doc/${bin_name}/README.Debian + + # Install desktop entry + $(INSTALL) -D -m 0644 debian/${bin_name}.desktop \ + $(EMACS)/usr/share/applications/${bin_name}.desktop + + # Install overrides + $(INSTALL) -D -m 0644 debian/${bin_name}.overrides.lintian \ + $(EMACS)/usr/share/lintian/overrides/${bin_name} + + $(INSTALL) -D -m 0644 debian/${bin_name}.overrides.linda \ + $(EMACS)/usr/share/linda/overrides/${bin_name} + + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + $(EMACS)/usr/share/bug/${bin_name}/script + $(INSTALL) -D -m 0644 debian/bug.control \ + $(EMACS)/usr/share/bug/${bin_name}/control + # Install bug notice + $(INSTALL) -D -m 0644 debian/bug.presubj \ + $(EMACS)/usr/share/bug/${bin_name}/presubj + + ################################################## + # emacs-gtk (preparation) + + $(INSTALL) -d $(EMACS_GTK)/usr/bin + cp src/gtk-emacs $(EMACS_GTK)/usr/bin/${bin_name}-gtk + + $(INSTALL) -d $(EMACS_GTK)/usr/share/man/man1 + dh_link -p${bin_name}-gtk usr/share/man/man1/emacs.1${bin_name}.gz \ + usr/share/man/man1/${bin_name}-gtk.1.gz + + # Install README.Debian + $(INSTALL) -D -m 0644 debian/README.binpkg \ + $(EMACS_GTK)/usr/share/doc/${bin_name}-gtk/README.Debian + + # Install desktop entry + $(INSTALL) -D -m 0644 debian/${bin_name}-gtk.desktop \ + $(EMACS_GTK)/usr/share/applications/${bin_name}-gtk.desktop + + # Install overrides + $(INSTALL) -D -m 0644 debian/${bin_name}-gtk.overrides.lintian \ + $(EMACS_GTK)/usr/share/lintian/overrides/${bin_name}-gtk + + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + $(EMACS_GTK)/usr/share/bug/${bin_name}-gtk/script + $(INSTALL) -D -m 0644 debian/bug.control \ + $(EMACS_GTK)/usr/share/bug/${bin_name}-gtk/control + # Install bug notice + $(INSTALL) -D -m 0644 debian/bug.presubj \ + $(EMACS_GTK)/usr/share/bug/${bin_name}-gtk/presubj + + ################################################## + # emacs-nox (preparation) + + $(INSTALL) -d $(EMACS_NOX)/usr/bin + cp src/nox-emacs $(EMACS_NOX)/usr/bin/${bin_name}-nox + + $(INSTALL) -d $(EMACS_NOX)/usr/share/man/man1 + dh_link -p${bin_name}-nox usr/share/man/man1/emacs.1${bin_name}.gz \ + usr/share/man/man1/${bin_name}-nox.1.gz + + # Install README.Debian + $(INSTALL) -D -m 0644 debian/README.binpkg \ + $(EMACS_NOX)/usr/share/doc/${bin_name}-nox/README.Debian + + # Install overrides + $(INSTALL) -D -m 0644 debian/${bin_name}-nox.overrides.lintian \ + $(EMACS_NOX)/usr/share/lintian/overrides/${bin_name}-nox + + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + $(EMACS_NOX)/usr/share/bug/${bin_name}-nox/script + $(INSTALL) -D -m 0644 debian/bug.control \ + $(EMACS_NOX)/usr/share/bug/${bin_name}-nox/control + # Install bug notice + $(INSTALL) -D -m 0644 debian/bug.presubj \ + $(EMACS_NOX)/usr/share/bug/${bin_name}-nox/presubj + + ################################################## + # emacs-el (preparation) + + # Install README.Debian + $(INSTALL) -D -m 0644 debian/README.binpkg \ + $(EMACS_EL)/usr/share/doc/${bin_name}-el/README.Debian + + # Install overrides + $(INSTALL) -D -m 0644 debian/${bin_name}-el.overrides.linda \ + $(EMACS_EL)/usr/share/linda/overrides/${bin_name}-el + + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + $(EMACS_EL)/usr/share/bug/${bin_name}-el/script + $(INSTALL) -D -m 0644 debian/bug.control \ + $(EMACS_EL)/usr/share/bug/${bin_name}-el/control + + (cd $(EMACS_COMMON) && \ + find -name "*.el.gz" | \ + tar cpf - --files-from -) | \ + (cd $(EMACS_EL) && tar xpf -) + + ################################################## + # Final emacs-common clean ups + + # We install the DOC file in emacs-common. It used to be in + # the binary packages but it turns out that it's identical + # for all packages on all archs, and prevents installation + # of concurrent subflavors. (But let's just keep one.) + rm -f $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/etc/DOC-${runtime_ver}.2 + find $(EMACS_COMMON) -name "*.el.gz" -exec rm -f {} \; + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i + dh_installmenu -i + dh_link -i + dh_strip -i + dh_compress -XREADME.Debian -i + dh_fixperms -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installinfo -a + dh_installman -a + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a -X${movemail_bin} + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- emacs-snapshot-20061105.orig/debian/bug.presubj.in +++ emacs-snapshot-20061105/debian/bug.presubj.in @@ -0,0 +1,2 @@ +Please use "@BIN_NAME@ -q" to verify that the bug you want to report +isn't caused by a configuration error. --- emacs-snapshot-20061105.orig/debian/emacs-common.postinst +++ emacs-snapshot-20061105/debian/emacs-common.postinst @@ -0,0 +1,91 @@ +#!/bin/sh -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFOFILES="@INFO_FILES@" +INFO_SUBDIR=@INFO_EMACSDIR@ +INFO_TITLE="@INFO_TITLE@" + +for file in ${INFOFILES} +do + install-info --quiet --section "${INFO_TITLE}" "${INFO_TITLE}" \ + /usr/share/info/${INFO_SUBDIR}/${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# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs-bin-common.postrm +++ emacs-snapshot-20061105/debian/emacs-bin-common.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/copyright +++ emacs-snapshot-20061105/debian/copyright @@ -0,0 +1,36 @@ +-*-text-*- + +This package was debianized by Rob Browning +on Tue, 16 Dec 1997 00:05:45 -0600 and is now maintained by +Romain Francoise . + +The Debian source is based on a CVS checkout of the GNU Emacs CVS trunk, +which can be obtained with: + + cvs -z3 -d :pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs co emacs + +For more details, see . + +Please see /usr/share/doc/emacs-snapshot-common/README.Debian for a +description of the Debian specific differences from the upstream +version. + +Copyright: + + GNU Emacs is Copyright (C) 1985, 1986, 1987, 1993-2006 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA and is covered under the terms of the GPL. See the file + /usr/share/common-licenses/GPL for more information. + + The GNU Emacs Manual is Copyright (C) 1985, 1986, 1987, 1993-2006 Free + Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. It is covered under the terms of the GNU Free + Documentation License, version 1.2 or later. See node `GNU Free + Documentation License' in the Info manual (emacs) for details. + + The GNU Emacs Manual and related manuals in /usr/share/info/emacs-snapshot + are Copyright (C) 1985, 1986, 1987, 1993-2006 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA. They are covered under the terms of the GNU Free Documentation + License, version 1.2 or later. See node `GNU Free Documentation + License' in the Info manual (emacs) for details. --- emacs-snapshot-20061105.orig/debian/emacs-el.postinst +++ emacs-snapshot-20061105/debian/emacs-el.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs-bin-common.prerm +++ emacs-snapshot-20061105/debian/emacs-bin-common.prerm @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +BIN_NAME=@BIN_NAME@ +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.${BIN_NAME} + done +fi + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs.postinst +++ emacs-snapshot-20061105/debian/emacs.postinst @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +# Register ourselves as the flavor alternative +update-alternatives \ + --install /usr/bin/@BIN_NAME@ @BIN_NAME@ \ + /usr/bin/@BIN_NAME@-@X_SUPPORT@ 0 + +# emacsen-common registration: if a subflavor package is already +# installed, don't call `emacs-install'. +F=`ls /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-* 2>/dev/null || true` +if [ -n "$F" ]; then + echo "@BIN_NAME@ flavor installation already done, skipping..." +else + # Set up the emacs alternative for @BIN-NAME@ + update-alternatives \ + --install /usr/bin/emacs emacs \ + /usr/bin/@BIN_NAME@ @BIN_PRIORITY@ \ + --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \ + /usr/share/man/man1/emacs.1@BIN_NAME@.gz + + # ... then set up the editor alternative... + update-alternatives \ + --install /usr/bin/editor editor \ + /usr/bin/@BIN_NAME@ 0 \ + --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ + /usr/share/man/man1/emacs.1@BIN_NAME@.gz + + # ... then call `emacs-install'. + /usr/lib/emacsen-common/emacs-install @BIN_NAME@ +fi + +# Register ourselves as a subflavor of this flavor +touch /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-@X_SUPPORT@ + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/emacs.preinst +++ emacs-snapshot-20061105/debian/emacs.preinst @@ -0,0 +1,13 @@ +#!/bin/sh -e + +# Starting with 20061105-1, the emacs and editor alternatives are +# registered only once. We need to clean up any previous registrations +# by subflavor packages. +if [ "$1" = "upgrade" ] && \ + dpkg --compare-versions "$2" 'lt' "1:20061105-1"; then + update-alternatives --remove emacs /usr/bin/@BIN_NAME@-@X_SUPPORT@ +fi + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20061105.orig/debian/README.binpkg.in +++ emacs-snapshot-20061105/debian/README.binpkg.in @@ -0,0 +1,2 @@ +Please see /usr/share/doc/@BIN_NAME@-common/ as the primary +documentation directory. --- emacs-snapshot-20061105.orig/debian/emacs-bin-common.overrides.linda +++ emacs-snapshot-20061105/debian/emacs-bin-common.overrides.linda @@ -0,0 +1,2 @@ +Tag: no-manual-for-binary +Data: (e|c)(tags|macsclient).emacs-snapshot --- emacs-snapshot-20061105.orig/debian/copyright.in +++ emacs-snapshot-20061105/debian/copyright.in @@ -0,0 +1,36 @@ +-*-text-*- + +This package was debianized by Rob Browning +on Tue, 16 Dec 1997 00:05:45 -0600 and is now maintained by +Romain Francoise . + +The Debian source is based on a CVS checkout of the GNU Emacs CVS trunk, +which can be obtained with: + + cvs -z3 -d :pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs co emacs + +For more details, see . + +Please see /usr/share/doc/@BIN_NAME@-common/README.Debian for a +description of the Debian specific differences from the upstream +version. + +Copyright: + + GNU Emacs is Copyright (C) 1985, 1986, 1987, 1993-2006 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA and is covered under the terms of the GPL. See the file + /usr/share/common-licenses/GPL for more information. + + The GNU Emacs Manual is Copyright (C) 1985, 1986, 1987, 1993-2006 Free + Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. It is covered under the terms of the GNU Free + Documentation License, version 1.2 or later. See node `GNU Free + Documentation License' in the Info manual (emacs) for details. + + The GNU Emacs Manual and related manuals in /usr/share/info/@BIN_NAME@ + are Copyright (C) 1985, 1986, 1987, 1993-2006 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA. They are covered under the terms of the GNU Free Documentation + License, version 1.2 or later. See node `GNU Free Documentation + License' in the Info manual (emacs) for details.