debian/0000755000000000000000000000000012232455632007172 5ustar debian/copyright.in0000644000000000000000000001237212164175106011536 0ustar -*-text-*- This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source archive is emacs-@UPSTREAM_VERSION@.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a description of the Debian specific differences from the upstream version. As mentioned there, some files (including some of the Emacs documentation) have been removed from this package because their licenses do not appear to satisfy the requirements of the Debian Free Software Guidelines (DFSG). See http://www.debian.org/social_contract. In particular, some of the info pages are covered under the GNU Free Documentation License (GFDL), which Debian has decided does not satisfy the DFSG in cases where "Invariant Sections" are specified (this includes front and back cover texts). See this Debian General Resolution on the topic: http://www.debian.org/vote/2006/vote_001. The Ubuntu project does not consider that GFDL invariant sections make a work non-free, so has placed the package @DEB_FLAVOR@-common-non-free in the "main" archive section, and added a dependency from @DEB_FLAVOR@-common. You should therefore have all documentation on your system. Some other files have been removed because their license only allows verbatim copying, or because there was some other question. Copyright: Emacs itself is licensed under the terms of the GNU General Public License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and doc/man/rcs-checkin.1 are licensed as follows: Copyright (C) 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/emacs.1 is licensed as follows: Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/etags.1 is licensed as follows: Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. man/faq.texi is licensed as follows: Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner Copyright (C) 1992,1993 Steven Byrnes Copyright (C) 1990,1991,1992 Joseph Brian Wells This list of frequently asked questions about GNU Emacs with answers ("FAQ") may be translated into other languages, transformed into other formats (e.g. Texinfo, Info, WWW, WAIS), and updated with new information. The same conditions apply to any derivative of the FAQ as apply to the FAQ itself. Every copy of the FAQ must include this notice or an approved translation, information on who is currently maintaining the FAQ and how to contact them (including their e-mail address), and information on where the latest version of the FAQ is archived (including FTP information). The FAQ may be copied and redistributed under these conditions, except that the FAQ may not be embedded in a larger literary work unless that work itself allows free copying and redistribution. debian/mangle-info0000755000000000000000000000046312164175107011317 0ustar #!/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}; debian/compat0000644000000000000000000000000212164175107010370 0ustar 7 debian/emacsVER-common.postinst0000644000000000000000000000150012164175106013725 0ustar #!/bin/sh set -e MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ # Create the site-lisp dir for this flavor if we're allowed parentdir=/usr/local/share/emacs newdir=site-lisp if [ -d ${parentdir} ] then if mkdir ${parentdir}/${newdir} 2>/dev/null then chown root:staff ${parentdir}/${newdir} chmod 2775 ${parentdir}/${newdir} fi fi parentdir=/usr/local/share/emacs newdir=${FULL} if [ -d ${parentdir} ] then if mkdir ${parentdir}/${newdir} 2>/dev/null then chown root:staff ${parentdir}/${newdir} chmod 2775 ${parentdir}/${newdir} fi fi parentdir=/usr/local/share/emacs/${FULL} newdir=site-lisp if [ -d ${parentdir} ] then if mkdir ${parentdir}/${newdir} 2>/dev/null then chown root:staff ${parentdir}/${newdir} chmod 2775 ${parentdir}/${newdir} fi fi #DEBHELPER# debian/emacsVER-common.prerm0000644000000000000000000000041512164175107013174 0ustar #!/bin/sh set -e MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ set +e # Only remove these directories if they're empty. rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null rmdir /usr/local/share/emacs/${FULL} 2>/dev/null set -e #DEBHELPER# debian/missing-file.dfsg0000644000000000000000000000065612164175107012434 0ustar The file that would normally be displayed here (@FILE@) has been moved to the emacs@MAJOR_VERSION@-common-non-dfsg package because its license does not appear to be compatible with the Debian Free Software Guidelines (DFSG). Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/copyright for more information. Please install @FILE@ from Debian's non-free distribution if you would like for Emacs to display the original file. debian/patches/0000755000000000000000000000000012164175133010620 5ustar debian/patches/0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch0000644000000000000000000000167412164175107021175 0ustar From f4f49db3a1e1868f269d33ae69c2b52b2b8f8f06 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:32 -0500 Subject: Fix startup hang on Debian GNU/kFreeBSD. Emacs should no longer hang on startup on Debian GNU/kFreeBSD. Date: Thu Aug 12 04:21:09 UTC 2010 Added-by: Rob Browning Provided-By: Petr Salinger Bug: 559392 Status: new --- src/s/gnu-kfreebsd.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h index a1e8c02..89563de 100644 --- a/src/s/gnu-kfreebsd.h +++ b/src/s/gnu-kfreebsd.h @@ -5,6 +5,11 @@ #undef SYSTEM_TYPE #define SYSTEM_TYPE "gnu/kfreebsd" /* All the best software is free */ +#undef INTERRUPT_INPUT +#define BROKEN_SIGIO +#define BROKEN_SIGURG +#define BROKEN_SIGPOLL + #define NO_TERMIO /* use only */ /* arch-tag: 8d098200-2586-469e-99ab-6d092c035e03 debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch0000644000000000000000000000402212164175107023031 0ustar From 6a31be0e038e528e0d790203851a20e7e6ae4a5a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:22 -0500 Subject: Run debian-startup and set debian-emacs-flavor. Emacs runs debian-startup and sets debian-emacs-flavor. * Emacs runs debian-startup during the startup process unless site-run-file is false. * The global variable debian-emacs-flavor is bound to 'emacs23. Author: Rob Browning --- lisp/startup.el | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index 775d2f7..b3e56ad 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -393,6 +393,10 @@ Warning Warning!!! Pure space overflow !!!Warning Warning :type 'directory :initialize 'custom-initialize-delay) +(defconst debian-emacs-flavor 'emacs23 + "A symbol representing the particular debian flavor of emacs running. +Something like 'emacs20, 'xemacs20, etc.") + (defun normal-top-level-add-subdirs-to-load-path () "Add all subdirectories of current directory to `load-path'. More precisely, this uses only the subdirectories whose names @@ -955,8 +959,21 @@ opening the first frame (e.g. open a connection to an X server).") ;; be loaded from site-run-file and wants to test if -q was given ;; should check init-file-user instead, since that is already set. ;; See cus-edit.el for an example. - (if site-run-file - (load site-run-file t t)) + + ;; Original upstream startup + ;; (if site-run-file + ;; (load site-run-file t t)) + ;; + + ;; Debian startup + (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 screen. debian/patches/0011-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch0000644000000000000000000000466212164175107020113 0ustar From 28f48aed44b1c58dcb75142f3b261cd99d074fde Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 25 Oct 2011 19:52:51 -0500 Subject: Use CRT_DIR to find crt*.o on ppc64. The Emacs build should now look for crt*.o in the correct multiarch location during ppc64 builds. Provided-by: Hiroyuki Yamamoto Date: Wed, 26 Oct 2011 01:39:35 +0900 Applied-by: Rob Browning Bug-Debian: http://bugs.debian.org/646609 --- configure.in | 8 ++++---- src/m/macppc.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 958903d..75af0f7 100644 --- a/configure.in +++ b/configure.in @@ -172,7 +172,7 @@ fi CRT_DIR= AC_ARG_WITH([crt-dir],dnl [AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc. -This option is only used on x86-64 and s390x GNU/Linux architectures.])]) +This option is only used on x86-64, powerpc64 and s390x GNU/Linux architectures.])]) CRT_DIR="${with_crt_dir}" AC_ARG_WITH([gnustep-conf],dnl @@ -1006,11 +1006,11 @@ AC_CONFIG_LIBOBJ_DIR(src) dnl Do this early because it can frob feature test macros for Unix-98 &c. AC_SYS_LARGEFILE -## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x. +## Note: at present CRT_DIR is only used for amdx86-64, powerpc64 and ibms390x. ## Other machine types hard-code the location in src/[ms]/*.h. case "${canonical}" in - x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) - ## On x86-64 and s390x GNU/Linux distributions, the standard library + x86_64-*-linux-gnu* | powerpc64-*-linux-gnu* | s390x-*-linux-gnu* ) + ## On x86-64, powerpc64 and s390x GNU/Linux distributions, the standard library ## can be in a variety of places. We only try /usr/lib64 and /usr/lib. ## For anything else (eg /usr/lib32), it is up the user to specify ## the location (bug#5655). diff --git a/src/m/macppc.h b/src/m/macppc.h index 810c62a..17dc9d3 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -50,9 +50,9 @@ along with GNU Emacs. If not, see . */ #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc #ifdef _ARCH_PPC64 #undef START_FILES -#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o +#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o #undef LIB_STANDARD -#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o +#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o #endif #endif debian/patches/0018-Don-t-eval-code-when-enable-local-variables-is-safe.patch0000644000000000000000000000457212164175107023624 0ustar From e53a987370a1ea362b4247d4a621257c28f35f52 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 7 Aug 2012 14:41:39 -0400 Subject: Don't eval code when enable-local-variables is :safe. Emacs should no longer eval code when enable-local-variables is :safe. Previously, Emacs might eval forms in file-local variable sections even when the Emacs user option `enable-local-variables' was set to :safe. This patch fixes CVE-2012-3479: http://security-tracker.debian.org/tracker/CVE-2012-3479 Origin: upstream, commit: 108092 (90c310d22c6f06332257c816253c642fd2bf90aa) Added-by: Rob Browning Provided-By: Glenn Morris Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12155 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684695 --- lisp/ChangeLog | 6 ++++++ lisp/files.el | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d780e9..791092d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-08-07 Glenn Morris + + * files.el (hack-local-variables-filter): If an eval: form is not + known to be safe, and enable-local-variables is :safe, then ignore + the form totally, as is done for non-eval forms. (Bug#12155) + 2012-01-19 Chong Yidong * Version 23.4 released. diff --git a/lisp/files.el b/lisp/files.el index ed1a69d..113968d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2986,11 +2986,16 @@ DIR-NAME is a directory name if these settings come from ;; Obey `enable-local-eval'. ((eq var 'eval) (when enable-local-eval - (push elt all-vars) - (or (eq enable-local-eval t) - (hack-one-local-variable-eval-safep (eval (quote val))) - (safe-local-variable-p var val) - (push elt unsafe-vars)))) + (let ((safe (or (hack-one-local-variable-eval-safep + (eval (quote val))) + ;; In case previously marked safe (bug#5636). + (safe-local-variable-p var val)))) + ;; If not safe and e-l-v = :safe, ignore totally. + (when (or safe (not (eq enable-local-variables :safe))) + (push elt all-vars) + (or (eq enable-local-eval t) + safe + (push elt unsafe-vars)))))) ;; Ignore duplicates (except `mode') in the present list. ((and (assq var all-vars) (not (eq var 'mode))) nil) ;; Accept known-safe variables. debian/patches/series0000644000000000000000000000215312164175107012037 0ustar 0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch 0002-Run-debian-startup-and-set-debian-emacs-flavor.patch 0003-Remove-files-that-appear-to-be-incompatible-with-the.patch 0004-Adjust-documentation-references-for-Debian.patch 0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch 0006-Avoid-silently-losing-mail-via-fakemail.patch 0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch 0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch 0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch 0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch 0011-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch 0012-Define-POSIX_SIGNALS-for-GNU-Hurd.patch 0013-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch 0014-Fix-hang-after-C-z-in-gnome-shell.patch 0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch 0016-quail-indian.el-indian-tlg-base-table-Fix-typo-dev-t.patch 0017-Initialize-xgselect-in-function-xg_select-when-gfds_.patch 0018-Don-t-eval-code-when-enable-local-variables-is-safe.patch no_cpp_multiarch_dir_mangling.diff emacsVER-lp725988.patch unity-shrinkage.patch debian/patches/0014-Fix-hang-after-C-z-in-gnome-shell.patch0000644000000000000000000001645312164175107020240 0ustar From 847d5d949a989ad15308ab56ec8a9ec7fd2dc2d1 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 30 Oct 2011 18:17:48 +0100 Subject: Fix hang after C-z in gnome-shell. Emacs should no longer hang when C-z is pressed within the Gnome shell. Applied-By: Rob Browning Origin: upstream, commit: d3b65adf905c408aea986ff113cb3bc1b24d73e9 Bug-Debian: http://bugs.debian.org/655592 --- src/ChangeLog | 13 +++++++++++++ src/xterm.c | 45 +++++++++++++++++++++++++++++++++------------ src/xterm.h | 3 ++- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e44ec5f..e1f24d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -90,6 +90,19 @@ (xmenu_show, xdialog_show): Use it in record_unwind_protect instead of calling free_menubar_widget_value_tree directly (Bug#9830). +2011-10-30 Jan Djärv + + * xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893). + + * xterm.c: Declare x_handle_net_wm_state to return int. + (handle_one_xevent): Check if we are iconified but don't have + _NET_WM_STATE_HIDDEN. If do, treat as deiconify (Bug#9893). + (get_current_wm_state): Return non-zero if not hidden, + check for _NET_WM_STATE_HIDDEN (Bug#9893). + (do_ewmh_fullscreen): Ignore return value from get_current_wm_state. + (x_handle_net_wm_state): Return what get_current_wm_state returns. + (x_term_init): Initialize dpyinfo->Xatom_net_wm_state_hidden. + 2011-09-19 Andreas Schwab * keymap.c (Fsingle_key_description): Use make_specified_string diff --git a/src/xterm.c b/src/xterm.c index af8af50..866915a 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -375,7 +375,7 @@ static void x_scroll_bar_report_motion P_ ((struct frame **, Lisp_Object *, enum scroll_bar_part *, Lisp_Object *, Lisp_Object *, unsigned long *)); -static void x_handle_net_wm_state P_ ((struct frame *, XPropertyEvent *)); +static int x_handle_net_wm_state P_ ((struct frame *, XPropertyEvent *)); static void x_check_fullscreen P_ ((struct frame *)); static void x_check_expected_move P_ ((struct frame *, int, int)); static void x_sync_with_move P_ ((struct frame *, int, int, int)); @@ -6148,7 +6148,19 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) last_user_time = event.xproperty.time; f = x_top_window_to_frame (dpyinfo, event.xproperty.window); if (f && event.xproperty.atom == dpyinfo->Xatom_net_wm_state) - x_handle_net_wm_state (f, &event.xproperty); + if (x_handle_net_wm_state (f, &event.xproperty) && f->iconified) + { + /* Gnome shell does not iconify us when C-z is pressed. It hides + the frame. So if our state says we aren't hidden anymore, + treat is as deiconfied. */ + if (! f->async_iconified) + SET_FRAME_GARBAGED (f); + f->async_visible = 1; + f->async_iconified = 0; + f->output_data.x->has_been_visible = 1; + inev.ie.kind = DEICONIFY_EVENT; + XSETFRAME (inev.ie.frame_or_window, f); + } x_handle_property_notify (&event.xproperty); xft_settings_event (dpyinfo, &event); @@ -8600,17 +8612,19 @@ x_set_sticky (f, new_value, old_value) /* Return the current _NET_WM_STATE. SIZE_STATE is set to one of the FULLSCREEN_* values. - STICKY is set to 1 if the sticky state is set, 0 if not. */ + STICKY is set to 1 if the sticky state is set, 0 if not. -static void -get_current_vm_state (struct frame *f, + Return non-zero if we are not hidden, zero if we are. */ + +static int +get_current_wm_state (struct frame *f, Window window, int *size_state, int *sticky) { Atom actual_type; unsigned long actual_size, bytes_remaining; - int i, rc, actual_format; + int i, rc, actual_format, is_hidden = 0; struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); long max_len = 65536; Display *dpy = FRAME_X_DISPLAY (f); @@ -8632,7 +8646,7 @@ get_current_vm_state (struct frame *f, if (tmp_data) XFree (tmp_data); x_uncatch_errors (); UNBLOCK_INPUT; - return; + return ! f->iconified; } x_uncatch_errors (); @@ -8640,7 +8654,9 @@ get_current_vm_state (struct frame *f, for (i = 0; i < actual_size; ++i) { Atom a = ((Atom*)tmp_data)[i]; - if (a == dpyinfo->Xatom_net_wm_state_maximized_horz) + if (a == dpyinfo->Xatom_net_wm_state_hidden) + is_hidden = 1; + else if (a == dpyinfo->Xatom_net_wm_state_maximized_horz) { if (*size_state == FULLSCREEN_HEIGHT) *size_state = FULLSCREEN_MAXIMIZED; @@ -8662,6 +8678,7 @@ get_current_vm_state (struct frame *f, if (tmp_data) XFree (tmp_data); UNBLOCK_INPUT; + return ! is_hidden; } /* Do fullscreen as specified in extended window manager hints */ @@ -8674,7 +8691,7 @@ do_ewmh_fullscreen (f) Lisp_Object lval = get_frame_param (f, Qfullscreen); int cur, dummy; - get_current_vm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy); + (void)get_current_wm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy); /* Some window managers don't say they support _NET_WM_STATE, but they do say they support _NET_WM_STATE_FULLSCREEN. Try that also. */ @@ -8748,7 +8765,7 @@ XTfullscreen_hook (f) } -static void +static int x_handle_net_wm_state (f, event) struct frame *f; XPropertyEvent *event; @@ -8756,8 +8773,8 @@ x_handle_net_wm_state (f, event) int value = FULLSCREEN_NONE; Lisp_Object lval; int sticky = 0; + int not_hidden = get_current_wm_state (f, event->window, &value, &sticky); - get_current_vm_state (f, event->window, &value, &sticky); lval = Qnil; switch (value) { @@ -8777,6 +8794,8 @@ x_handle_net_wm_state (f, event) store_frame_param (f, Qfullscreen, lval); store_frame_param (f, Qsticky, sticky ? Qt : Qnil); + + return not_hidden; } /* Check if we need to resize the frame due to a fullscreen request. @@ -9514,7 +9533,7 @@ x_iconify_frame (f) if (!NILP (type)) x_bitmap_icon (f, type); -#ifdef USE_GTK +#if defined (USE_GTK) if (FRAME_GTK_OUTER_WIDGET (f)) { if (! FRAME_VISIBLE_P (f)) @@ -10545,6 +10564,8 @@ x_term_init (display_name, xrm_option, resource_name) = XInternAtom (dpyinfo->display, "_NET_WM_STATE_MAXIMIZED_VERT", False); dpyinfo->Xatom_net_wm_state_sticky = XInternAtom (dpyinfo->display, "_NET_WM_STATE_STICKY", False); + dpyinfo->Xatom_net_wm_state_sticky + = XInternAtom (dpyinfo->display, "_NET_WM_STATE_HIDDEN", False); dpyinfo->Xatom_net_window_type = XInternAtom (dpyinfo->display, "_NET_WM_WINDOW_TYPE", False); dpyinfo->Xatom_net_window_type_tooltip diff --git a/src/xterm.h b/src/xterm.h index cdfe649..14fa687 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -365,7 +365,8 @@ struct x_display_info /* Atoms dealing with EWMH (i.e. _NET_...) */ Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, - Xatom_net_wm_state_sticky, Xatom_net_frame_extents; + Xatom_net_wm_state_sticky, Xatom_net_wm_state_hidden, + Xatom_net_frame_extents; /* XSettings atoms and windows. */ Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; debian/patches/0013-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch0000644000000000000000000001035512164175107024101 0ustar From 937769ea76b5787bb334678c8685692859128b66 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 29 Jan 2012 13:42:57 -0600 Subject: Add a printf attribute to movemail.c to allow hardened build flags. Emacs should now support the -Wformat -Wformat-security -Werror=format-security build flags. Reported-by: Moritz Muehlenhoff Author: Rob Browning Date: Sun, 29 Jan 2012 13:51:13 -0600 Forwarded: bug-gnu-emacs@gnu.org Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655118 Applied-By: Rob Browning --- lib-src/movemail.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/lib-src/movemail.c b/lib-src/movemail.c index ec38678..74ae004 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -60,6 +60,7 @@ along with GNU Emacs. If not, see . */ #include #include #include +#include #include #include @@ -152,7 +153,7 @@ extern char *rindex __P((const char *, int)); #endif void fatal (); -void error (); +void error (const char *template, ...) __attribute__ ((format (printf, 1, 2))); void pfatal_with_name (); void pfatal_and_delete (); char *concat (); @@ -610,16 +611,13 @@ fatal (s1, s2, s3) are args for it or null. */ void -error (s1, s2, s3) - char *s1, *s2, *s3; +error (const char *template, ...) { + va_list ap; fprintf (stderr, "movemail: "); - if (s3) - fprintf (stderr, s1, s2, s3); - else if (s2) - fprintf (stderr, s1, s2); - else - fprintf (stderr, s1); + va_start (ap, template); + vfprintf (stderr, template, ap); + va_end (ap); fprintf (stderr, "\n"); } @@ -733,13 +731,13 @@ popmail (mailbox, outfile, preserve, password, reverse_order) server = pop_open (hostname, user, password, POP_NO_GETPASS); if (! server) { - error ("Error connecting to POP server: %s", pop_error, 0); + error ("Error connecting to POP server: %s", pop_error); return EXIT_FAILURE; } if (pop_stat (server, &nmsgs, &nbytes)) { - error ("Error getting message count from POP server: %s", pop_error, 0); + error ("Error getting message count from POP server: %s", pop_error); return EXIT_FAILURE; } @@ -761,7 +759,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order) if ((mbf = fdopen (mbfi, "wb")) == NULL) { pop_close (server); - error ("Error in fdopen: %s", strerror (errno), 0); + error ("Error in fdopen: %s", strerror (errno)); close (mbfi); unlink (outfile); return EXIT_FAILURE; @@ -785,7 +783,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order) mbx_delimit_begin (mbf); if (pop_retr (server, i, mbf) != OK) { - error ("%s", Errmsg, 0); + error ("%s", Errmsg); close (mbfi); return EXIT_FAILURE; } @@ -793,7 +791,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order) fflush (mbf); if (ferror (mbf)) { - error ("Error in fflush: %s", strerror (errno), 0); + error ("Error in fflush: %s", strerror (errno)); pop_close (server); close (mbfi); return EXIT_FAILURE; @@ -809,14 +807,14 @@ popmail (mailbox, outfile, preserve, password, reverse_order) #ifdef BSD_SYSTEM if (fsync (mbfi) < 0) { - error ("Error in fsync: %s", strerror (errno), 0); + error ("Error in fsync: %s", strerror (errno)); return EXIT_FAILURE; } #endif if (close (mbfi) == -1) { - error ("Error in close: %s", strerror (errno), 0); + error ("Error in close: %s", strerror (errno)); return EXIT_FAILURE; } @@ -825,7 +823,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order) { if (pop_delete (server, i)) { - error ("Error from POP server: %s", pop_error, 0); + error ("Error from POP server: %s", pop_error); pop_close (server); return EXIT_FAILURE; } @@ -833,7 +831,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order) if (pop_quit (server)) { - error ("Error from POP server: %s", pop_error, 0); + error ("Error from POP server: %s", pop_error); return EXIT_FAILURE; } debian/patches/0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch0000644000000000000000000000415312164175107023756 0ustar From 910975a324eddfbc55751b6ccf2d04000239063e Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 8 Feb 2012 17:31:05 +0900 Subject: coding.c (produce_chars): Fix updating of src_end (Bug#10701). Emacs should no longer crash while decoding input with DOS EOLs. Applied-By: Rob Browning Origin: upstream, commit: 77a56e3d815991289bbae393af4821ddaf0b5b7a Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10701 --- src/ChangeLog | 4 ++++ src/coding.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e1f24d1..ed4dcf6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-02-08 Kenichi Handa + + * coding.c (produce_chars): Fix updating of src_end (Bug#10701). + 2012-01-25 Chong Yidong * Version 23.4 released. diff --git a/src/coding.c b/src/coding.c index 8e96db1..c0393e7 100644 --- a/src/coding.c +++ b/src/coding.c @@ -7038,7 +7038,7 @@ produce_chars (coding, translation_table, last_block) dst_end = coding->destination + coding->dst_bytes; coding_set_source (coding); src = coding->source + offset; - src_end = coding->source + coding->src_bytes; + src_end = coding->source + coding->consumed; if (EQ (coding->src_object, coding->dst_object)) dst_end = (unsigned char *) src; } @@ -7072,7 +7072,7 @@ produce_chars (coding, translation_table, last_block) dst_end = coding->destination + coding->dst_bytes; coding_set_source (coding); src = coding->source + offset; - src_end = coding->source + coding->src_bytes; + src_end = coding->source + coding->consumed; if (EQ (coding->src_object, coding->dst_object)) dst_end = (unsigned char *) src; } @@ -7093,7 +7093,7 @@ produce_chars (coding, translation_table, last_block) dst = alloc_destination (coding, require, dst); coding_set_source (coding); src = coding->source + offset; - src_end = coding->source + coding->src_bytes; + src_end = coding->source + coding->consumed; } } produced_chars = coding->consumed_char; debian/patches/0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch0000644000000000000000000000312712164175107023162 0ustar From 54e9d1a87ea67bd2ae5933bd9c1542cb2803bcf8 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:29 -0500 Subject: Look for NEWS in order to find etc/ rather than GNU. Emacs will now look for NEWS in order to find etc/ rather than GNU. Since Debian doesn't include GNU in the Debian packages (the common licenses are in /usr/share/common-licenses), Emacs will now look for NEWS to find the etc directory instead of GNU. Provided-by: Sven Joachim Originally-reported-by: Bernhard Michler Date: Mon, 28 Apr 2008 11:20:23 +0200 Added-by: Rob Browning Status: Debian specific --- src/callproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/callproc.c b/src/callproc.c index 6898bd9..84b1c30 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1509,14 +1509,14 @@ init_callproc () srcdir = Fexpand_file_name (build_string ("../src/"), build_string (PATH_DUMPLOADSEARCH)); - tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory); + tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory); tem1 = Ffile_exists_p (tem); if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) { Lisp_Object newdir; newdir = Fexpand_file_name (build_string ("../etc/"), build_string (PATH_DUMPLOADSEARCH)); - tem = Fexpand_file_name (build_string ("GNU"), newdir); + tem = Fexpand_file_name (build_string ("NEWS"), newdir); tem1 = Ffile_exists_p (tem); if (!NILP (tem1)) Vdata_directory = newdir; debian/patches/0006-Avoid-silently-losing-mail-via-fakemail.patch0000644000000000000000000001103412164175107021664 0ustar From 7e090e5d4e3efa4990b7b404c6dfed1808e28455 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:27 -0500 Subject: Avoid silently losing mail via fakemail. An attempt is made to avoid silently losing mail via fakemail. This fix attempts to avoid a situation where Emacs can silently lose mail. This can occur if sendmail.el (at least) falls back to fakemail, and the underlying binary (MAIL_PROGRAM_NAME) that fakemail is configured to use doesn't exist. Unless mail-interactive is true, Emacs won't wait for the mailer and so won't know that fakemail failed. For now, Debian sets fakemail's MAIL_PROGRAM_NAME to /usr/bin/mail (which is the correct value for Debian systems) rather than /bin/mail. Debian also adjusts Emacs to test whether or not /usr/bin/mail exists and is executable. If either of these tests fail, then mail-interactive is set to t. That should ensure that a user will actually see an error if they attempt to use the broken fakemail. Note that Debian actually forces the MAIL_PROGRAM_NAME value to /usr/bin/mail. The build will fail if any other value is specified. This is done to ensure that MAIL_PROGRAM_NAME isn't accidentally set to some other value during the build process. If this is undesirable for some reason, just comment out avoid-fakemail-loss.diff in debian/patches/series. Author: Rob Browning Added-by: Rob Browning --- lib-src/fakemail.c | 6 ++++-- lisp/gnus/message.el | 8 +++++++- lisp/mail/feedmail.el | 7 ++++++- lisp/mail/sendmail.el | 7 ++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index cebd8d7..5edb360 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -136,8 +136,10 @@ struct linebuffer lb; #define NIL ((line_list) NULL) #define INITIAL_LINE_SIZE 200 -#ifndef MAIL_PROGRAM_NAME -#define MAIL_PROGRAM_NAME "/bin/mail" +#ifdef MAIL_PROGRAM_NAME +#error "Debian assumption violated -- see avoid-fakemail-mail-loss.diff" +#else +#define MAIL_PROGRAM_NAME "/usr/bin/mail" #endif static char *my_name; diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 318e34f..1b6a9df 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4609,7 +4609,13 @@ If you always want Gnus to send messages in one piece, set "/usr/lib/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") - (t "fakemail")) + (t + (if (not (file-executable-p + "/usr/bin/mail")) + (progn + (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.") + (setq mail-interactive t))) + "fakemail")) nil errbuf nil "-oi") message-sendmail-extra-arguments ;; Always specify who from, diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 77d82f6..29cc891 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1327,7 +1327,12 @@ complicated cases." "/usr/lib/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") - (t "fakemail")) + (t + (if (not (file-executable-p "/usr/bin/mail")) + (progn + (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.") + (setq mail-interactive t))) + "fakemail")) nil errors-to nil "-oi" "-t") ;; provide envelope "from" to sendmail; results will vary (list "-f" user-mail-address) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index e6e49c4..4705f61 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -52,7 +52,12 @@ ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") - (t "fakemail")) ;In ../etc, to interface to /bin/mail. + (t + (if (not (file-executable-p "/usr/bin/mail")) + (progn + (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.") + (setq mail-interactive t))) + "fakemail")) ;In ../etc, to interface to /bin/mail. "Program used to send messages." :group 'mail :type 'file) debian/patches/0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch0000644000000000000000000000222212164175107024244 0ustar From 5b1eadbfa938bc5dc8e623ece55dbc378e70ce3f Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:30 -0500 Subject: Invoke the correct xmlstarlet executable on Debian systems. Emacs now invokes the correct xmlstarlet executable on Debian systems. Emacs invokes xmlstarlet rather than xml, which is the correct executable name on Debian systems. Provided-by: Jussi Judin Date: Sat, 20 Oct 2007 14:42:02 UTC Added-by: Rob Browning Status: Debian specific Bug: 447378 --- lisp/progmodes/flymake.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index de7034f..4d21371 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -1760,7 +1760,7 @@ Use CREATE-TEMP-F for creating temp copy." ;;;; xml-specific init-cleanup routines (defun flymake-xml-init () - (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) + (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) (provide 'flymake) debian/patches/0016-quail-indian.el-indian-tlg-base-table-Fix-typo-dev-t.patch0000644000000000000000000000244512164175107023760 0ustar From 54367a0ec537b4bc361783b9b375b9cbd7d48483 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Sun, 4 Mar 2012 21:05:23 +0900 Subject: quail/indian.el (indian-tlg-base-table): Fix typo; dev -> tlg. In quail/indian.el, indian-dev-base-table has been corrected to indian-tlg-base-table. Applied-By: Rob Browning Origin: upstream, commit: 141162dace9e05123a73dfe6d8be921840ff2416 --- leim/ChangeLog | 4 ++++ leim/quail/indian.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/leim/ChangeLog b/leim/ChangeLog index 1a8c37a..7ca7270 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2012-03-04 Kenichi Handa + + * quail/indian.el (indian-tlg-base-table): Fix typo; dev -> tlg. + 2012-01-19 Chong Yidong * Version 23.4 released. diff --git a/leim/quail/indian.el b/leim/quail/indian.el index d92fef5..6d4ecbf 100644 --- a/leim/quail/indian.el +++ b/leim/quail/indian.el @@ -269,7 +269,7 @@ (if nil (quail-define-package "telugu-inscript" "Telugu" "TlgIS" t "Telugu keyboard Inscript")) (quail-define-inscript-package - indian-dev-base-table inscript-dev-keytable + indian-tlg-base-table inscript-dev-keytable "telugu-inscript" "Telugu" "TlgIS" "Telugu keyboard Inscript.") debian/patches/0017-Initialize-xgselect-in-function-xg_select-when-gfds_.patch0000644000000000000000000000270112164175107024365 0ustar From c566c20428a35fb0d29960819ef0034808f4cd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Fri, 25 Nov 2011 16:36:04 +0100 Subject: Initialize xgselect in function xg_select when gfds_size == 0. Emacs should no longer hang when using newer versions of GLib (initially reported against libglib2.0-0 2.32.0-2). Origin: http://pkgs.fedoraproject.org/gitweb/?p=emacs.git;a=commitdiff;h=a2302b156dba1cc136e8363605d78a66eb3a92a6 Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9754 Bug-Red-Hat: https://bugzilla.redhat.com/show_bug.cgi?id=711739 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666691 Applied-Upstream: Fixed in Emacs 24 --- src/xgselect.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/xgselect.c b/src/xgselect.c index 333f7b1..7bb5f00 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -55,10 +55,15 @@ xg_select (max_fds, rfds, wfds, efds, timeout) do { if (n_gfds > gfds_size) { - while (n_gfds > gfds_size) - gfds_size *= 2; - xfree (gfds); - gfds = xmalloc (sizeof (*gfds) * gfds_size); + if (gfds_size == 0) + xgselect_initialize (); + else + { + while (n_gfds > gfds_size) + gfds_size *= 2; + xfree (gfds); + gfds = xmalloc (sizeof (*gfds) * gfds_size); + } } n_gfds = g_main_context_query (context, debian/patches/0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch0000644000000000000000000000332312164175107024014 0ustar From e8cb9f40dca14735f4c5f20aefd5c8371cea5ed2 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:26 -0500 Subject: Cause the build to fail if liblockfile isn't selected for movemail. The build will fail if liblockfile isn't selected for movemail. This makes sure the Debian Emacs won't accidentally be built with the wrong locking strategy. To disable this check, comment out require-movemail-use-liblockfile.diff in debian/patches/series. Author: Rob Browning Added-by: Rob Browning --- lib-src/movemail.c | 4 ++++ src/s/bsd-common.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib-src/movemail.c b/lib-src/movemail.c index d6fc1ce..ec38678 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -166,6 +166,10 @@ int mbx_delimit_end (); /* Nonzero means this is name of a lock file to delete on fatal error. */ char *delete_lockname; +#ifndef MAIL_USE_MAILLOCK +#error "Debian requires that mail locking be handled by liblockfile." +#endif /* ndef MAIL_USE_MAILLOCK */ + int main (argc, argv) int argc; diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index 4179d33..70a4a1a 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -66,7 +66,11 @@ along with GNU Emacs. If not, see . */ The alternative is that a lock file named /usr/spool/mail/$USER.lock. */ +/* conditional copied from gnu-linux.h */ +#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \ + defined (HAVE_MAILLOCK_H)) #define MAIL_USE_FLOCK +#endif /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify debian/patches/0004-Adjust-documentation-references-for-Debian.patch0000644000000000000000000000147612164175107022417 0ustar From 99c51fcfe11469feff7e943ab783ddab7f75fcd2 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:25 -0500 Subject: Adjust documentation references for Debian. Various documentation references have been adjusted for Debian. References to /usr/local/... have been changed to /usr/... as appropriate, etc. --- etc/NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 136bdf1..bb5f6b3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -14,6 +14,11 @@ for changes in older Emacs versions. You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. + +* Debian specific changes to Emacs + +Please see /usr/share/doc/emacs23-common/README.Debian.gz. + * Installation Changes in Emacs 23.4 debian/patches/unity-shrinkage.patch0000644000000000000000000000207512027333410014756 0ustar Description: Under Unity/Gtk+/Ubuntu 12.04, if there's no menu bar, the Emacs window will shink uncontrollably until it is exactly one row high. This back ports a fix from upstream Emacs 24. Origin: http://lists.gnu.org/archive/html/emacs-diffs/2012-03/msg00071.html Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/emacs23/+bug/941790 Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10954 Forwarded: not-needed --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -921,10 +921,13 @@ hint_flags |= GDK_HINT_BASE_SIZE; base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); - base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0) + /* Use one row here so base_height does not become zero. + Gtk+ and/or Unity on Ubuntu 12.04 can't handle it. */ + base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); check_frame_size (f, &min_rows, &min_cols); + if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */ size_hints.base_width = base_width; size_hints.base_height = base_height; debian/patches/0012-Define-POSIX_SIGNALS-for-GNU-Hurd.patch0000644000000000000000000000170412164175107017611 0ustar From 8a1d66b717aedf49c61b56b2ad3ce2d3ba9b7ce7 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 29 Jan 2012 13:34:44 -0600 Subject: Define POSIX_SIGNALS for GNU/Hurd. Emacs will now use POSIX signals on GNU/Hurd which avoids a build failure when a 15MiB-long write is interrupted by a signal, and Emacs hasn't set the SA_RESTART flag. Author: Samuel Thibault Date: Sun, 4 Dec 2011 19:47:54 +0100 Applied-By: Rob Browning Forwarded: bug-gnu-emacs@gnu.org Closes: #650976 --- src/s/gnu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/s/gnu.h b/src/s/gnu.h index 388b3e3..51e6ec4 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -83,5 +83,7 @@ along with GNU Emacs. If not, see . */ #endif /* !_IO_STDIO_H */ #endif /* emacs */ +#define POSIX_SIGNALS 1 + /* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4 (do not change this comment) */ debian/patches/0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch0000644000000000000000000000213612164175107023426 0ustar From 730582ceef35035f2379283f0b8b7f211194351c Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:21 -0500 Subject: Prefer /usr/share/info/emacs-23 over /usr/share/info. Emacs will prefer /usr/share/info/emacs-23 over /usr/share/info. The value of Info-default-directory-list has been augmented via site-init.el to include /usr/share/info/emacs-23 before /usr/share/info. --- lisp/site-init.el | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lisp/site-init.el diff --git a/lisp/site-init.el b/lisp/site-init.el new file mode 100644 index 0000000..d8d6256 --- /dev/null +++ b/lisp/site-init.el @@ -0,0 +1,11 @@ + +;; Add the flavor specific directory for Debian. +(setq Info-default-directory-list + (let ((result nil) + (found-match nil)) + (dolist (elt Info-default-directory-list (nreverse result)) + (if (and (not found-match) (equal elt "/usr/share/info/")) + (progn + (push "/usr/share/info/emacs-23" result) + (setq found-match t))) + (push elt result)))) debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch0000644000000000000000000005244012164175107024167 0ustar From c302d1083869a891fe8d75f8ac9be22dcb3e873f Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:24 -0500 Subject: Remove files that appear to be incompatible with the DFSG. Files that appear to be incompatible with the DFSG have been removed. A number of files have been removed from this package because their licenses are not compatible with the Debian Free Software Guidelines (DFSG), or because it wasn't completely clear that their licenses are compatible. In particular, all of the files which are covered under the GFDL and have invariant sections have been removed in accordance with this General Resolution: http://www.debian.org/vote/2006/vote_001. The files that have been removed, but still appear to be distributable, have been moved to packages in Debian's non-free section. Author: Rob Browning Added-by: Rob Browning Status: new --- Makefile.in | 30 +--- configure.in | 4 +- doc/misc/Makefile.in | 490 +------------------------------------------------- lisp/help.el | 10 +- 4 files changed, 16 insertions(+), 518 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5e0d128..8162889 100644 --- a/Makefile.in +++ b/Makefile.in @@ -139,12 +139,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ # since there are now many packages documented with the texinfo # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ -INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ - ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ - eshell eudc flymake forms gnus idlwave info mairix-el \ - message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ - reftex remember sasl sc semantic ses sieve smtpmail speedbar \ - tramp url vip viper widget woman +INFO_FILES=efaq # Directory for local state files for all programs. localstatedir=@localstatedir@ @@ -270,7 +265,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` SUBDIR = lib-src src lisp # The subdir makefiles created by config.status. -SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile +SUBDIR_MAKEFILES = lib-src/Makefile doc/misc/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile # Subdirectories to install, and where they'll go. # lib-src's makefile knows how to install it, so we don't do that here. @@ -357,10 +352,7 @@ Makefile: config.status $(srcdir)/src/config.in \ $(srcdir)/Makefile.in \ $(srcdir)/src/Makefile.in \ $(srcdir)/lib-src/Makefile.in \ - $(srcdir)/doc/emacs/Makefile.in \ $(srcdir)/doc/misc/Makefile.in \ - $(srcdir)/doc/lispref/Makefile.in \ - $(srcdir)/doc/lispintro/Makefile.in \ $(srcdir)/oldXMenu/Makefile.in \ $(srcdir)/lwlib/Makefile.in \ $(srcdir)/leim/Makefile.in \ @@ -701,10 +693,7 @@ mostlyclean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean) (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean) -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean) (cd leim; $(MAKE) $(MFLAGS) mostlyclean) ### `clean' @@ -720,10 +709,7 @@ clean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) clean) (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) clean) -(cd doc/misc && $(MAKE) $(MFLAGS) clean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) clean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) ### `bootclean' @@ -744,10 +730,7 @@ distclean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) - (cd doc/emacs && $(MAKE) $(MFLAGS) distclean) (cd doc/misc && $(MAKE) $(MFLAGS) distclean) - (cd doc/lispref && $(MAKE) $(MFLAGS) distclean) - (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean) (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) ${top_distclean} @@ -760,10 +743,7 @@ bootstrap-clean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean) (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean) -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) ${top_bootclean} @@ -808,10 +788,7 @@ dist: .PHONY: info dvi dist check html info-real: - (cd doc/emacs; $(MAKE) $(MFLAGS) info) (cd doc/misc; $(MAKE) $(MFLAGS) info) - (cd doc/lispref; $(MAKE) $(MFLAGS) info) - (cd doc/lispintro; $(MAKE) $(MFLAGS) info) force-info: # Note that man/Makefile knows how to put the info files in $(srcdir), @@ -850,10 +827,7 @@ check-info-dir: info echo "info/dir is OK" dvi: - (cd doc/emacs; $(MAKE) $(MFLAGS) dvi) (cd doc/misc; $(MAKE) $(MFLAGS) dvi) - (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi) - (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) #### Bootstrapping. diff --git a/configure.in b/configure.in index 05b724f..958903d 100644 --- a/configure.in +++ b/configure.in @@ -3123,8 +3123,8 @@ AC_EGREP_CPP(yes..yes, CPP_NEED_TRADITIONAL=yes) AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ - doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ - doc/lispref/Makefile src/Makefile.c:src/Makefile.in \ + doc/misc/Makefile \ + src/Makefile.c:src/Makefile.in \ lwlib/Makefile lisp/Makefile leim/Makefile, [ ### Make the necessary directories, if they don't exist. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 201428e..bcaec12 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -38,104 +38,10 @@ MAKEINFO = makeinfo --force # Also add new entries to INFO_FILES in the top-level Makefile.in. INFO_TARGETS = \ - $(infodir)/ada-mode \ - $(infodir)/auth \ - $(infodir)/autotype \ - $(infodir)/calc \ - $(infodir)/ccmode \ - $(infodir)/cl \ - $(infodir)/dbus \ - $(infodir)/dired-x \ - $(infodir)/ebrowse \ - $(infodir)/ede \ - $(infodir)/ediff \ - $(infodir)/edt \ - $(infodir)/eieio \ - $(infodir)/emacs-mime \ - $(infodir)/epa \ - $(infodir)/erc \ - $(infodir)/eshell \ - $(infodir)/eudc \ - $(infodir)/efaq \ - $(infodir)/flymake \ - $(infodir)/forms \ - $(infodir)/gnus \ - $(infodir)/idlwave \ - $(infodir)/info \ - $(infodir)/mairix-el \ - $(infodir)/message \ - $(infodir)/mh-e \ - $(infodir)/newsticker \ - $(infodir)/nxml-mode \ - $(infodir)/org \ - $(infodir)/pcl-cvs \ - $(infodir)/pgg \ - $(infodir)/rcirc \ - $(infodir)/remember \ - $(infodir)/reftex \ - $(infodir)/sasl \ - $(infodir)/sc \ - $(infodir)/semantic \ - $(infodir)/ses \ - $(infodir)/sieve \ - $(infodir)/smtpmail \ - $(infodir)/speedbar \ - $(infodir)/tramp \ - $(infodir)/url \ - $(infodir)/vip \ - $(infodir)/viper \ - $(infodir)/widget \ - $(infodir)/woman + $(infodir)/efaq DVI_TARGETS = \ - ada-mode.dvi \ - auth.dvi \ - autotype.dvi \ - calc.dvi \ - cc-mode.dvi \ - cl.dvi \ - dbus.dvi \ - dired-x.dvi \ - ebrowse.dvi \ - ede.dvi \ - ediff.dvi \ - edt.dvi \ - eieio.dvi \ - emacs-mime.dvi \ - epa.dvi \ - erc.dvi \ - eshell.dvi \ - eudc.dvi \ - faq.dvi \ - flymake.dvi \ - forms.dvi \ - gnus.dvi \ - idlwave.dvi \ - info.dvi \ - mairix-el.dvi \ - message.dvi \ - mh-e.dvi \ - newsticker.dvi \ - nxml-mode.dvi \ - org.dvi \ - pcl-cvs.dvi \ - pgg.dvi \ - rcirc.dvi \ - reftex.dvi \ - remember.dvi \ - sasl.dvi \ - sc.dvi \ - semantic.dvi \ - ses.dvi \ - sieve.dvi \ - smtpmail.dvi \ - speedbar.dvi \ - tramp.dvi \ - url.dvi \ - vip.dvi \ - viper.dvi \ - widget.dvi \ - woman.dvi + faq.dvi PDF_TARGETS = \ ada-mode.pdf \ @@ -198,10 +104,7 @@ TEXI2PDF = texi2pdf ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" -info: $(infodir) $(INFO_TARGETS) - -$(infodir): - mkdir $@ +info: $(INFO_TARGETS) dvi: $(DVI_TARGETS) @@ -213,150 +116,6 @@ pdf: $(PDF_TARGETS) # In a distribution of Emacs, the Info files should be up to date. ## "short" target names for convenience, to just rebuild one manual. -ada-mode : $(infodir)/ada-mode -$(infodir)/ada-mode: ada-mode.texi - cd $(srcdir); $(MAKEINFO) ada-mode.texi -ada-mode.dvi: ada-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi -ada-mode.pdf: ada-mode.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi - -auth : $(infodir)/auth -$(infodir)/auth: auth.texi - cd $(srcdir); $(MAKEINFO) auth.texi -auth.dvi: auth.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi -auth.pdf: auth.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi - -autotype : $(infodir)/autotype -$(infodir)/autotype: autotype.texi - cd $(srcdir); $(MAKEINFO) autotype.texi -autotype.dvi: autotype.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi -autotype.pdf: autotype.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi - -calc : $(infodir)/calc -$(infodir)/calc: calc.texi - cd $(srcdir); $(MAKEINFO) calc.texi -calc.dvi: calc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi -calc.pdf: calc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi - -ccmode : $(infodir)/ccmode -$(infodir)/ccmode: cc-mode.texi - cd $(srcdir); $(MAKEINFO) cc-mode.texi -cc-mode.dvi: cc-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi -cc-mode.pdf: cc-mode.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi - -cl : $(infodir)/cl -$(infodir)/cl: cl.texi - cd $(srcdir); $(MAKEINFO) cl.texi -cl.dvi: cl.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi -cl.pdf: cl.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi - -dbus : $(infodir)/dbus -$(infodir)/dbus: dbus.texi - cd $(srcdir); $(MAKEINFO) dbus.texi -dbus.dvi: dbus.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi -dbus.pdf: dbus.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi - -dired-x : $(infodir)/dired-x -$(infodir)/dired-x: dired-x.texi - cd $(srcdir); $(MAKEINFO) dired-x.texi -dired-x.dvi: dired-x.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi -dired-x.pdf: dired-x.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi - -ebrowse : $(infodir)/ebrowse -$(infodir)/ebrowse: ebrowse.texi - cd $(srcdir); $(MAKEINFO) ebrowse.texi -ebrowse.dvi: ebrowse.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi -ebrowse.pdf: ebrowse.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi - -ede : $(infodir)/ede -$(infodir)/ede: ede.texi - cd $(srcdir); $(MAKEINFO) ede.texi -ede.dvi: ede.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi -ede.pdf: ede.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi - -ediff : $(infodir)/ediff -$(infodir)/ediff: ediff.texi - cd $(srcdir); $(MAKEINFO) ediff.texi -ediff.dvi: ediff.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi -ediff.pdf: ediff.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi - -edt : $(infodir)/edt -$(infodir)/edt: edt.texi - cd $(srcdir); $(MAKEINFO) edt.texi -edt.dvi: edt.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi -edt.pdf: edt.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi - -eieio : $(infodir)/eieio -$(infodir)/eieio: eieio.texi - cd $(srcdir); $(MAKEINFO) eieio.texi -eieio.dvi: eieio.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi -eieio.pdf: eieio.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi - -emacs-mime : $(infodir)/emacs-mime -$(infodir)/emacs-mime: emacs-mime.texi - cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi -emacs-mime.dvi: emacs-mime.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi -emacs-mime.pdf: emacs-mime.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi - -epa : $(infodir)/epa -$(infodir)/epa: epa.texi - cd $(srcdir); $(MAKEINFO) epa.texi -epa.dvi: epa.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi -epa.pdf: epa.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi - -erc : $(infodir)/erc -$(infodir)/erc: erc.texi - cd $(srcdir); $(MAKEINFO) erc.texi -erc.dvi: erc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi -erc.pdf: erc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi - -eshell : $(infodir)/eshell -$(infodir)/eshell: eshell.texi - cd $(srcdir); $(MAKEINFO) eshell.texi -eshell.dvi: eshell.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi -eshell.pdf: eshell.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi - -eudc : $(infodir)/eudc -$(infodir)/eudc: eudc.texi - cd $(srcdir); $(MAKEINFO) eudc.texi -eudc.dvi: eudc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi -eudc.pdf: eudc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi - efaq : $(infodir)/efaq $(infodir)/efaq: faq.texi cd $(srcdir); $(MAKEINFO) faq.texi @@ -365,249 +124,6 @@ faq.dvi: faq.texi faq.pdf: faq.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi -flymake : $(infodir)/flymake -$(infodir)/flymake: flymake.texi - cd $(srcdir); $(MAKEINFO) flymake.texi -flymake.dvi: flymake.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi -flymake.pdf: flymake.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi - -forms : $(infodir)/forms -$(infodir)/forms: forms.texi - cd $(srcdir); $(MAKEINFO) forms.texi -forms.dvi: forms.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi -forms.pdf: forms.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi - -# gnus/message/emacs-mime/sieve/pgg are part of Gnus: -gnus : $(infodir)/gnus -$(infodir)/gnus: gnus.texi gnus-faq.texi - cd $(srcdir); $(MAKEINFO) gnus.texi -gnus.dvi: gnus.texi gnus-faq.texi - sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi - $(ENVADD) $(TEXI2DVI) gnustmp.texi - cp gnustmp.dvi $*.dvi - rm gnustmp.* -gnus.pdf: gnus.texi gnus-faq.texi - sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi - $(ENVADD) $(TEXI2PDF) gnustmp.texi - cp gnustmp.pdf $@ - rm gnustmp.* - -# This is produced with --no-split to avoid making files whose -# names clash on DOS 8+3 filesystems -idlwave : $(infodir)/idlwave -$(infodir)/idlwave: idlwave.texi - cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi -idlwave.dvi: idlwave.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi -idlwave.pdf: idlwave.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi - -# The following target uses an explicit -o switch to work around -# the @setfilename directive in info.texi, which is required for -# the Texinfo distribution. -###info : $(infodir)/info # circular! -$(infodir)/info: info.texi - cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@ -info.dvi: info.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi -info.pdf: info.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi - -mairix-el : $(infodir)/mairix-el -$(infodir)/mairix-el: mairix-el.texi - cd $(srcdir); $(MAKEINFO) mairix-el.texi -mairix-el.dvi: mairix-el.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi -mairix-el.pdf: mairix-el.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi - -message : $(infodir)/message -$(infodir)/message: message.texi - cd $(srcdir); $(MAKEINFO) message.texi -message.dvi: message.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi -message.pdf: message.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi - -mh-e : $(infodir)/mh-e -$(infodir)/mh-e: mh-e.texi - cd $(srcdir); $(MAKEINFO) mh-e.texi -mh-e.dvi: mh-e.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi -mh-e.pdf: mh-e.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi - -newsticker : $(infodir)/newsticker -$(infodir)/newsticker: newsticker.texi - cd $(srcdir); $(MAKEINFO) newsticker.texi -newsticker.dvi: newsticker.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi -newsticker.pdf: newsticker.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi - -nxml-mode : $(infodir)/nxml-mode -$(infodir)/nxml-mode: nxml-mode.texi - cd $(srcdir); $(MAKEINFO) nxml-mode.texi -nxml-mode.dvi: nxml-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi -nxml-mode.pdf: nxml-mode.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi - -org : $(infodir)/org -$(infodir)/org: org.texi - cd $(srcdir); $(MAKEINFO) org.texi -org.dvi: org.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi -org.pdf: org.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi - -pcl-cvs : $(infodir)/pcl-cvs -$(infodir)/pcl-cvs: pcl-cvs.texi - cd $(srcdir); $(MAKEINFO) pcl-cvs.texi -pcl-cvs.dvi: pcl-cvs.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi -pcl-cvs.pdf: pcl-cvs.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi - -pgg : $(infodir)/pgg -$(infodir)/pgg: pgg.texi - cd $(srcdir); $(MAKEINFO) pgg.texi -pgg.dvi: pgg.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi -pgg.pdf: pgg.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi - -rcirc : $(infodir)/rcirc -$(infodir)/rcirc: rcirc.texi - cd $(srcdir); $(MAKEINFO) rcirc.texi -rcirc.dvi: rcirc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi -rcirc.pdf: rcirc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi - -reftex : $(infodir)/reftex -$(infodir)/reftex: reftex.texi - cd $(srcdir); $(MAKEINFO) reftex.texi -reftex.dvi: reftex.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi -reftex.pdf: reftex.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi - -remember : $(infodir)/remember -$(infodir)/remember: remember.texi - cd $(srcdir); $(MAKEINFO) remember.texi -remember.dvi: remember.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi -remember.pdf: remember.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi - -sasl : $(infodir)/sasl -$(infodir)/sasl: sasl.texi - cd $(srcdir); $(MAKEINFO) sasl.texi -sasl.dvi: sasl.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi -sasl.pdf: sasl.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi - -sc : $(infodir)/sc -$(infodir)/sc: sc.texi - cd $(srcdir); $(MAKEINFO) sc.texi -sc.dvi: sc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi -sc.pdf: sc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi - -semantic : $(infodir)/semantic -$(infodir)/semantic: semantic.texi sem-user.texi - cd $(srcdir); $(MAKEINFO) semantic.texi -semantic.dvi: semantic.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi -semantic.pdf: semantic.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi - -ses : $(infodir)/ses -$(infodir)/ses: ses.texi - cd $(srcdir); $(MAKEINFO) ses.texi -ses.dvi: ses.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi -ses.pdf: ses.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi - -sieve : $(infodir)/sieve -$(infodir)/sieve: sieve.texi - cd $(srcdir); $(MAKEINFO) sieve.texi -sieve.dvi: sieve.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi -sieve.pdf: sieve.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi - -smtpmail : $(infodir)/smtpmail -$(infodir)/smtpmail: smtpmail.texi - cd $(srcdir); $(MAKEINFO) smtpmail.texi -smtpmail.dvi: smtpmail.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi -smtpmail.pdf: smtpmail.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi - -speedbar : $(infodir)/speedbar -$(infodir)/speedbar: speedbar.texi - cd $(srcdir); $(MAKEINFO) speedbar.texi -speedbar.dvi: speedbar.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi -speedbar.pdf: speedbar.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi - -tramp : $(infodir)/tramp -$(infodir)/tramp: tramp.texi trampver.texi - cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi -tramp.dvi: tramp.texi trampver.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi -tramp.pdf: tramp.texi trampver.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi - -url : $(infodir)/url -$(infodir)/url: url.texi - cd $(srcdir); $(MAKEINFO) url.texi -url.dvi: url.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi -url.pdf: url.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi - -vip : $(infodir)/vip -$(infodir)/vip: vip.texi - cd $(srcdir); $(MAKEINFO) vip.texi -vip.dvi: vip.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi -vip.pdf: vip.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi - -viper : $(infodir)/viper -$(infodir)/viper: viper.texi - cd $(srcdir); $(MAKEINFO) viper.texi -viper.dvi: viper.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi -viper.pdf: viper.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi - -widget : $(infodir)/widget -$(infodir)/widget: widget.texi - cd $(srcdir); $(MAKEINFO) widget.texi -widget.dvi: widget.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi -widget.pdf: widget.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi - -woman : $(infodir)/woman -$(infodir)/woman: woman.texi - cd $(srcdir); $(MAKEINFO) woman.texi -woman.dvi: woman.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi -woman.pdf: woman.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi mostlyclean: diff --git a/lisp/help.el b/lisp/help.el index 84692c4..6d96e57 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -301,6 +301,14 @@ If that doesn't give a function, return nil." (goto-address-mode 1) (goto-char (point-min))) +(defun debian-expand-file-name-dfsg (filename) + "Apply expand-file-name to FILENAME. +If expand-file-name does not find a file, append `.dfsg' and try again." + (let ((file (expand-file-name filename data-directory))) + (if (file-exists-p file) + file + (expand-file-name (concat file ".dfsg") data-directory)))) + (defun describe-distribution () "Display info on how to obtain the latest version of GNU Emacs." (interactive) @@ -314,7 +322,7 @@ If that doesn't give a function, return nil." (defun describe-gnu-project () "Display info on the GNU project." (interactive) - (view-help-file "THE-GNU-PROJECT")) + (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT"))) (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2") debian/patches/no_cpp_multiarch_dir_mangling.diff0000644000000000000000000000174012027333410017504 0ustar Index: emacs23-23.3+1/lib-src/Makefile.in =================================================================== --- emacs23-23.3+1.orig/lib-src/Makefile.in +++ emacs23-23.3+1/lib-src/Makefile.in @@ -141,6 +141,9 @@ # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ +/* Make sure a built-in define doesn't break our multiarch include path! */ +#undef i386 + #define THIS_IS_MAKEFILE #define NOT_C_CODE #include "../src/config.h" Index: emacs23-23.3+1/src/Makefile.in =================================================================== --- emacs23-23.3+1.orig/src/Makefile.in +++ emacs23-23.3+1/src/Makefile.in @@ -73,6 +73,9 @@ # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ +/* Make sure a built-in define doesn't break our multiarch include path! */ +#undef i386 + C_SWITCH_SYSTEM= /* just to be sure the sh is used */ debian/patches/0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch0000644000000000000000000000211412164175107024160 0ustar From ace4b4626bfb0bfc2b0b4afce210c086afa86bbf Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:28 -0500 Subject: Modify the output of (version) to indicate Debian modifications. The output of (version) has been modified to indicate Debian modifications. Author: Rob Browning Added-by: Rob Browning --- lisp/version.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/version.el b/lisp/version.el index ebd4fea..b8107e6 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -56,8 +56,8 @@ to the system configuration; look at `system-configuration' instead." (interactive "P") (let ((version-string (format (if (not (called-interactively-p 'interactive)) - "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) debian/patches/emacsVER-lp725988.patch0000644000000000000000000000064312027333410014421 0ustar Index: ubuntu/src/frame.h =================================================================== --- ubuntu.orig/src/frame.h 2012-05-12 02:50:43.789385000 +0100 +++ ubuntu/src/frame.h 2012-05-12 05:00:59.925165202 +0100 @@ -1076,7 +1076,7 @@ #ifdef HAVE_WINDOW_SYSTEM /* The class of this X application. */ -#define EMACS_CLASS "Emacs" +#define EMACS_CLASS "Emacs23" /* These are in xterm.c, w32term.c, etc. */ debian/rules0000755000000000000000000006373012164175106010262 0ustar #!/usr/bin/make -f # -*- makefile -*- # This file is licensed under the terms of the Gnu Public License. # With the one additional provision that Ian Jackson's name may not be # removed from the file. # Copyright 1994,1995 Ian Jackson # Copyright 2004-2005 Jrme Marant # Copyright 1998-2010 Rob Browning # Originally copied from the GNU Hello Debian rules file (1.3). # Modified for emacs by Mark Eichin . # Debhelper support added via one of Joey Hess' example files. # See the debian/changelog for further historical information. # TODO: # # Figure out what happened to fns-*.elc # Should we set defaults for things like xsupport at the top here? # Deal with build_binary_pkg and continue integration. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 SHELL := /bin/bash quilt := QUILT_PATCHES=debian/patches quilt pf := set -o pipefail # This package uses debian/source/format 3.0 (quilt). # 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. # As you might expect, a "debian/rules clean" should always get you # back to the state you were in before "debian/rules build". In order # to accomplish that, this rules file actually performs three # independent builds to produce the emacsXY, emacsXY-nox, and # emacsXY-lucid packages. The source is actually copied into separate # debian/build-* directories and built there. Certain aspects of the # upstream build process have led to this approach. # For example, the original upstream source ships the .elc files, but # we need to re-build them when we patch the corresponding .el files. # The situation 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 the # years, we've tried various ways to handle this issue, 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. To avoid that, and to # simplify the process, 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 we were always clobbering # the .elc files during the package build, that was no great loss. # (You might imagine that a VPATH build would allow us to avoid having # to copy the entire source tree for each of the three builds, but it # turns out that without additional complexity, VPATH builds will # cause diff bloat. That's because the emacs build process doesn't # completely respect the .elc files; some are modified in srcdir, not # builddir.) # Copying the source to a separate build directory and building there # is much simpler than previous approaches, it makes cleaning trivial, # and it avoids any diff bloat. # If the source tree ever ends up in an untenable "can't go forward, # can't go back" state with respect to patching, you can always start # over by just moving the current debian directory to a newly unpacked # orig.tar.gz tree. Note that if you were in the process of editing a # patch, you will lose those edits, but you shouldn't lose anything # else. This process just reverts all of the upstream files and # abandons the volatile "what's been done to the current tree" state # that quilt maintains in ./.pc. All of the actual patches are stored # in debian/patches and should be unharmed. ###################################################################### # Important top-level targets: # # check-vars - displays how the version number has been parsed. # buildpackage - build binary packages via dpkg-buildpackage w/suitable args # prepare-release - prepare and check debs for upload. # ###################################################################### # The name of the Debian source package src_name := $(shell $(pf); dpkg-parsechangelog | egrep '^Source:') src_name := $(shell $(pf); echo $(src_name) | perl -pe 's/Source:\s+//o') # The version from the changelog (i.e. 20.5-1) debian_ver := $(shell $(pf); dpkg-parsechangelog | egrep '^Version:') debian_ver := $(shell $(pf); 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 $(pf); echo $(debian_ver) | perl -pe 's/.*-//o') # The official upstream version defined by emacs-version in lisp/version.el. # The extraction method matches the code in the upstream configure.in. nominal_ver := \ $(shell $(pf); grep 'defconst[ ]*emacs-version' lisp/version.el \ | 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 sometimes we may have to do this by hand. runtime_ver := $(shell $(pf); echo $(nominal_ver) | perl -pe 's/[a-z]+$$//o') major_ver := $(shell $(pf); echo $(runtime_ver) | perl -pe 's/\..*$$//o') minor_ver := $(shell $(pf); 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 $(pf); echo $(debian_ver) | perl -pe 's/-[^-]+$$//o') # upstream version - the actual upstream version, i.e. 21.4a, minus any +foo upstream_ver := $(shell $(pf); echo $(debsrc_ver) | perl -pe 's/\+[^+]+$$//o') deb_orig_tgz := $(src_name)_$(debsrc_ver).orig.tar.gz # name of the orig_tgz unpack directory deb_orig_tgz_dir := emacs-$(runtime_ver) ###################################################################### # Customizable variables # The flavor (i.e. emacs21) currently matches the source package name. flavor := $(src_name) bin_priority := 26 # This might also be something like 2006-09-09 for snapshots. menu_ver := $(major_ver) info_subdir := emacs-$(major_ver) ###################################################################### # Should these be exported like this (as autotools-dev recommends for # the two vars below) or not? export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) export DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) # As recommended by /usr/share/doc/autotools-dev/README.Debian.gz. # Handle cross-compiling and don't make ./configure guess. export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = `dpkg-buildflags --get CFLAGS` CFLAGS += -Wall LDFLAGS = `dpkg-buildflags --get LDFLAGS` CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` LDFLAGS += -g CFLAGS += -DDEBIAN ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter $(DEB_HOST_ARCH),m68k ia64)) # Fix a problem with newer versions of gcc on m68k and ia64. # There -O2 causes a build failure (broken byte compiler) - see # bugs #207580 and #582439. CFLAGS += -O1 else # neq (m68k or ia64) CFLAGS += -O2 endif # neq (m68k or ia64) endif # not noopt joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ifeq (,$(joblimit)) joblimit := 1 endif # Force joblimit to 1 until an upstream race condition is fixed: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592992 joblimit := 1 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 := \ efaq # Files that the build stage depends on (may also be listed in other vars). persistent_autogen_build_files := debian/control debian/copyright nonpersistent_autogen_build_files := # These files must always exist, i.e. can't ever be cleaned. persistent_autogen_install_files := nonpersistent_autogen_install_files := \ debian/$(flavor)-bin-common.lintian-overrides \ debian/$(flavor)-bin-common.postinst \ debian/$(flavor)-bin-common.prerm \ debian/$(flavor)-common.README.Debian \ debian/$(flavor)-common.docs \ debian/$(flavor)-common.lintian-overrides \ debian/$(flavor)-common.postinst \ debian/$(flavor)-common.prerm \ debian/$(flavor)-nox.README.Debian \ debian/$(flavor)-nox.lintian-overrides \ debian/$(flavor)-nox.menu \ debian/$(flavor)-nox.postinst \ debian/$(flavor)-nox.prerm \ debian/$(flavor)-lucid.README.Debian \ debian/$(flavor)-lucid.desktop \ debian/$(flavor)-lucid.lintian-overrides \ debian/$(flavor)-lucid.menu \ debian/$(flavor)-lucid.postinst \ debian/$(flavor)-lucid.prerm \ debian/$(flavor).README.Debian \ debian/$(flavor).desktop \ debian/$(flavor).menu \ debian/$(flavor).lintian-overrides \ debian/$(flavor).postinst \ debian/$(flavor).prerm autogen_build_files := \ $(nonpersistent_autogen_build_files) $(persistent_autogen_build_files) autogen_install_files := \ $(nonpersistent_autogen_install_files) $(persistent_autogen_install_files) persistent_autogen_files := \ $(persistent_autogen_build_files) $(persistent_autogen_install_files) nonpersistent_autogen_files := \ $(nonpersistent_autogen_build_files) $(nonpersistent_autogen_install_files) # Build directories pkgdir_common := $(CURDIR)/debian/$(flavor)-common pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common pkgdir_x := $(CURDIR)/debian/$(flavor) pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox pkgdir_lucid := $(CURDIR)/debian/$(flavor)-lucid pkgdir_el := $(CURDIR)/debian/$(flavor)-el install_dir_x := $(CURDIR)/debian/install-x install_dir_nox := $(CURDIR)/debian/install-nox install_dir_lucid := $(CURDIR)/debian/install-lucid local_lpath := /etc/$(flavor):/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 # Installation local_lpath local_lpath_install \ := $(pkgdir_common)/$(subst :,:$(pkgdir_common)/,$(local_lpath)) define testdir dh_testdir debian/emacsVER.postinst endef # If we ever need to do the stripping outside of dh_strip, just add an # INSTALL_STRIP="-s" to the make vars below. define emacs_inst $(MAKE) -C debian/$(1) install DESTDIR=$(2) \ infodir=/usr/share/info/emacs-$(major_ver) \ localstatedir=/var endef # If we ever need it, we can create a copy that doesn't assume ./debian/ define deb_sub perl -p \ -e "s|\@PKG_NAME\@|$(pkg_name)|go;" \ -e "s|\@MAJOR_VERSION\@|$(major_ver)|go;" \ -e "s|\@MINOR_VERSION\@|$(minor_ver)|go;" \ -e "s|\@FULL_VERSION\@|$(runtime_ver)|go;" \ -e "s|\@PACKAGE_VERSION\@|$(debian_ver)|go;" \ -e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \ -e "s|\@NOMINAL_VERSION\@|$(nominal_ver)|go;" \ -e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \ -e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \ -e "s|\@DEB_FLAVOR\@|$(flavor)|go;" \ -e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \ -e "s|\@INFO_FILES\@|$(main_dir_info_files)|go;" \ -e "s|\@INFO_SUBDIR\@|$(info_subdir)|go;" \ -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \ -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \ -e "s|\@MOVEMAIL_BIN\@|$(movemail_bin)|go;" \ < $(1) > $(2) endef %: dh $@ --parallel check-vars: @echo "src_name: $(src_name)" @echo "upstream_ver: $(upstream_ver)" @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 "movemail_bin: $(movemail_bin)" define check_diff @if $(quilt) series | grep -E '^debian-changes-'; \ then \ echo "Diffs found outside ./debian:"; \ ls debian/patches/debian-changes-*; \ false; \ else \ echo "../$(src_name)_$(debsrc_ver).diff.gz looks OK."; \ fi endef check-diff: clean $(testdir) cd .. && dpkg-source -b -i "$(basename $(CURDIR))" $(check_diff) buildpackage: $(testdir) dpkg-buildpackage -D -us -uc -rfakeroot -i $(check_diff) prepare-release: $(testdir) # don't want to be root -- using fakeroot below. # also, stacking fakeroots seems to cause trouble generating diff. @test "`whoami`" != root || \ (echo "please run prepare-release as a normal user (not root)"; \ false) # check for any uncommitted changes @cd debian; \ if ! git diff-files --quiet; \ then \ git status; \ echo; \ read -p "Uncommitted changes. Continue? [y/n] "; \ if test "$${REPLY}" != y; \ then \ false; \ fi; \ fi # TODO: make sure we actually installed the binary. # TODO: run tests (use a check target?) $(MAKE) -f debian/rules buildpackage @echo "Everything looks OK. Ready for release." debian-sync: $(persistent_autogen_files) # so dh pattern rule doesn't try to handle this target true debian/$(flavor).%: xsupport := "x" debian/$(flavor).%: pkg_name := $(flavor) debian/$(flavor)-nox.%: xsupport := "nox" debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox debian/$(flavor)-lucid.%: xsupport := "lucid" debian/$(flavor)-lucid.%: pkg_name := $(flavor)-lucid debian/$(flavor)-common.%: pkg_name := $(flavor)-common debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common debian/%: debian/%.in debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-bin-common.%: debian/emacsVER-bin-common.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-common.%: debian/emacsVER-common.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-el.%: debian/emacsVER-el.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor).%: debian/emacsVER.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-lucid.%: debian/emacsVER.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-common.README.Debian: \ debian/emacsVER-common.README debian/patches/*.patch debian/patches/series \ debian/rules debian/patch-to-news cd debian && \ csplit -s -f emacsVER-common.README. \ emacsVER-common.README '/@@PATCH_LIST_HERE@@/' cp debian/emacsVER-common.README.00 debian/emacsVER-common.README.tmp for p in $$($(quilt) series); do \ debian/patch-to-news debian/patches/$$p \ >> debian/emacsVER-common.README.tmp; \ echo >> debian/emacsVER-common.README.tmp; \ done tail -n +2 \ < debian/emacsVER-common.README.01 \ >> debian/emacsVER-common.README.tmp mv debian/emacsVER-common.README.tmp $@ debian/setup-stamp: $(testdir) aclocal autoconf autoheader mkdir -p $(dir $@) && touch $@ # common configure flags confflags += --prefix=/usr confflags += --sharedstatedir=/var/lib confflags += --libexecdir=/usr/lib confflags += --localstatedir=/var/lib confflags += --infodir=/usr/share/info confflags += --mandir=/usr/share/man confflags += --with-pop=yes confflags += --enable-locallisppath=$(local_lpath) # multiarch compatibility confflags += --with-crt-dir=/usr/lib/$(deb_host_multiarch) # x configure flags confflags_x := $(confflags) confflags_x += --with-x=yes confflags_x += --with-x-toolkit=gtk # For those who prefer the old-style non-toolkit scrollbars, just # change the assignment below to --without-toolkit-scroll-bars. The # resulting emacsXY package will have the old scrollbars. confflags_x += --with-toolkit-scroll-bars # nox configure flags confflags_nox := $(confflags) confflags_nox += --with-x=no confflags_nox += --without-gconf # lucid configure flags confflags_lucid := $(confflags) confflags_lucid += --with-x=yes confflags_lucid += --with-x-toolkit=lucid confflags_lucid += --with-toolkit-scroll-bars confflags_lucid += --without-gconf define cfg_tree rm -rf $(1) mkdir $(1) cp -a $$(ls -A | grep -v '^debian$$' | grep -v '^.pc$$') "$(1)" cd $(1) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" ./configure $(confflags) $(2) endef define build_cmd $(MAKE) -C $(1) -j $(joblimit) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" # If we don't use bootstrap, we need to explicitly build info. $(MAKE) -C $(1) -j $(joblimit) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" info endef override_dh_auto_configure: debian/setup-stamp # Can't use dh --with autotools_dev because it only works if # you haven't removed the config.sub and config.guess files # from the source tree. cp -a /usr/share/misc/config.guess . cp -a /usr/share/misc/config.sub . $(call cfg_tree,debian/build-x,$(confflags_x)) $(call cfg_tree,debian/build-nox,$(confflags_nox)) $(call cfg_tree,debian/build-lucid,$(confflags_lucid)) override_dh_auto_build: $(autogen_build_files) $(call build_cmd,debian/build-x) $(call build_cmd,debian/build-nox) $(call build_cmd,debian/build-lucid) define install_common_binpkg_bits # args: (1) srcdir (2) pkgdir (3) pkgname (4) bin-suffix install -d $(2)/usr/bin/ test -f $(1)/usr/bin/emacs-* cp -a $(1)/usr/bin/emacs-* $(2)/usr/bin/$(flavor)-$(4) dh_link -p$(3) usr/bin/$(flavor)-$(4) usr/bin/$(flavor) install -d $(2)/usr/share/emacs/$(runtime_ver)/etc cp -a $(1)/usr/share/emacs/$(runtime_ver)/etc/DOC-$(runtime_ver).1 \ $(2)/usr/share/emacs/$(runtime_ver)/etc/ install -d $(2)/usr/share/man/man1 dh_link -p$(3) \ usr/share/man/man1/emacs.$(flavor).1.gz \ usr/share/man/man1/$(flavor).1.gz dh_link -p$(3) \ usr/share/man/man1/emacs.$(flavor).1.gz \ usr/share/man/man1/$(flavor)-$(4).1.gz endef override_dh_auto_install: $(autogen_install_files) rm -rf \ $(install_dir_x) $(install_dir_nox) $(install_dir_lucid) \ $(pkgdir_common)/* \ $(pkgdir_bin_common)/* \ $(pkgdir_x)/* \ $(pkgdir_nox)/* \ $(pkgdir_lucid)/* \ $(pkgdir_el)/* $(call emacs_inst,build-x,$(install_dir_x)) ################################################## # emacsXY-common ifneq (,$(findstring $(flavor)-common, $(shell dh_listpackages))) install -d $(pkgdir_common) cp -a $(install_dir_x)/* $(pkgdir_common) rm -r $(pkgdir_common)/usr/bin rm -r $(pkgdir_common)/usr/lib cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \ && test -f DOC-$(runtime_ver).* cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \ && rm DOC-$(runtime_ver).* # lisp path directories install -d $(pkgdir_common)/etc/$(flavor)/site-start.d install -d $(pkgdir_common)/usr/share/$(flavor) # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs # to be in share/FLAVOR so that as we upgrade from 21.1 to 21.2, # etc., add-on package bits don't get left behind. mv $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/site-lisp \ $(pkgdir_common)/usr/share/$(flavor) dh_link -p$(flavor)-common usr/share/$(flavor)/site-lisp \ usr/share/emacs/$(runtime_ver)/site-lisp # This is a duplicate of the file in FLAVOR/site-lisp rm $(pkgdir_common)/usr/share/emacs/site-lisp/subdirs.el cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ && convert hicolor/16x16/apps/emacs.{png,xpm} cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ && convert hicolor/32x32/apps/emacs.{png,xpm} # Fixup image files in unversioned directories (remove old # images, version unversioned images) and prepare for # update-alternatives. rm $(pkgdir_common)/usr/share/icons/hicolor/16x16/apps/emacs22.png rm $(pkgdir_common)/usr/share/icons/hicolor/24x24/apps/emacs22.png rm $(pkgdir_common)/usr/share/icons/hicolor/48x48/apps/emacs22.png cd $(pkgdir_common)/usr/share/icons/hicolor \ && mv scalable/apps/emacs.svg scalable/apps/${flavor}.svg \ && mv 16x16/apps/emacs.png 16x16/apps/${flavor}.png \ && mv 24x24/apps/emacs.png 24x24/apps/${flavor}.png \ && mv 32x32/apps/emacs.png 32x32/apps/${flavor}.png \ && mv 48x48/apps/emacs.png 48x48/apps/${flavor}.png \ && mv 128x128/apps/emacs.png 128x128/apps/${flavor}.png cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \ && mv emacs-document.svg ${flavor}-document.svg # Remove redundant emacs.desktop file. rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/emacs.desktop rm $(pkgdir_common)/usr/share/applications/emacs.desktop # Mangle info files. chmod 755 debian/mangle-info for f in $(main_dir_info_files); \ do \ DEBIAN_INFO_PREFIX=$(info_subdir) \ debian/mangle-info \ $(pkgdir_common)/usr/share/info/$(info_subdir)/$$f; \ done perl -pi -e "s|man1/etags\\.1|man1/etags\\.$(flavor)\\.1|" \ $(pkgdir_common)/usr/share/man/man1/ctags.1 cd $(pkgdir_common)/usr/share/man/man1/ && \ for f in *.1; do mv $$f $$(basename $${f} .1).$(flavor).1; done # At least etc/COPYING is needed by M-x describe-copying. rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \ usr/share/emacs/$(runtime_ver)/etc/COPYING dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \ usr/share/emacs/$(runtime_ver)/lisp/COPYING $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm -f $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el\.gz/o' | xargs rm -f # Remove extraneous info dir files. These may not exist if dpkg # is 1.5.4 or newer. rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old # Remove the shared game score directory as a simple way to # avoid a conflict with other flavors of Emacs. Since # Debian's update-game-score binary isn't setuid, that # directory is never used. rm $(pkgdir_common)/var/games/emacs/tetris-scores rm $(pkgdir_common)/var/games/emacs/snake-scores rmdir $(pkgdir_common)/var/games/emacs/ rmdir $(pkgdir_common)/var/games/ rmdir $(pkgdir_common)/var/ # Make sure /usr/local dir doesn't exist. rm -r $(pkgdir_common)/usr/local endif ################################################## # emacsXY-bin-common ifneq (,$(findstring $(flavor)-bin-common, $(shell dh_listpackages))) # Move common binaries to emacs-bin-common. install -d $(pkgdir_bin_common)/usr cp -a $(install_dir_x)/usr/bin $(pkgdir_bin_common)/usr cp -a $(install_dir_x)/usr/lib $(pkgdir_bin_common)/usr # Make sure there's just one. test -f $(pkgdir_bin_common)/usr/bin/emacs-* rm $(pkgdir_bin_common)/usr/bin/{emacs,emacs-*} # Set up movemail. chown root.mail $(pkgdir_bin_common)/$(movemail_bin) chmod g+s $(pkgdir_bin_common)/$(movemail_bin) # Set up alternatives. alternatives=`ls $(pkgdir_bin_common)/usr/bin | xargs` && \ set -x && \ for f in debian/$(flavor)-bin-common.*; \ do \ perl -pwi -e "s|\@ALTERNATIVES\@|$${alternatives}|go" $$f ; \ done for f in `ls $(pkgdir_bin_common)/usr/bin`; \ do \ mv $(pkgdir_bin_common)/usr/bin/$$f \ $(pkgdir_bin_common)/usr/bin/$$f.$(flavor) ; \ done endif ################################################## # emacsXY ifneq (,$(findstring $(flavor), $(shell dh_listpackages))) $(call install_common_binpkg_bits,\ $(install_dir_x),$(pkgdir_x),$(flavor),x) # install desktop entry install -d $(pkgdir_x)/usr/share/applications install -m 0644 \ debian/$(flavor).desktop $(pkgdir_x)/usr/share/applications/ endif ################################################## # emacsXY-nox ifneq (,$(findstring $(flavor)-nox, $(shell dh_listpackages))) $(call emacs_inst,build-nox,$(install_dir_nox)) $(call install_common_binpkg_bits,\ $(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox) rm -rf $(install_dir_nox) endif ################################################## # emacsXY-lucid ifneq (,$(findstring $(flavor)-lucid, $(shell dh_listpackages))) $(call emacs_inst,build-lucid,$(install_dir_lucid)) $(call install_common_binpkg_bits,\ $(install_dir_lucid),$(pkgdir_lucid),$(flavor)-lucid,lucid) # install desktop entry install -d $(pkgdir_lucid)/usr/share/applications install -m 0644 \ debian/$(flavor)-lucid.desktop \ $(pkgdir_lucid)/usr/share/applications/ rm -rf $(install_dir_lucid) endif ################################################## # emacsXY-el ifneq (,$(findstring $(flavor)-el, $(shell dh_listpackages))) $(pf); \ mkdir -p $(pkgdir_el); \ (cd $(install_dir_x) && find -name "*.el" -o -name "*.el.gz" -print0 \ | tar cpf - --null --files-from -) \ | (cd $(pkgdir_el) && tar xpf -) endif ################################################## # final cleanup rm -rf $(install_dir_x) rm -rf $(install_dir_nox) rm -rf $(install_dir_lucid) override_dh_testdir: $(testdir) override_dh_fixperms: dh_fixperms -X$(movemail_bin) override_dh_clean: $(persistent_autogen_files) rm -rf \ debian/build-x \ debian/install-x \ debian/build-nox \ debian/install-nox \ debian/build-lucid \ debian/install-lucid \ debian/*-stamp \ config.guess \ config.sub \ configure \ src/config.in rm -f $(nonpersistent_autogen_files) dh_clean debian/emacsVER.README.Debian0000644000000000000000000000014012164175107012672 0ustar Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/ as the primary documentation directory. debian/emacsVER-common.docs0000644000000000000000000000006512164175106012777 0ustar BUGS README debian/README.add-on-package-maintainers debian/emacsVER-bin-common.prerm0000644000000000000000000000053612164175106013745 0ustar #!/bin/sh set -e FLAVOR=@DEB_FLAVOR@ MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ ALTERNATIVES="@ALTERNATIVES@" # update-alternatives on things that collide with xemacs, other editors if [ "$1" != "upgrade" ] then for i in ${ALTERNATIVES} do update-alternatives --remove $i /usr/bin/$i.${FLAVOR} done fi #DEBHELPER# debian/source/0000755000000000000000000000000012164175133010471 5ustar debian/source/format0000644000000000000000000000001412164175107011700 0ustar 3.0 (quilt) debian/emacsVER.README0000644000000000000000000000012612164175106011514 0ustar Please see /usr/share/doc/@PKG_NAME@-common/ as the primary documentation directory. debian/patch-to-news0000755000000000000000000000072712164175106011616 0ustar #!/bin/bash set -e patch="$1" sed ' # delete everything after the first line starting with "--- " (the diff) /^--- [^ ]/,$d' < "$patch" \ | tac \ | sed ' # delete everything up to the first line containing only "---" (the diffstat) 1,/^---$/d' \ | tac \ | sed ' # delete everything before the first blank line (git summary line) 1,/^$/d' \ | sed ' # convert to our README.Debian NEWS format 1 s/^/* / 2,$ s/^/ /' echo " Patch: $(basename $patch)" debian/control0000644000000000000000000000651412232455632010603 0ustar Source: emacs23 Section: editors Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff5-dev | libtiff-dev, xaw3dg-dev, libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ Standards-Version: 3.7.2 Package: emacs23-lucid Architecture: any Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: emacs23, emacsen, editor, info-browser, mail-reader, news-reader Conflicts: emacs23, emacs23-nox, emacs23-gtk Replaces: emacs23, emacs23-nox, emacs23-gtk Description: The GNU Emacs editor GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a Lucid user interface. Package: emacs23-nox Architecture: any Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader Conflicts: emacs23, emacs23-lucid, emacs23-gtk Replaces: emacs23, emacs23-lucid, emacs23-gtk 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: emacs23 Architecture: any Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk Conflicts: emacs23-lucid, emacs23-nox, emacs23-gtk Replaces: emacs23-lucid, emacs23-nox, emacs23-gtk Description: The GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a GTK+ user interface. Package: emacs23-bin-common Architecture: any Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} 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 emacs23, emacs23-lucid, and emacs23-nox. Package: emacs23-common Architecture: all Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, emacs23-common-non-dfsg, ${shlibs:Depends}, ${misc:Depends} Suggests: emacs23-el Conflicts: emacs23-el (<< ${source:Version}), cedet, eieio, speedbar Description: The GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure that's shared by emacs23, emacs23-lucid, and emacs23-nox. Package: emacs23-el Architecture: all Depends: emacs23-common (= ${source:Version}), ${misc:Depends} Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, saving space in the main package for small systems. debian/emacsVER-bin-common.lintian-overrides0000644000000000000000000000106712164175107016257 0ustar @PKG_NAME@ binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail @PKG_NAME@ binary: binary-without-manpage usr/bin/b2m.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/ctags.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/ebrowse.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/emacsclient.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/etags.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/grep-changelog.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/rcs-checkin.@DEB_FLAVOR@ debian/emacsVER-common.README0000644000000000000000000000266612164175106013015 0ustar This file details the Debian specific changes to Emacs. The following tags may be used in the sections below: Patch, Status, Author, Added-by, Provided-by, and Date. When known, Author is used to indicate the person believed to have written the relevant code. Provided-by may be used to indicate the person who submitted the code to Debian, and Added-by indicates the person who actually added the code to the Debian package. * The Debian copy of the upstream source contains no .elc files. The .elc files have been removed because we always regenerate them and because Emacs modifies them in the source tree during the build process, even when using a VPATH build. This means that a "make clean" can't easily return the tree to the upstream state, resulting in a giant Debian binary diff. There are other solutions if this turns out to be a problem. If nothing else, we can keep the current infrastructure and just add the .elc files to protected_files in debian/rules. Removing the .elc files doesn't affect whether or not our source archive would match the upstream md5sum because we have to repackage it anyway to add leim support. * Those who prefer the old-style scrollbars can edit debian/rules If you prefer the old-style, non-toolkit scrollbars, just edit debian/rules to add --without-toolkit-scrollbars where indicated and rebuild. @@PATCH_LIST_HERE@@ Local Variables: mode: outline outline-regexp: " *\\*+" End: debian/emacsVER.desktop0000644000000000000000000000103312164175107012227 0ustar [Desktop Entry] Version=1.0 Name=GNU Emacs @MENU_VERSION@ GenericName=Text Editor Comment=View and edit files MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Exec=/usr/bin/@DEB_FLAVOR@ %F TryExec=@DEB_FLAVOR@ Icon=/usr/share/icons/hicolor/scalable/apps/@DEB_FLAVOR@.svg Type=Application Terminal=false Categories=Utility;Development;TextEditor; StartupWMClass=Emacs@MENU_VERSION@ debian/copyright0000644000000000000000000001233512232455632011131 0ustar -*-text-*- This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source archive is emacs-23.4.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ Please see /usr/share/doc/emacs23-common/README.Debian.gz for a description of the Debian specific differences from the upstream version. As mentioned there, some files (including some of the Emacs documentation) have been removed from this package because their licenses do not appear to satisfy the requirements of the Debian Free Software Guidelines (DFSG). See http://www.debian.org/social_contract. In particular, some of the info pages are covered under the GNU Free Documentation License (GFDL), which Debian has decided does not satisfy the DFSG in cases where "Invariant Sections" are specified (this includes front and back cover texts). See this Debian General Resolution on the topic: http://www.debian.org/vote/2006/vote_001. The Ubuntu project does not consider that GFDL invariant sections make a work non-free, so has placed the package emacs23-common-non-free in the "main" archive section, and added a dependency from emacs23-common. You should therefore have all documentation on your system. Some other files have been removed because their license only allows verbatim copying, or because there was some other question. Copyright: Emacs itself is licensed under the terms of the GNU General Public License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and doc/man/rcs-checkin.1 are licensed as follows: Copyright (C) 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/emacs.1 is licensed as follows: Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/etags.1 is licensed as follows: Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. man/faq.texi is licensed as follows: Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner Copyright (C) 1992,1993 Steven Byrnes Copyright (C) 1990,1991,1992 Joseph Brian Wells This list of frequently asked questions about GNU Emacs with answers ("FAQ") may be translated into other languages, transformed into other formats (e.g. Texinfo, Info, WWW, WAIS), and updated with new information. The same conditions apply to any derivative of the FAQ as apply to the FAQ itself. Every copy of the FAQ must include this notice or an approved translation, information on who is currently maintaining the FAQ and how to contact them (including their e-mail address), and information on where the latest version of the FAQ is archived (including FTP information). The FAQ may be copied and redistributed under these conditions, except that the FAQ may not be embedded in a larger literary work unless that work itself allows free copying and redistribution. debian/emacsVER-bin-common.postinst0000644000000000000000000000073112164175107014501 0ustar #!/bin/sh set -e FLAVOR=@DEB_FLAVOR@ MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ ALTERNATIVES="@ALTERNATIVES@" BIN_PRIORITY=@BIN_PRIORITY@ # update-alternatives on things that collide with xemacs, other editors for i in ${ALTERNATIVES} do update-alternatives \ --install /usr/bin/$i $i /usr/bin/$i.${FLAVOR} ${BIN_PRIORITY} \ --slave /usr/share/man/man1/$i.1.gz $i.1.gz \ /usr/share/man/man1/$i.${FLAVOR}.1.gz done #DEBHELPER# debian/changelog0000644000000000000000000025422312232455604011053 0ustar emacs23 (23.4+1-4.1ubuntu1) trusty; urgency=low * Merge with Debian. Remaining changes: - debian/control.in: - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - Have emacs23-common Depends on emacs23-common-non-dfsg, now that it is going to main. - Use libtiff5-dev in place of libtiff4-dev. - debian/patches: - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs23" to please bamf and gnome-shell - debian/patches/no_cpp_multiarch_dir_mangling.diff: make sure cpp doesn't mangle our multiarch include path due to a built-in macro matching the architecture name. - debian/emacsVER.desktop: also set StartupWMClass for bamf and gnome-shell -- Iain Lane Fri, 25 Oct 2013 12:47:09 +0100 emacs23 (23.4+1-4.1) unstable; urgency=low * Non-maintainer upload. * Fix FTBFS missing directory, thanks to Matt Kraai. (Closes: #707488) -- Dmitrijs Ledkovs Tue, 25 Jun 2013 22:58:37 +0100 emacs23 (23.4+1-4ubuntu2) saucy; urgency=low * Cherry-pick from emacs24: - debian/rules: Make sure the emacs23-el directory exists. -- Iain Lane Mon, 17 Jun 2013 10:08:02 +0100 emacs23 (23.4+1-4ubuntu1) quantal-proposed; urgency=low * Resynchronise with Debian. Remaining changes: - debian/control.in: - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - Have emacs23-common Depends on emacs23-common-non-dfsg, now that it is going to main. - Use libtiff5-dev in place of libtiff4-dev. - debian/patches: - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs23" to please bamf and gnome-shell - debian/patches/no_cpp_multiarch_dir_mangling.diff: make sure cpp doesn't mangle our multiarch include path due to a built-in macro matching the architecture name. - debian/emacsVER.desktop: also set StartupWMClass for bamf and gnome-shell -- Colin Watson Sat, 22 Sep 2012 14:04:56 +0100 emacs23 (23.4+1-4) unstable; urgency=high * Add 0018-Don-t-eval-code-when-enable-local-variables-is-safe.patch. Don't eval code when enable-local-variables is :safe. Previously, Emacs might eval forms in file-local variable sections even when the Emacs user option `enable-local-variables' was set to :safe (CVE-2012-3479). Please see the patch for additional details. Thanks to Henri Salo for the report. (Closes: #684695) * Stop producing the emacs binary metapackage. Move the emacs binary metapackage to its own source package (emacs-defaults, cf. gcc-defaults). This will prevent emacs23 and emacs24 from producing the same binary package. -- Rob Browning Sat, 08 Sep 2012 14:59:52 -0500 emacs23 (23.4+1-3ubuntu3) quantal-proposed; urgency=low * SECURITY UPDATE: arbitrary lisp code execution via crafted file - debian/patches/CVE-2012-3479.patch: ignore eval: forms that are not known to be safe if enable-local-variables is set to :safe in lisp/files.el. - CVE-2012-3479 -- Marc Deslauriers Fri, 21 Sep 2012 10:52:47 -0400 emacs23 (23.4+1-3ubuntu2) quantal; urgency=low * debian/control.in: use libtiff5-dev in place of libtiff4-dev -- Serge Hallyn Mon, 09 Jul 2012 15:42:40 -0500 emacs23 (23.4+1-3ubuntu1) quantal; urgency=low * Merge with Debian, remaining changes: - debian/control.in: - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - debian/patches: - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs23" to please bamf and gnome-shell - debian/patches/no_cpp_multiarch_dir_mangling.diff: make sure cpp doesn't mangle our multiarch include path due to a built-in macro matching the architecture name. - debian/emacsVER.desktop: also set StartupWMClass for bamf and gnome-shell * Dropped changes: - use_crtdir_in_startfiles.diff: Now upstream - emacs-xgselect.patch: Now applied in Debian - Drop the horror that was ubuntu-restore-nondfsg-files.diff. We'll move the package into main. * Have emacs23-common Depends on emacs23-common-non-dfsg, now that it is going to main. -- Iain Lane Sat, 12 May 2012 12:30:20 +0100 emacs23 (23.4+1-3) unstable; urgency=low * Add 0017-Initialize-xgselect-in-function-xg_select-when-gfds_.patch. Patch xgselect.c to prevent hang when using newer versions of GLib. Thanks to Vincent Lefevre and Sven Arvidsson for the initial reports, and Karel Klíč for the patch. (Closes: #666691) -- Rob Browning Sat, 07 Apr 2012 14:35:51 -0500 emacs23 (23.4+1-2) unstable; urgency=low * Add 0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch. Incorporate upstream fix to prevent Emacs from crashing while decoding input with DOS EOLs. * Add 0016-quail-indian.el-indian-tlg-base-table-Fix-typo-dev-t.patch. Rename indian-dev-base-table to indian-tlg-base-table to correct a typo in quail/indian.el. -- Rob Browning Wed, 21 Mar 2012 01:19:53 -0500 emacs23 (23.4+1-1) unstable; urgency=low * Upgrade to upstream version 23.4. Emacs 23.4 includes grammars that were missing for some of its bison parsers. Thanks to Julian Andres Klode for the report. (Closes: #635938) * Update debian/* for Emacs 23.4. * Depend on libpng-dev rather than libpng12-dev. Thanks to Nobuhiro Iwamatsu for the report. (Closes: #662312) * Add 0014-Fix-hang-after-C-z-in-gnome-shell.patch. Emacs should no longer hang when C-z is pressed within the Gnome shell. Thanks to Nikolay Pelov for the report. (Closes: #655592) -- Rob Browning Tue, 20 Mar 2012 23:39:44 -0500 emacs23 (23.3+1-5) unstable; urgency=high * Add 0017-Define-POSIX_SIGNALS-for-GNU-Hurd.patch. Thanks to Samuel Thibault for the report and the patch. (Closes: #650976) * Add 0018-Don-t-let-CEDET-execute-code-from-an-arbitrary-Proje.patch. Don't execute arbitrary elisp code from any file named Project.ede in or above a CEDET-related directory (CVE-2012-0035). Thanks to Florian Weimer for the report. (Closes: #655299) * Add 0019-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch. Use varargs in movemail.c error() and add a printf attribute to support hardened build flags. * Add debian/rules support for hardened build flags. Thanks to Moritz Muehlenhoff for the report and the patch. (Closes: #655118) * Add conflict with cedet, eieio, and speedbar. Don't allow the older standalone packages to remain installed since they break emacs23, emacs23 includes them, and they're no longer in unstable/testing. Thanks to Ivan Vilata i Balaguer for the report. (Closes: #632142) * Change negated build-dep [!hurd-i386...] to [linux-any]. Thanks to Robert Millan for the report. (Closes: #634336) -- Rob Browning Sun, 29 Jan 2012 14:06:03 -0600 emacs23 (23.3+1-4) unstable; urgency=low * Add 0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch. Thanks to Hiroyuki Yamamoto for the report and the patch. (Closes: #646609) -- Rob Browning Tue, 25 Oct 2011 19:58:32 -0500 emacs23 (23.3+1-3) unstable; urgency=low * Add 0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch. Thanks to Sven Joachim for the report and the patch, and and Philipp Kern for the 23.3+1-1.1 NMU, which included it. (Closes: #629567) -- Rob Browning Mon, 24 Oct 2011 22:45:37 -0500 emacs23 (23.3+1-2) unstable; urgency=low * Add 0014-Add-i386-to-cpp_undefs-in-configure.in-to-fix-i386-m.patch. Thanks to Steve Langasek for the report, Sven Joachim for the patch, and Philipp Kern for the 23.3+1-1.1 NMU, which included it. (Closes: #620795) * Don't explicitly add leim to locallispath since it's no longer necessary. (Closes: #476660) * Don't test for src/emacs.c in rules since the whole tree is in git now. * Drop dh --with autotools_dev; it doesn't work if config.* files are missing. * Build-depend on libjpeg-dev rather than libjpeg62-dev. Thanks to Bill Allombert for the report and Philipp Kern for the 23.3+1-1.1 NMU which included a patch. (Closes: #633744) * Pass the correct crt-dir to ./configure for multiarch. Thanks to Sven Joachim for the report and the patch, and thanks to Philipp Kern for the 23.3+1-1.1 NMU which included the patch. (Closes: #629567) -- Rob Browning Sun, 23 Oct 2011 01:22:00 -0500 emacs23 (23.3+1-1ubuntu9) precise; urgency=low * debian/patches/unity-shrinkage.patch: Back port of upstream Emacs 24 patch to prevent automatic uncontrollable shrinkage of the window to one row high when no menu bar is used under Unity/Gtk+/Ubuntu 12.04. (LP: #941790) -- Barry Warsaw Sat, 24 Mar 2012 13:07:38 -0400 emacs23 (23.3+1-1ubuntu8) precise; urgency=low * debian/patches/emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs23" to please bamf and gnome shell (LP: #725988) * debian/emacsVER.desktop: also set StartupWMClass (same reason) -- Fabien Tassin Wed, 15 Feb 2012 18:42:46 +0100 emacs23 (23.3+1-1ubuntu7) precise; urgency=low * debian/patches/emacs-xgselect.patch: Initialize xgselect in function xg_select when gfds_size == 0. Fixes 100% CPU startup freeze with glib 2.31. (LP: #902043) -- Anders Kaseorg Fri, 09 Dec 2011 02:17:48 -0500 emacs23 (23.3+1-1ubuntu6) precise; urgency=low * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. -- Adam Conrad Fri, 02 Dec 2011 17:29:34 -0700 emacs23 (23.3+1-1ubuntu5) precise; urgency=low * Transition to libjpeg8-dev, so our build-deps no longer conflict. -- Adam Conrad Thu, 01 Dec 2011 21:52:48 -0700 emacs23 (23.3+1-1ubuntu4) oneiric; urgency=low * Revert addition of ubuntu-fix-extract-filename-on-gcc-warn-or-err.diff that broke armel build. Reopens LP #814468. -- Daniel T Chen Sun, 14 Aug 2011 12:13:49 -0400 emacs23 (23.3+1-1ubuntu3) oneiric; urgency=low * Apply patch from longo resolving gcc-include's failure to properly extract the filename and to jump to line position. (LP: #814468) -- Daniel T Chen Sun, 14 Aug 2011 10:33:32 -0400 emacs23 (23.3+1-1ubuntu2) oneiric; urgency=low * src/s/gnu-linux.h (START_FILES): Use CRT_DIR. -- Matthias Klose Sat, 13 Aug 2011 12:54:07 +0200 emacs23 (23.3+1-1ubuntu1) oneiric; urgency=low * Merge from Debian unstable; remaining changes: - debian/patches/no_cpp_multiarch_dir_mangling.diff: make sure cpp doesn't mangle our multiarch include path due to a built-in macro matching the architecture name. - debian/control.in: - Conflict and Replace emacs23-common-non-dfsg, since we provide all of its features. - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - debian/copyright.in: - Remove text about removed files. - debian/emacsVER-common.{postinst,prerm}: Don't install info files to info/dir. This happens automatically now. - debian/patches: - -Remove-files-that-appear-to-be-incompatible-with-the.patch: Remove. - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces the non-DFSG files, with the exception of .elc files and info files, which use special characters and thus can't be easily represented in patch form. These will be regenerated at build time. - debian/rules: - Do not install replacements for non-DFSG files. - Install all info files, not just efaq. - Avoid uselessly building info files a 2nd time. * Dropped changes: - debian/patches/fix-ftbfs-xft-fontconfig.diff: merged in Debian. - debian/patches/fix-menus.diff: present upstream. - Require autotools-dev (>= 20100122.1) in Build-Depends: don't use versioned build-depends to work around buggy versions. - debian/patches/fix-decimal-point-in-font-size.diff: no documentation in the changelog for this change, from an upstream bug report but not upstreamed. * debian/patches/no_cpp_multiarch_dir_mangling.diff: only include i386 here; if the toolchain triplet matches the multiarch path, this is already handled in configure.in. -- Steve Langasek Sat, 28 May 2011 05:57:27 +0000 emacs23 (23.3+1-1) unstable; urgency=low * Incorporate new upstream version 23.3. * Don't clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS in configure. Thanks to Peter Fritzsche for the report and Matthias Klose for the patch. (closes: #554324) * Adjust emacsVER-common.README to accommodate new patch headers. Add debian/patch-to-news to handle converting new git-dpm style patch headers to emacsVER-common.README. * Rely on autotools-dev for config.guess and config.sub. * Fix a tty-related preprocessor inclusion error affecting GNU/Hurd systems. Thanks to Samuel Thibault for the report and the patch. (closes: #610576) * Expect 0 from kill() for zombies on GNU/Hurd. This should prevent Emacs from hanging on affected systems. Thanks to Samuel Thibault for the report and the patch. (closes: #611591) * Remove debian/dfsg-splitter since the split is now being handled directly in git. -- Rob Browning Sun, 10 Apr 2011 10:33:31 -0500 emacs23 (23.2+1-7ubuntu2) natty; urgency=low * debian/patches/no_cpp_multiarch_dir_mangling.diff: make sure cpp doesn't mangle our multiarch include path due to a built-in macro matching the architecture name. LP: #749270. -- Steve Langasek Mon, 04 Apr 2011 08:51:24 +0000 emacs23 (23.2+1-7ubuntu1) natty; urgency=low [ Hajime Mizuno ] * Merge from debian unstable(LP: #705383). Remaining changes: * debian/control.in: - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy. - Conflict and Replace emacs23-common-non-dfsg, since we provide all of its features. - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - Require autotools-dev (>= 20100122.1) in Build-Depends, since the version in Karmic will fail due to a missing Perl module. * debian/control: Regenerate. * debian/copyright.in: - Remove text about removed files. * debian/copyright: Regenerate. * debian/emacsVER-common.postinst: - Don't install info files to info/dir. This happens automatically now. * debian/emacsVER-common.prerm: - Don't remove info files from info/dir. This happens automatically now. * debian/emacsVER-common.prerm: - Don't remove info files from info/dir. This happens automatically now. * debian/patches: - handle-dfsg-split.diff: Remove. - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces the non-DFSG files, with the exception of .elc files and info files, which use special characters and thus can't be easily represented in patch form. These will be regenerated at build time. * debian/rules: - Do not install replacements for non-DFSG files. - Install all info files, not just efaq. - Avoid uselessly building info files a 2nd time. * fix-ftbfs-xft-fontconfig.diff to avoid FTBFS. * debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499 (Emacs gets stuck waiting for menu input). (LP: #569914) -- Hajime Mizuno Sun, 12 Dec 2010 11:24:28 +0000 emacs23 (23.2+1-7) unstable; urgency=low * Don't initialize the terminal twice. Previously a console-mode Emacs would send the escape sequence to switch to the alternate screen twice. At a minimum, this caused problems with screen. Thanks to Courtney Bane for the report and the patch. (closes: #599463) * Fix the value for RIPEMD-160 in epg-digest-algorithm-alist according to RFC 4880. Thanks to Daniel Kahn Gillmor for the report and the fix. (closes: #594510) -- Rob Browning Sat, 11 Dec 2010 11:00:07 -0600 emacs23 (23.2+1-6) unstable; urgency=low * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since the latter is a virtual package. Thanks to Cyril Brulebois for the report, and thanks to Mehdi Dogguy for the 23.2+1-5.1 NMU. (closes: #600826) -- Rob Browning Fri, 26 Nov 2010 11:34:32 -0600 emacs23 (23.2+1-5) unstable; urgency=low * Apply upstream patches to prevent the string and unibyte-string functions from overflowing the stack (prevent-string-stack-overflow.diff, prevent-let-eval-apply-stack-overflow.diff, and use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff). Thanks to Carl Worth and Sven Joachim for finding the patches (closes: #586459). * Apply upstream patch to prevent mail destined for mail-archive-file-name from being lost (fix-gnus-output-to-mail-with-live-rmail-buffers.diff). Thanks to Jeroen Nijhof for the report and Sven Joachim for tracking down the patch. (closes: #597255) * Remove debian-adjust-mail-from-addresses-patch.diff to stop adjusting the message-sendmail-f-is-evil default. Match the behavior of the Debian gnus package, Emacs upstream, and emacs-snapshot. Thanks to Artem Chuprina for the report. (closes: #397757) * Apply upstream patch to fix the computation of the width of dual-width fonts (fix-fc-dual-font-width-calculation.diff). Thanks to mizuno hajime for the report and Sven Joachim for tracking down the patch. (closes: #588808) -- Rob Browning Mon, 18 Oct 2010 00:17:56 -0500 emacs23 (23.2+1-4ubuntu2) natty; urgency=low * debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499 (Emacs gets stuck waiting for menu input). (LP: #569914) -- Anders Kaseorg Thu, 04 Nov 2010 15:56:10 -0400 emacs23 (23.2+1-4ubuntu1) natty; urgency=low [ Michael W. Olson (GNU address) ] * Resync with Debian. Remaining changes: * debian/control.in: - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy. - Conflict and Replace emacs23-common-non-dfsg, since we provide all of its features. - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - Require autotools-dev (>= 20100122.1) in Build-Depends, since the version in Karmic will fail due to a missing Perl module. * debian/control: Regenerate. * debian/copyright.in: - Remove text about removed files. * debian/copyright: Regenerate. * debian/emacsVER-common.postinst: - Don't install info files to info/dir. This happens automatically now. * debian/emacsVER-common.prerm: - Don't remove info files from info/dir. This happens automatically now. * debian/patches: - handle-dfsg-split.diff: Remove. - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces the non-DFSG files, with the exception of .elc files and info files, which use special characters and thus can't be easily represented in patch form. These will be regenerated at build time. * debian/rules: - Do not install replacements for non-DFSG files. - Install all info files, not just efaq. - Avoid uselessly building info files a 2nd time. [ Reinhard Tartler ] * Reintegrate ubuntu history in debian/changelog * verified that debian/patches/fix-movemail-race.diff can be dropped, it is integrated in the new upstream version. * Rebuild against new debhelper to get trigger support: LP: #449729 * New upstream version (LP: #588203) solves: - huge font sizes. LP: #445402 - scroll bar in emacs highlights/selects text, LP: #581486 - org and tbl menus are no longer missing in org-mode, LP: #640504 * Add patch fix-ftbfs-xft-fontconfig.diff to avoid FTBFS. -- Michael W. Olson (GNU address) Tue, 31 Aug 2010 17:26:34 -0700 emacs23 (23.2+1-4) unstable; urgency=low * Disable parallel builds (via DEB_BUILD_OPTIONS=parallel) until an upstream race condition is fixed. Thanks to Sven Joachim for the report. (closes: #592992) -- Rob Browning Sat, 14 Aug 2010 16:34:11 -0500 emacs23 (23.2+1-3) unstable; urgency=low * Don't try to "mkdir $(infodir)" in doc/*/Makefile.in. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Use -O1 rather than -O2 on ia64. Fixes a build failure (looks like a broken byte compiler) with newer versions of gcc (c.f. #207580). Thanks to Sven Joachim for the report and thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. (closes: #582439) * Remove deprecated Encoding field from emacsVER.desktop. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Use "set -e" rather than "/bin/sh -e" in emacsVER-common.postinst and emacsVER-bin-common.postinst. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Add a Homepage field to debian/control.in. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Remove redundant Section and Priority fields from binary packages in debian/control.in. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Change quilt Build-Depends from (>= 0.42-1) to (>= 0.42). Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Change debhelper Build-Depends from (>=4) to (>= 7.0.50~) to support rules overrides. Thanks to Sven Joachim , and thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Add ${misc:Depends} to debian/control for debhelper. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff). Thanks to antoine beaupre for the report and Petr Salinger for the patch. (closes: #559392) -- Rob Browning Sat, 14 Aug 2010 11:57:17 -0500 emacs23 (23.2+1-2) unstable; urgency=low * Respect DESTDIR in doc/misc/Makefile.in. (closes: #581642) -- Rob Browning Fri, 14 May 2010 21:56:27 -0700 emacs23 (23.2+1-1) unstable; urgency=low * New emacs23 packages. * Update debian/dfsg-splitter. * Add dependency on libgconf2-dev and use --without-gconf for emacsFLAVOR-nox and emacsFLAVOR-lucid builds. * Remove patches: patches/fix-dynamic-menus.diff patches/fix-gtk-scroll-bar-events.diff patches/fix-rmail-capitalized-month-names.diff patches/use-zwj-and-zwnj-for-indic-scripts.diff * Refresh remaining patches. -- Rob Browning Thu, 13 May 2010 19:21:32 -0700 emacs23 (23.1+1-9) unstable; urgency=low * Fix binary-only builds (dpkg-buildpackage -B) and conditionalize all packages in dh_auto_install. (closes: #580067) -- Rob Browning Thu, 06 May 2010 22:59:26 -0700 emacs23 (23.1+1-8) unstable; urgency=low * Add automake to Build-Depends. (closes: #580006) -- Rob Browning Sun, 02 May 2010 19:53:36 -0700 emacs23 (23.1+1-7) unstable; urgency=low * Remove Jerome from debian/control Uploaders since he has retired. (closes: #573442) * Support DEB_BUILD_OPTIONS parallel=N. * Follow current autotools-dev recommendations - build-depend on autoconf, remove the automatically generated files in clean, and regenerate them before building. * Update debian/compat from 4 to 7. * Switch to Debian 3.0 (quilt) source format and drop debian/rules "protected_files" handling since we don't build in $(CURDIR) and haven't for a while. * Fix ctags manpage rewriting so that ctags.FLAVOR.1 actually refers to man1/etags.FLAVOR.1 as intended. * Change debian/rules to use "dh $@" approach. * Update emacsFLAVOR-common dpkg dependency to require "dpkg (>= 1.15.4) | install-info" for proper info page handling (Debian Policy 12.2), and remove install-info dependency from packages without info files. * Don't define unix when building emacs (add-unix-to-cpp-undefs.diff). -- Rob Browning Sun, 02 May 2010 10:56:09 -0700 emacs23 (23.1+1-6) unstable; urgency=low * Apply an upstream patch to fix a problem with GTK+ scroll bars. Thanks to Eugen Dedu for the report and Sven Joachim for tracking down the patch. (closes: #560573) * Apply an upstream patch to include ZWJs and ZWNJs for all Indic scripts. Thanks to Praveen A for the report. (closes: #559292) * Fix update-alternatives call for emacs manpage. Thanks to Jörg-Volker Peetz and Sven Joachim for the report. (closes: #552565) -- Rob Browning Tue, 26 Jan 2010 22:51:54 -0800 emacs23 (23.1+1-5) unstable; urgency=low * Apply upstream patch to fix problem with GTK and dynamically generated menus (which could be unexpectedly empty). Thanks to Baylis Shanks for the report. (closes: 550541) -- Rob Browning Sun, 01 Nov 2009 10:00:58 -0800 emacs23 (23.1+1-4ubuntu7) lucid; urgency=low * SECURITY UPDATE: arbitrary mailbox read/write via race condition. - Add debian/patches/fix-movemail-race.diff: thanks to Dan Rosenberg. - CVE-2010-0825 -- Kees Cook Tue, 23 Mar 2010 16:11:55 -0700 emacs23 (23.1+1-4ubuntu6) lucid; urgency=low * Don't suggest emacs23-common-non-dfsg, as it does not exist in Ubuntu (LP: #444094) -- Ralf Doering Fri, 05 Mar 2010 13:42:50 +0100 emacs23 (23.1+1-4ubuntu5) lucid; urgency=low [ Rob Browning ] * Apply upstream patch to fix problem with GTK and dynamically generated menus (which could be unexpectedly empty). Thanks to Baylis Shanks for the report. (closes: 550541) [ Reinhard Tartler ] * snatched patch from debian upload 23.1+1-5. LP: #415101 -- Reinhard Tartler Fri, 06 Nov 2009 09:21:16 +0100 emacs23 (23.1+1-4ubuntu4) lucid; urgency=low * reintroduce the "emacs" binary package. emacs22 will be changed to no longer build it. -- Reinhard Tartler Wed, 04 Nov 2009 15:21:35 +0100 emacs23 (23.1+1-4ubuntu3) karmic; urgency=low * Also comment out emacs binary in debian/control.in (LP: #433397) really this time -- Scott Kitterman Wed, 14 Oct 2009 11:46:59 -0400 emacs23 (23.1+1-4ubuntu2) karmic; urgency=low * Stop shipping emacs binary so emacs22 in main doesn't get hijacked (LP: #433397) - Comment out the binary in debian/control -- Scott Kitterman Sun, 11 Oct 2009 23:22:39 -0400 emacs23 (23.1+1-4ubuntu1) karmic; urgency=low * FFe granted in LP: #433397, #408085 * debian/control.in: - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy. - Conflict and Replace emacs23-common-non-dfsg, since we provide all of its features. - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. * debian/control: Regenerate. * debian/copyright.in: - Remove text about removed files. * debian/copyright: - Regenerate. * debian/emacsVER-common.postinst: - Install info files. Rules copied from nondfsg package, with the change that we use INFO_SUBDIR and INFO_FILES. * debian/emacsVER-common.prerm: - Remove info files. Rules copied from nondfsg package, with the change that we use INFO_SUBDIR and INFO_FILES. * debian/patches: - handle-dfsg-split.diff: Remove. - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces the non-DFSG files, with the exception of .elc files and info files, which use special characters and thus can't be easily represented in patch form. Both will be regenerated at build time. * debian/rules: - Do not install replacements for non-DFSG files. - Install all info files, not just efaq. - During cleanup, chmod mangle-info back to 644, so it does not show up as modified. -- Michael W. Olson (GNU address) Wed, 16 Sep 2009 19:35:02 -0700 emacs23 (23.1+1-4) unstable; urgency=low * Remove redundant upstream emacs.desktop files from emacs23-common, and merge some of the upstream emacs.desktop file info into the Debian files. Thanks to Michael Biebl for the report. (closes: #541173) * Handle the fact that the share/info/emacs-VER/dir{,.old} files may not be created during the install (and so may not need to be removed). This may be the case with dpkg 1.5.4 or newer. Thanks to Sven Joachim for the report and the fix. (closes: 545379) * Add a bit to the emacsVER-lucid description. Thanks to Drew Parsons for the suggestion. (closes: #545263) * Add provides emacs23-gtk to emacs23 as a transition measure (to be deleted in emacs24) to allow more seamless upgrades from the earlier unstable/testing packages. Thanks to Josh Triplett for the suggestion. (closes: #545405) -- Rob Browning Sun, 13 Sep 2009 18:10:28 -0700 emacs23 (23.1+1-3) unstable; urgency=low * Fix overlooked manpage rename in emacsVER.postinst. Thanks to Sven Joachim . (closes: #539926) * Change emacsVER to be the GTK+ version to match the upstream default, and add an emacsVER-lucid package for those who still want the non-GTK+ version. Thanks to Romain Francoise and others for the report. (closes: #539800) * Don't build-depend on libgmp-dev on hurd or kfreebsd. Thanks to Cyril Brulebois . (closes: #541353) * Fix emacsVER.desktop to refer to SVG file instead of incorrect PNG, remove emacs22.png files from unversioned /usr/share/icons directory, and change emacs*.png and emacs*.svg files to emacsVER*.png and emacsVER*.svg. Also use update-alternatives to manage the unversioned names for these files. Thanks to Atsuhito KOHDA for the initial report. (closes: #539851) * Fix Rmail to handle capitalized month names in Date lines, i.e. "Date: Thu, 06 Aug 2009 18:33:32 +0100". Thanks to Jeroen Nijhof for the report and Sven Joachim for the fix. (closes: #540234) -- Rob Browning Thu, 03 Sep 2009 21:55:25 -0700 emacs23 (23.1+1-2) unstable; urgency=low * Add dependencies on install-info to primary binary packages and remove install-info from meta package provides. Thanks to Norbert Preining . (See emacs21 bugs #532600, #532599, #532597, and #532602.) * Add libpm-dev and libdbus-1-dev build dependencies. Thanks to Sven Joachim for reporting this and most of the following additional issues. * Fix a spelling error, fix a menu section error, add a version to the GPL file referred to by debian/copyright, and add a number of debian/emacsVER*.lintian-overrides to quiet long-standing warnings. * Fix update-alternatives to reflect the fact that all the binaries have manpages now. Rename manpages from NAME.1FLAVOR to NAME.FLAVOR.1. * Remove obsolete dependencies and conflicts (w3-el, emacs22 packages, etc.). * Remove explicit install-info calls. Rely on triggers now. * Set debian-emacs-flavor to 'emacs23. Somehow that change didn't make it in to the initial package and it was still set to emacs22. * Search /usr/share/info/emacs-23 rather than /usr/share/info/emacs-22. -- Rob Browning Sun, 02 Aug 2009 19:55:15 -0700 emacs23 (23.1+1-1) unstable; urgency=low * New emacs23 packages. * The debian/dfsg-splitter has been updated. * Patches have been removed or adjusted. -- Rob Browning Sat, 18 Jul 2009 18:41:25 -0700 emacs22 (22.3+1-1) unstable; urgency=low * New upstream release. (closes: #512134) -- Rob Browning Sat, 28 Mar 2009 19:18:43 -0700 emacs22 (22.2+2-5) unstable; urgency=low * Add a build dependency on libasound2-dev which emacs22 is already linked against on i386. This change just makes things consistent across all the relevant platforms. Thanks to Sven Joachim for the fix. (closes: #503054) * Set mail-interactive to t if /usr/bin/mail is not an executable and fakemail is chosen. This should still help avoid silent mail loss, but won't signal an error if the mailer is never invoked. Thanks to Ralf Resack for proposing the fix. (closes: #429059) -- Rob Browning Sun, 09 Nov 2008 12:05:33 -0800 emacs22 (22.2+2-4) unstable; urgency=medium * Fix a security problem related to the invocation of python (CVE-2008-3949). Avoid including the current directory in the module lookup path when invoking python from python.el. Thanks to Sven Joachim and Michael Berg . (closes: #499568) * Invoke xmlstarlet from flymake as xmlstarlet rather than xml. Thanks to Jussi Judin . (closes: #447378) * Fix vc-mode's handling of internal temporary buffers. This should avoid failures when trying to open files under monotone version control. Thanks to Sven Joachim and Michael Berg . (closes: #476108) -- Rob Browning Tue, 14 Oct 2008 21:28:47 -0700 emacs22 (22.2+2-3) unstable; urgency=medium * Fix an insecurity related to fast-lock-cache-directories (CVE-2008-2142). Thanks to Sven Joachim and Morten Welinder . (closes: #480885) * Don't remove /usr/local/share/emacs/site-lisp in emacs22-common. Leave that up to emacsen-common. Thanks to Sven Joachim . (closes: #490524) * Don't prematurely raise an error when trying to save a non-ASCII buffer when select-safe-coding-system-accept-default-p is set to a function. Thanks to Jun Inoue . (closes: #488427) * Don't look for GNU to find etc/. Look for NEWS instead. Thanks to "Bernhard Michler" for the report and Sven Joachim for the fix. (closes: #478240) * Fix a problem in WoMan which caused it to raise an error for a number of manpages. Thanks to Sven Joachim . (closes: #476223) -- Rob Browning Wed, 23 Jul 2008 20:56:33 -0700 emacs22 (22.2+2-2) unstable; urgency=medium * Fix debian-expand-file-name-dfsg and describe-gnu-project (C-h C-p). Thanks to Valery V. Vorotyntsev . (closes: #448391, #477215) * Fix an insecurity in vcdiff's temporary file handling (CVE-2008-1694). Thanks to Moritz Muehlenhoff and Steve Grubb. (closes: #476611) -- Rob Browning Sat, 26 Apr 2008 22:02:40 -0700 emacs22 (22.2+2-1) unstable; urgency=low * Move mh-e.texi here from the non-DFSG package because the license does appear to be DFSG compatible. Thanks to Peter S Galbraith . (closes: #433953) * Add Conflicts and Replaces emacs22-common-non-dfsg (<< 22.2+1-2) to debian/control.in to handle move of mh-e. -- Rob Browning Sun, 20 Apr 2008 13:25:33 -0700 emacs22 (22.2+1-1) unstable; urgency=low * New upstream release. (closes: #473021, #474271) * Move dired-x.texi to the non-DFSG package because the license has changed. * Update debian/copyright to reflect recent changes. * Update debian/dfsg-splitter for new upstream release. * Add libgif-dev to debian/control. Thanks to Sven Joachim . (closes: #472419) -- Rob Browning Thu, 10 Apr 2008 18:41:02 -0700 emacs22 (22.1+1-3) unstable; urgency=low * Incorporate a patch to fix a vulnerability in the handling of file local variables (CVE-2007-5795) (closes: #449008). Thanks to Drake Wilson , and also thanks to Romain Francoise for the 22.1+1-2.1 NMU. [rlb] * Support has been added for GNU/kFreeBSD. Thanks to Petr Salinger (closes: #451178) * Incorporate a patch to fix a a stack-based buffer overflow in the format function which can occur when dealing with high precision values. The overflow could lead to arbitrary code execution (CVE-2007-6109). Thanks to Nico Golde for the 22.1+1-2.2 and 22.1+1-2.3 NMUs. The patch fixes both the CVE (#455432) and a bug introduced by an incomplete initial patch (#456235). * Don't override install-info anymore. (closes: #438695) * Fix a problem with auto save file names. Thanks to Sven Joachim . (closes: #469017) * Fix the switch-to-buffer-other-frame function so that it returns the new buffer. This also means that find-file-read-only-other-frame will now correctly mark the new buffer as read only. Thanks to Sven Joachim . (closes: #457539) -- Rob Browning Sun, 02 Mar 2008 14:22:35 -0800 emacs22 (22.1+1-2) unstable; urgency=low * Fix mail locking patch for Debian's non-Linux architectures. Thanks to Michael Banck . (closes: #433816) [rlb] * Fix control file for binary NMUs. Thanks to Lior Kaplan . (closes: #432957) [rlb] * Fix problem with --no-bitmap-icon with upstream patch. Thanks to Sven Joachim . (closes: #433969) [rlb] * Add build dependency versions of quilt that include support for "header". Thanks to Max Dmitrichenko . (closes: #432695) [rlb] * Incorporate upstream fixes to Emacs manpage. Thanks to Sven Joachim . (closes: #432732) [rlb] * Symlink etc/COPYING and lisp/COPYING to /usr/share/common-licenses/GPL-2. Thanks to Milan Zamazal for the report. (closes: #436810) [rlb] -- Rob Browning Tue, 21 Aug 2007 22:29:09 -0700 emacs22 (22.1+1-1) unstable; urgency=low * New upstream release. (closes: #427279) [rlb] * Change build dependency from libpng3-dev to libpng12-dev. (closes: #424622) [rlb] * If allowed, create and remove non-flavor-specific /usr/local/share/emacs/site-lisp. * Fix cc-mode local variable problem. Thanks to Sven Joachim for forwarding the upstream patch. (closes: #428898) [rlb] * Add desktop file for emacs22-gtk. (closes: #424069) [rlb] * Remove /var/games/emacs/ since Emacs doesn't use it unless update-game-score is setuid and Debian's isn't. (closes: #423948, #430533) [rlb] * New release restores python mode. (closes: #430553) [rlb] * Add /usr/share/info/emacs-22 to Info-default-directory-list before /usr/share/info. (closes: #425924, #429526) [rlb] * Change the desktop file to only use the major version in the name, rather than the full upstream version, so that the string won't change from say 22.0.99 to 22.1. -- Rob Browning Fri, 06 Jul 2007 20:20:15 -0700 emacs22 (22.0.99+1-1) experimental; urgency=low * Update to 22.0.99. -- Rob Browning Sat, 12 May 2007 11:01:29 -0700 emacs22 (22.0.95+1-1) experimental; urgency=low * New emacs22 packages. * The debian/dfsg-splitter has been updated. [rlb] * Obsolete patches have been removed. [rlb] -- Rob Browning Sun, 11 Mar 2007 10:14:16 -0700 emacs21 (21.4a+1-5) unstable; urgency=low * Move man pages back to emacs21-common. (closes: #414321) [rlb] - debian/rules -- Rob Browning Sat, 10 Mar 2007 16:16:15 -0800 emacs21 (21.4a+1-4) unstable; urgency=low * Merge useful bits from Jerome and my orphaned emacs22 tree (which itself was based on Jérôme's snapshot tree) in preparation for upcoming emacs22 branch. Many thanks to Jérôme. A partial summary of these changes follows: Add debian/rules info_subdir variable. Modify desktop and menu files version. This approach should work for normal versions, "Emacs 21.4a (X11)", and for snapshots, "Emacs 2006-09-09 (X11)". See the menu_ver variable in debian/rules. Overhaul debian/rules to build all of the install trees at once and then call the dh_* programs generically rather than calling them once per package. [rlb] - emacsVER-bin-common.postinst - emacsVER-bin-common.prerm - emacsVER-common.postinst - emacsVER-common.prerm - emacsVER.desktop - emacsVER.menu - rules -- Rob Browning Sat, 3 Mar 2007 16:13:23 -0800 emacs21 (21.4a+1-3) unstable; urgency=high * Fix build failure on mipsel. Thanks to Aurelien Jarno . (closes: #401665) [Jérôme Marant] - debian/patches/arch-mipsel.diff: set OUTPUT_ARCH to `mips' instead of `mipsel'. * Changed FSF address in copyright file. [Jérôme Marant] - debian/copyright.in - debian/copyright -- Jerome Marant Thu, 04 Jan 2007 08:31:28 +0100 emacs21 (21.4a+1-2) unstable; urgency=low * Make both emacs21 and emacs21-nox packages suggest non-DFSG packages and fix erroneous emacs21-common dependency on it [Jérôme Marant] - debian/control.in - debian/control * Grab yow mode from the CVS trunk so it is now compatible with yow.lines replacement which also comes from the CVS trunk. (closes: #395501) [Jérôme Marant] - debian/patches/yow-mode-from-cvs.diff: new patch. - debian/patches/series: updated. * Properly handle ldapsearch output from OpenLDAP version 2 and above. Thanks to both Joshua Judson Rosen and Henrik Holmboe . (closes: #381484) [Jérôme Marant] - debian/patches/ldapsearch-output.diff: new patch. - debian/patches/series: updated. * Mention license of both emacs.1 and etags.1 manpages and add a copy of the GFDL to the copyright file (closes: #396875) [Jérôme Marant] - debian/copyright.in - debian/copyright: re-generated. * Fix generation of emacs21-common README.Debian. [rlb] -- Rob Browning Sat, 2 Dec 2006 11:45:44 -0800 emacs21 (21.4a+1-1) unstable; urgency=low * In accordance with the recent General Resolution (http://www.debian.org/vote/2006/vote_001), move all non-DFSG files to new packages that will be included in Debian's non-free section. The debian/dfsg-splitter script has been used to split the upstream archive. (closes: #207932) [rlb] - debian/control.in - debian/copyright.in - debian/dfsg-splitter - debian/emacs-common.README - debian/patches/handle-dfsg-split.diff - debian/patches/series - debian/replacement/yow.lines.uu - debian/rules - debian/missing-file.dfsg: new template file used to generate replacements for non-free files normally accessible through C-h key bindings. Those files will be displayed if the original ones are not available. * Acknowledge NMU. Thanks Marc Brockschmidt (Closes: #381452) [Jérôme Marant] * Separate mipsel from mips autodetection in configure.in [Jérôme Marant] - debian/patches/arch-mipsel.diff: update. * Split mips and mipsel ports into two separate patches [Jérôme Marant] - debian/patches/arch-mips.diff: new file. Add mips-specific code from arch-mipsel+mips.diff patch - debian/patches/arch-mipsel.diff: add mipsel-specific code from arch-mipsel+mips.diff patch - debian/patches/arch-mipsel+mips.diff: remove. * Bump Standards-Version to 3.7.2 [Jérôme Marant] - debian/control.in * Add a new dummy `emacs' package which depends on the latest Emacs release (closes: #82687) - debian/control.in: added new entry for `emacs' package. - debian/control: re-generated. - debian/emacs.*: renamed to debian/emacsVER.* - debian/emacs-*.*: renamed to debian/emacsVER-*.* - debian/rules: changed accordingly. * Remove erroneous semicolon character when reading XBM files. Thanks to Jochen Voss . (closes: #392651) [Jérôme Marant] - debian/patches/xbm-read-erroneous-semicolon.diff: new file. - debian/patches/series: updated. * Properly point to README.Debian.gz from Emacs NEWS file. Thanks to Per Bojsen . (closes: #389063) [Jérôme Marant] - debian/patches/misc-unseparated.diff: updated. -- Rob Browning Wed, 25 Oct 2006 00:40:34 -0700 emacs21 (21.4a-6.2) unstable; urgency=low * Non-maintainer brown paper bag release. * Apply patch from 21.4a-6.1 properly, somehow quilt hates me. -- Marc 'HE' Brockschmidt Wed, 27 Sep 2006 08:30:33 +0200 emacs21 (21.4a-6.1) unstable; urgency=low * Non-maintainer upload. * debian/patches/arch-mipsel+mips.diff: Add patch from Max Kellermann (updated by Thiemo Seufer ) to fix segfaults on mips and mipsel. Thanks for the hard work! (Closes: #381452) -- Marc 'HE' Brockschmidt Wed, 27 Sep 2006 00:13:30 +0200 emacs21 (21.4a-6) unstable; urgency=low * When we create an empty aclocal.m4 after patching (to get around quilt's use of patch -E), make the timestamp match the timestamp of configure.in, so that we won't accidentally re-run autoconf given the dependency in Makefile.in. [rlb]. - debian/rules -- Rob Browning Sun, 14 May 2006 15:24:35 -0700 emacs21 (21.4a-5) unstable; urgency=low * Don't include dpatch.make in debian/rules since the package no longer depends on dpatch. Thanks to Romain Francoise . (closes: #367177) [rlb] - debian/rules -- Rob Browning Sun, 14 May 2006 10:18:04 -0700 emacs21 (21.4a-4) unstable; urgency=low * Migrate from dpatch to quilt and update generation of README. [rlb] - debian/README.in - debian/rules - debian/control.in - debian/patches/* * Change occurrence of "find ... -perm +u+x" to "find ... -perm /u+x". The former is no longer handled the way it used to be, and *doesn't* find all files with execute permission. Thanks to François Fleuret for pointing out the initial problem. [rlb] - debian/rules * Replace $(pwd) with $(CURDIR) in debian/rules. - debian/rules * Remove PACKAGE variable. - debian/rules * Arrange DEB_ vars as recommended by /usr/share/doc/autotools-dev/README.Debian.gz and do the same with DEB_HOST_ARCH and DEB_HOST_GNU_CPU. [rlb] - debian/rules * Use DEB_HOST_GNU_TYPE for the value of target rather than DEB_BUILD_GNU_TYPE. [rlb] - debian/rules * Add $(src_name) and $(flavor) and use them. [rlb] - debian/rules * Remove show-upstream-diffs target (use check-diff instead). [rlb] - debian/rules * Rename orig_tgz and orig_tgz_dir variables to deb_orig_tgz and deb_orig_tgz_dir. [rlb] - debian/rules * Lowercase local makefile variable names. [rlb] - debian/rules * Migrate to debhelper (while consulting Jérôme Marant's work on emacs-snapshot). There may still be a bit to do. [rlb] - debian/rules - debian/changelog - debian/compat - debian/control - debian/control.in - debian/emacs-bin-common.postinst - debian/emacs-bin-common.postrm - debian/emacs-bin-common.prerm - debian/emacs-common.README - debian/emacs-common.docs - debian/emacs-common.postinst - debian/emacs-common.prerm - debian/emacs-el.prerm - debian/emacs.README - debian/emacs.menu - debian/emacs.postinst - debian/emacs.postrm - debian/emacs.preinst - debian/emacs.prerm - debian/rules - debian/README.binpkg.in (moved to debian/emacs.README) - debian/README.in (moved to debian/emacs-common.README) - debian/build-binary-pkg (removed - now handled in debian/rules) - debian/menu.in (moved to debian/emacs.menu) * Change nominal_ver computation to match code in configure.in. [rlb] - debian/rules * Add libxaw7-dev dependency to make sure we get that instead of libxaw8-dev. Thanks to Tollef Fog Heen . (closes: #365597) [rlb] - debian/control.in * Apply an upstream patch to fix an mmap related Hurd build problem. Thanks to Michael Banck . (closes: #347554) [rlb] - debian/patches/series - debian/patches/hurd-mmap.diff -- Rob Browning Sat, 13 May 2006 16:24:05 -0700 emacs21 (21.4a-3) unstable; urgency=low * Disable support for the ppc64 architecture: the patch breaks the powerpc support and does not work on ppc64 any more anyway. (closes: #329459) [Jérôme Marant] - debian/patches/00list: disable arch-ppc64 patch. - debian/patches/autofiles.dpatch: regenerated. -- Rob Browning Sun, 2 Oct 2005 19:00:13 -0700 emacs21 (21.4a-2) unstable; urgency=low * Apply patch applying modifiers to multibyte-char keys. Thanks to Martin Stjernholm (closes: #309963) [Jérôme Marant] - debian/patches/multibyte-char-key-modifiers.dpatch: new file. - debian/00list: updated. * Apply patch supporting the ppc64 architecture. This is a slightly modified patch derived from the Emacs CVS mainline. (closes: #300368) [Jérôme Marant] - debian/patches/arch-ppc64.patch: new file. - debian/00list: updated. * Add real dependency as an alternative to the libtiff-dev build dependency in order for the build to be deterministic. (closes: #311074) [Jérôme Marant] - debian/control.in: add libtiff4-dev as alternative libtiff-dev build dependency. - debian/control: regenerated. * Bump Standards-Version to 3.6.2. [Jérôme Marant] - debian/control.in - debian/control: regenerated. * Use the "kitchen sink" bitmap icon when iconifying the Emacs window. (closes: #309930) [Jérôme Marant] - debian/menu.in: pass the `-i' option to the command launching Emacs under X11. - debian/emacs.desktop: likewise. * Work around bug in Xorg which makes AltGr incorrectly recognized. This patch has been backported from Emacs CVS trunk. [Jérôme Marant] - debian/patches/xorg-altgr-fix.dpatch: new file. - debian/00list: updated. * Apply patch preventing an infinite loop in whitespace.el if kill-read-only is set to t. Thanks to Romain Francoise (closes: #273123) [Jérôme Marant] - debian/patches/whitespace-readonly-infloop.dpatch: new file. - debian/00list: updated. -- Rob Browning Sat, 17 Sep 2005 23:39:52 -0700 emacs21 (21.4a-1) unstable; urgency=medium * New upstream release. (closes: #294313) [Jérôme Marant] - debian/patches/movemail-pop-fmt-vulnerability.dpatch: removed since it has been applied upstream. * Apply patch from Romain Francoise making PCL-CVS compliant with recent versions of CVS. (closes: #291221) [Jérôme Marant] - debian/patches/pcl-cvs-format.dpatch: new file. - debian/00list: updated. - debian/control: tightened dependency on dpatch (>= 2.0.9). * Add MIME type to desktop file. (closes: #296618) [Jérôme Marant] - debian/emacs.desktop: added MimeType entry. * Apply patch supporting the AMD64 architecture. This is a slightly modified patch derived from the Emacs CVS mainline. Thanks to Goswin von Brederlow and amd64 porters. (closes: #248796) [Jérôme Marant] - debian/patches/arch-amd64.patch: new file. - debian/00list: updated. * Hard code leim version in copyright.in for now. with 21.4a the emacs tar.gz name changed, but the leim archive name didn't. [rlb] - debian/copyright.in - debian/copyright * Remove prebuild target from debian/rules. Instead, just issue instructions to the user. [rlb] - debian/rules * Fix invocation of wc -l when counting fns-*.el files. [rlb] - debian/rules * Use dpatch for the autotool related diff rather than generating and applying a diff manually. What was the debian/autofiles.diff is now handled via debian/patches/autofiles.dpatch. Also, we no longer try to automatically generate the diff when needed. Instead, the diff must be generated manually via "debian/rules autofiles-sync". The earlier approach was broken because dpatch files that autofiles.diff depended on could end up later in the Debian diff (and hence have newer timestamps). This would cause an unexpected run of aclocal, etc. and break the buildds. If we ever want to re-automate generation of the autofiles diff, we'll need to use dpatch md5 sigs (or similar) rather than timestamps. (closes: #297796) [rlb] - debian/autofiles.diff: removed - debian/patches/00list: added autofiles - debian/patches/autofiles.dpatch: new - debian/rules: updated -- Rob Browning Tue, 15 Mar 2005 11:00:04 -0600 emacs21 (21.3+1-9) unstable; urgency=high * Modify debian/rules to support using an arch source repository and an archive arrangement somewhat similar to, but not compatible with arch-buildpackage's. [rlb] - debian/rules * Applied patch to fix mailspool pop format string vulnerability (CAN-2005-0100). [rlb] Thanks to Max Vozeler . - debian/patches/movemail-pop-fmt-vulnerability.dpatch -- Rob Browning Thu, 3 Feb 2005 21:02:03 -0600 emacs21 (21.3+1-8) unstable; urgency=medium * Apply patch allowing Emacs to properly interpret logo keys as Meta rather than Meta+Super+Hyper. This problem has been showing up since latest XFree86 and Xorg introducted `fake keys'. Thanks to Denis Barbier (closes: #255286, #274103) [Jérôme Marant] - debian/patches/xfree86-4.3-modifiers.dpatch: new file - debian/patches/00list: updated. * Apply patch fixing long-standing memory leak in decode-coding-region and similar routines. Thanks to Florian Weimer . (closes: #273919) [Jérôme Marant] - debian/patches/coding-region-leak.dpatch: new file. - debian/patches/00list: updated. * Apply patch tightening permissions of local backup copies of remote files. Thanks to Michael Albinus . (closes: #274427) [Jérôme Marant] - debian/patches/remote-files-permissions.dpatch: new file. - debian/patches/00list: updated. -- Rob Browning Sat, 16 Oct 2004 11:10:32 -0500 emacs21 (21.3+1-7) unstable; urgency=medium * set recompile against libtiff4-dev and upload with urgency=medium. (closes: #262828) [rlb] - debian/changelog -- Rob Browning Tue, 3 Aug 2004 11:34:43 -0500 emacs21 (21.3+1-6) unstable; urgency=low * fix debian/README rendering problem. [rlb] * Stop provinding www-browser since the w3-el-e21 package provides it now. [Jérôme Marant] - debian/control.in: remove www-browser provides for emacs and emacs-nox. - debian/control: synced. * Fixed installation of .desktop entry. [Jérôme Marant] - debian/build-binary-pkg: fixed typo. * Set value of the auto-save-file-name-transforms variable at run-time in order to override its build-time value. (closes: #160615, #167295, #175346, #241826, #250676, #178792) [Jérôme Marant] - debian/patches/startup-auto-save-file-name-transforms.dpatch: new file. - debian/patches/00list: updated. * Add Python byte-compiled file extensions to completion-ignore-extensions variable. (closes: #177276) [Jérôme Marant] - debian/patches/python-completion-ignored-extensions.dpatch: new file. - debian/patches/00list: updated. * Fixed removal of alternatives (closes: #251822, #206901, #241820, #163034) [Jérôme Marant] - debian/emacs-bin-common.prerm * Add a slave alternative for "editor" manpage. Thanks to Daniel Kraft . (closes: #255639) [Jérôme Marant] - debian/emacs.postinst * Apply a 2003-06-21 patch from upstream CVS to fix a non-interactive signal handling problem that could cause Emacs to die prematurely as the result of a SIGIO or SIGHUP. (closes: #253887) [rlb] - debian/patches/fix-batch-mode-signal-handling.dpatch - debian/patches/00list * Add warning message to prepare-release explaining that you have to run it as a normal user (not root). [rlb] - debian/rules -- Rob Browning Mon, 26 Jul 2004 10:27:10 -0500 emacs21 (21.3+1-5) unstable; urgency=low * Apply patch allowing emacsclient to handle ALTERNATE_EDITOR properly when the command is run without any parameter [Jérôme Marant] (closes: #219658) - debian/patches/emacsclient-alternate-editor.dpatch: new file. * Provide the `editor' virtual package. [Jérôme Marant] (closes: #66243, #90154, #158807) - debian/control.in: emacs and emacs-nox now provide the `editor' virtual package. - debian/control: synchronized with debian/control.in. - debian/emacs.postinst: adding an `editor' alternative with a priority of 0 as discussed in http://lists.debian.org/debian-policy/2000/debian-policy-200006/msg00122.html - debian/emacs.prerm: removing the `editor' alternative on package removal. * Added automatic switching to UTF-8 encoding when editing the debian changelog file. [Jérôme Marant] - debian/changelog: added Emacs local variables forcing coding to UTF-8. * Fix handling of menu entry for text version of Emacs [Jérôme Marant] (closes: #221171) - debian/menu.in: call the text version of emacs with the `-nw' parameter. * Install the emacsclient manpage [Jérôme Marant] (closes: #222767) - debian/build-common-pkg: install missing emacsclient manpage. - debian/emacs-common.postinst: install alternative for emacsclient manpage. * Install .desktop entry in order to make Emacs easy to start in both GNOME and KDE. Thanks to Adam C Powell IV [Jérôme Marant] (closes: #233711) - emacs.desktop: new template file for desktop entries - debian/rules: generate desktop file from emacs.desktop template and install it for emacs21. * test -n "${major_ver}" in a few places so that we don't accidentally generate bad output files from our .in files. [rlb] - debian/rules * truncate aclocal.m4 during autofiles-sync so that old bits won't kill new autoconf run. Also ignore autom4te.cache when generating autofiles.diff. [rlb] - debian/rules * fix bug in prepare-release autodiff prompt handling. [rlb] - debian/rules * update configure.in for newer autoconf versions. [rlb] - autoconf-updates.dpatch * add an emacsXY-bin-common package containing all the architecture specific bits, so that emacsXY-common can be architecture independent. This should save many megabytes * architectures in the debian pool. [rlb] (closes: #232888, #233345) - debian/rules: move some build-* code from debian/ scripts to rules and adjust to build emacsXY-bin-common. - debian/emacs-common.postinst debian/emacs-common.prerm: some code moved to new emacs-bin-common scripts. - debian/emacs-common.postrm: deleted. - debian/emacs-bin-common.postinst: new file. - debian/emacs-bin-common.prerm: new file. - debian/emacs-bin-common.postrm: new file. - debian/build-common-pkg: deleted - code now in debian/rules. - debian/build--pkg: deleted - code now in debian/rules. - debian/emacs-el.postinst: deleted - was empty. - debian/control.in: add emacsXY-bin-common and adjust other entries. - debian/fix-debian-scripts: deleted - no longer used. - debian/build-binary-pkg: adjusted to handle more of the common code. * Add support for linux 2.6 to ACPI in lisp/battery.el. Thanks to Mario Lang [Jérôme Marant] (closes: #228658) - debian/patches/battery-acpi-support.dpatch: updated. * Generate md5sums file for every package [Jérôme Marant] (closes: #22590) - debian/rules: generate md5sums file just before building packages. - debian/build-binary-pkg: likewise. * no point in byte-compiling fns-*.el according to upstream authors (closes: #189277) * fix configure args (--build alone doesn't seem to work anymore). [rlb] - debian/rules * re-enable gif support via libungif. [rlb] - debian/rules * re-enable toolkit scrollbars, but make it really easy for people to disable them in debian/rules. Search for --without-toolkit-scrollbars. [rlb] - debian/rules - debian/README.in * fix problem with upgrades by adding emacs21-common (<< 21.3+1-4) to Replaces for the common packages. [rlb] - debian/control.in - debian/control -- Rob Browning Tue, 6 Apr 2004 18:07:38 -0500 emacs21 (21.3+1-4) unstable; urgency=medium * debian/changelog: converted to UTF-8 as per Policy. [Jérôme Marant] * debian/control.in: - Bumped Standards-Version to 3.6.1. [Jérôme Marant] - Added versioned build-dependency on dpatch >= 1.23 since this version no longer requires numerial prefixes to dpatches. [Jérôme Marant] * debian/patches/*.dpatch: removed numerical prefix since the patch order is specified in debian/patches/00list. [Jérôme Marant] * debian/patches/hurd-libio-glibc.dpatch: new patch allowing Emacs to be built on Hurd systems using a libio-based glibc. Thanks to Markus Brinkmann . (closes: #143220) [Jérôme Marant] * debian/patches/battery-acpi-support.dpatch: new patch adding ACPI support to lisp/battery.el. Thanks to Mario Lang . (closes: #208812) [Jérôme Marant] * debian/patches/scroll-margin.dpatch: new patch preventing emacs to hang with a non-0 scroll-margin set. (closes: #175658) [Jérôme Marant] * debian/patches/save-buffer.dpatch: new patch fixing a bug which makes a file being removed when the coding system of its buffer has changed and saving the changes was canceled. (closes: #194171) [Jérôme Marant] * debian/patches/00list: updated with respect to new patches. [Jérôme Marant] * debian/menu.in: - Added hints to menu entries. (closes: #144282) [Jérôme Marant] - Changed titles for both text and X11 entries in order to differenciate them. (closes: #197527, #188598) [Jérôme Marant] * debian/patches/browse-url.dpatch: - Updated patch fixing a wrong call to galeon. Thanks to Mikael Hedin . (closes: #208206) [Jérôme Marant] - Updated patch fixing browse-url's invocation of Mozilla. Thanks to Jeff Sheinberg , Martin Pool and KATO Kazuyoshi . (closes: #148408, #216067) [Jérôme Marant] * Use -O1 rather than -O2 on m68k. Fixes a build failure (looks like a broken byte compiler) with newer versions of gcc. (closes: #207580) -- Rob Browning Fri, 31 Oct 2003 00:00:10 -0600 emacs21 (21.3+1-3) unstable; urgency=low * create debian/stmap it doesn't exist. (closes: #210802) -- Rob Browning Sat, 13 Sep 2003 14:49:18 -0500 emacs21 (21.3+1-2) unstable; urgency=low * add back accidentally removed dpatch Build-Depends. (closes: #210627) -- Rob Browning Fri, 12 Sep 2003 10:30:21 -0500 emacs21 (21.3+1-1) unstable; urgency=low * repackage without .elc files since we regenerate all of them anyway. This will save space, and will also allow us to use dpatch in a straightforward way. * modify debian/rules computation of version numbers to handle (i.e. ignore) the +1 in 21.3+1. * rework to use dpatch and to patch/unpatch the debian source in-place rather than using a debian/build-src copy of the whole source tree. * incorporated patch (500-detect-coding-iso2022.dpatch) to fix raw-text coding problem. Thanks to Kenichi Handa . (closes: #198736) -- Rob Browning Thu, 11 Sep 2003 23:15:44 -0500 emacs21 (21.3-2) unstable; urgency=low * Compile --without-toolkit-scroll-bars for now (my pref, and to avoid xaw3d issues for the moment). * Update copyright to reflect documentation licenses. (closes: #161500) -- Rob Browning Wed, 13 Aug 2003 08:53:35 -0500 emacs21 (21.3-1) unstable; urgency=low * new upstream version. -- Rob Browning Wed, 23 Apr 2003 13:16:06 -0500 emacs21 (21.2-6) unstable; urgency=low * changed sort behavior for x-vs-no-x fix in cus-dep.el based on suggestion from Matt Kraai . (closes: #166139) * finish breaking up most of the debian/patch/* files. * set up automatic generation for autofiles.diff which contains all the diffs to automatically generated files and is applied after all of the debian/patch/*.diff files. * add an apply-patches-upto command so it's easier to create partially patched trees for editing. -- Rob Browning Thu, 6 Feb 2003 18:12:41 -0600 emacs21 (21.2-5) unstable; urgency=low * fix bug in rules and binary-pkg generation. (closes: #164770) * fix problem with config.sub and config.guess updates. (closes: #164763) * time to stop creating the /usr/doc symlinks... -- Rob Browning Tue, 15 Oct 2002 16:34:52 -0500 emacs21 (21.2-4) unstable; urgency=low * create debian/patches/ and start migrating to represent changes as patches against the upstream source. Don't edit the main tree anymore. * rework tree and packaging to have emacs21-common, emacs21, and emacs21-nox packages with emacs21-common containing nearly all the data. -- Rob Browning Sat, 12 Oct 2002 15:09:37 -0500 emacs21 (21.2-3) unstable; urgency=low * Update emacs21-nox package description. -- Rob Browning Wed, 29 May 2002 14:04:57 -0500 emacs21 (21.2-2) unstable; urgency=low * fix control file priorities to match overrides. * fix rules to handle autotools more correctly. See /usr/share/doc/autotools-dev/README.Debian.gz for details. (closes: #139998) * firewall, headless box, and anti-X users everywhere rejoice! Introducing emacs21-nox package :> -- Rob Browning Tue, 28 May 2002 12:09:48 -0500 emacs21 (21.2-1) unstable; urgency=low * new upstream release. * move outline of Debian specific Emacs changes to /usr/share/doc/*/README.Debian.gz.x -- Rob Browning Fri, 22 Mar 2002 11:41:17 -0600 emacs21 (21.1-9) unstable; urgency=low * fix control.in to use ${Source-Version}. (closes: #138994) -- Rob Browning Mon, 18 Mar 2002 21:54:47 -0600 emacs21 (21.1-8) unstable; urgency=low * Fix .texi problems with upstream patch. (closes: #138236) -- Rob Browning Sun, 17 Mar 2002 11:58:59 -0600 emacs21 (21.1-7) unstable; urgency=high * fix vc-path to be correct for a Debian system. (closes: #120079) * re-add lost hppa and s390 patches. (closes: #107251) -- Rob Browning Thu, 6 Dec 2001 14:10:45 -0600 emacs21 (21.1-6) unstable; urgency=medium * modify order in browse-url.el. * added upstream iso-acc.el patch to fix accent bug. (closes: #119852) * fix ppc nocombreloc bug with upstream patch. (closes: #117557) -- Rob Browning Tue, 4 Dec 2001 08:43:38 -0600 emacs21 (21.1-5) unstable; urgency=low * Run autoconf to remove stale ppc code. (closes: #119189) * Write new browse-url.el code with support for galeon and to default to searching for a suitable browser, free browsers first. (closes: #116822) -- Rob Browning Tue, 13 Nov 2001 09:51:31 -0600 emacs21 (21.1-4) unstable; urgency=low * Really fix alternatives problem this time. -- Rob Browning Fri, 9 Nov 2001 10:24:49 -0600 emacs21 (21.1-3) unstable; urgency=low * Fix but in grep in postinst. (closes: #117251, #117256, #117415, #118792) * Remove vestigal ppc bits and add upstream patch for ppc nocombreloc problem. (closes: #117557) * fix bug in upstream-files.tar handling. * don't configure gif support until our libungif is new enough. See bug #117729. * Fix manpage to list correct default window size. (closes: #118641) -- Rob Browning Thu, 8 Nov 2001 21:15:20 -0600 emacs21 (21.1-2) unstable; urgency=low * change to priority optional. * use xaw3d scrollbars after checking upstream preferences. (closes: #116831, #116911, #116638) * added some build-depends. (closes: #116981) * fixed typo in NEWS. (closes: #116814) * fixed alternatives bug in postinst/prerm for emacsclient (closes: #116915) -- Rob Browning Thu, 25 Oct 2001 16:02:45 -0500 emacs21 (21.1-1) unstable; urgency=low * New emacs21 packages. Many changes -- reviewed all Debian files. -- Rob Browning Thu, 18 Oct 2001 17:28:03 -0500 emacs20 (20.7-10) unstable; urgency=medium * Add arch header for mipsel and fix configure.in and configure. (closes: #103959) -- Rob Browning Mon, 23 Jul 2001 09:23:06 -0500 emacs20 (20.7-9) unstable; urgency=low * Added more Build-Depends. (closes: #101832) * Disable ralloc on Hurd. Thanks to Robert Bihlmeyer . (closes: #101926) -- Rob Browning Tue, 10 Jul 2001 12:48:22 -0500 emacs20 (20.7-8) unstable; urgency=low * Added ia64 patches from Bdale Garbee for ia64.h. (closes: #90518) * Added Build-Depends on mailx for now (though this is *wrong* for the long run -- I need to fix my fakemail handling). (closes: #95903, #96761) * Fix fakeroot sgid problem (move movemail chmod +s in debian/rules). * Remove emacs' overzealous dir.gz file. * Shrink gnu.xpm to 32x32 and make it the menu icon. (closes: #20253, #21310) * Update manpage to not refer to kitchen sink anymore -- though with emacs21, we're going to move back to using whatever they choose. (closes: #81682) -- Rob Browning Wed, 13 Jun 2001 23:56:16 -0500 emacs20 (20.7-7) unstable; urgency=low * Fixed reftex-info problem. (closes: #44837). * Fix install-strip target in Makefile.in. Thanks to Kalle Olavi Niemitalo . (closes: #51348) -- Rob Browning Sat, 5 May 2001 23:50:50 -0500 emacs20 (20.7-6) unstable; urgency=low * Fix improper usage of dpkg-statoverride and make sure movemail is set up right. (closes: #95953) * Fix bad manpage location in postinst update-alternatives call. * Fix bad .so in ctags manpage (closes: #88231, #45317, #65017, #74570) -- Rob Browning Sat, 5 May 2001 09:47:40 -0500 emacs20 (20.7-5) unstable; urgency=low * configure.in: add detection of CONF_MAIL_PROGRAM_NAME. * lib-src/fakemail.c: use CONF_MAIL_PROGRAM_NAME when appropriate (closes: #72103) -- need to forward upstream. * Add "modified by Debian" clause to (emacs-version) at RMS's request. * Start Debian modifications section in copyright file as per policy. * Add build fixes for hurd (closes: #78461). Changes suggested by Marcus.Brinkmann@ruhr-uni-bochum.de. Thanks. * Switch from Debian sendmail.el hack to Francesco's suggestion of setting mail-from-style to 'system-default by default at startup (closes: #35128). This allows the user to override when desired in the normal way. This should be discussed with the upstream maintainers. They may be amenable to making this the default on Debian systems. * add dependency on dpkg (>= 1.9.0) for new install-info. * info pages should finally work right (or at least closer to right). They're now installed in /usr/share/info/emacs-20/ under their normal names, and install-info can add the appropriate (emacs-20/emacs), etc. entries to /usr/share/info/dir. This hopefully closes a bunch of old bugs. (closes: #64994, #64512, #64025, #62155, #59332, #51163, #40443) * No more files in /usr/doc. (closes: #91454, #63768) * /usr/man moved to /usr/share/man. (closes: #91149) * This should be fixed, in addition we've switched to dpkg-statoverride (closes: #73007) * /usr/share/info/dir.gz should be gone. (closes: #75594, #68551, #65012) -- Rob Browning Sun, 29 Apr 2001 22:03:33 -0500 emacs20 (20.7-4) unstable frozen; urgency=low * Upload to unstable *and* frozen since this fixes outstanding grave bugs. -- Rob Browning Thu, 27 Jul 2000 16:21:15 -0500 emacs20 (20.7-3) unstable; urgency=low * Change code to rebuild *all* the install tree .elc files at build time. This should fix the grave problems with gnus trashing mail at the expense of more CPU at build time. -- Rob Browning Wed, 19 Jul 2000 20:27:27 -0500 emacs20 (20.7-2) frozen unstable; urgency=low * Revert to setting debian-emacs-flavor in startup.el as per recent flip-flop in debian-emacs-policy :< This was a *tiny* source change, and definitely has to go into frozen - too much breaks otherwise. -- Rob Browning Tue, 20 Jun 2000 11:31:29 -0500 emacs20 (20.7-1) frozen unstable; urgency=low * New upstream bug-fix version. Fixes security bugs, among others. * Removed some now redundant Debian patches. -- Rob Browning Sat, 17 Jun 2000 12:59:48 -0500 emacs20 (20.6-3) unstable frozen; urgency=medium * Temp fix for alpha corruption problem in cm/src.h src/termcap.c, src/terminfo.c, and src/sysdep.c (forwarded bug 63993). -- Rob Browning Mon, 12 Jun 2000 18:55:22 -0500 emacs20 (20.6-2) frozen unstable; urgency=low * Make sure info files get registered after /usr/share migration. -- Rob Browning Fri, 12 May 2000 15:30:02 -0500 emacs20 (20.6-1) frozen unstable; urgency=low * Let emacsen-common handle setting debian-emacs-flavor and modify "Depends:" accordingly. * Maintainer release of 20.6 - fixes same issues as 20.6-0.1, so it should go into frozen. * Move info files to /usr/share/info. * Make sure .elc files for .el files we've modified are *always* rebuilt. * Add new unexelf.c from Gerd Moellmann . Without this, emacs20 will *not* build on either frozen or unstable x86 machines. -- Rob Browning Fri, 12 May 2000 11:00:33 -0500 emacs20 (20.6-0.1) frozen unstable; urgency=low * Non-maintainer release. * New upstream bug fix release (closes:#60931). * ARM support merged upstream. * Add security patches from RUS-CERT posting on BugTraq. * postinst: Use 2775 as directory permissions in /usr/local (closes:#59919) -- Joel Klecker Wed, 26 Apr 2000 11:26:28 -0700 emacs20 (20.5a-2) unstable; urgency=low * Check in a bogus modification to all the .el files that we modified before 20.5a so that new .elc files with our changes will be generated when we build. This must be done every time an upstream change is merged in. -- Rob Browning Tue, 28 Dec 1999 19:51:14 -0600 emacs20 (20.5a-1) unstable; urgency=high * Upstream version number is just fine (20.5a *is* newer than 20.5). Switch to use it. -- Rob Browning Wed, 22 Dec 1999 11:12:44 -0600 emacs20 (20.4.pre20.5a-1) unstable; urgency=high * New upstream version, including some Y2K fixes. * Use weird version to avoid epochs. This is upstream 20.5a. -- Rob Browning Wed, 22 Dec 1999 00:16:52 -0600 emacs20 (20.4-3) unstable; urgency=low * Fix mistake in this file. Fix bug number in architecture dependency "closes" in last revision. * Powerpc configure.in patch from Susumu OSAWA . (Should close bug 48997, but marked forwarded instead until patch is resolved upstream.) * Jargon problems apparently fixed. (closes: #31103 #37030) * Gnus printing problems apparently fixed (closes: #20760) * Fix manpage to refer to more accurate Debian file locations. (closes: #35267) * cperl-mode problem apparently fixed. (closes: #46739) * Fix build stripping problem (use INSTALL_STRIP=-s rather than INSTALL_PROGRAM="install -s"). -- Rob Browning Sat, 4 Dec 1999 19:24:07 -0600 emacs20 (20.4-2) unstable; urgency=low * Modify mail-spool-directory/movemail patch in preparation for upstream inclusion. * Fix architecture dependency. (closes: #48997) -- Rob Browning Fri, 12 Nov 1999 17:59:01 -0600 emacs20 (20.4-1) unstable; urgency=low * New upstream version. * I decided to go ahead and get this out without the major overhaul that's coming, but I'm going to be working more tightly the core upstream developers from now on, so there will be some more substantial changes soon, including getting rid of more Debianisms and double checking all our current patches. * Fix movemail liblockfile detection to be non-Debian specific (currently working out the appropriate upstream patch (see etc/NEWS)). * Fix emacs to support a --with-mail-spool-directory configure option and to automagically detect the right answer most of the time without it (currently working out the appropriate upstream patch (see etc/NEWS)). * Add the lisp-level variable mail-spool-directory which always contains the location of the mail spool, and hack movemail, nnmail, rmail, and friends to use it (currently working out the appropriate upstream patch (see etc/NEWS)) . * hexl-mode bug fixed upstream. (closes: #21762) -- Rob Browning Sat, 30 Oct 1999 13:24:39 -0500 emacs20 (20.3-11) unstable; urgency=low * Fix liblockfile version skew. (closes: #43803 #45123) -- Rob Browning Thu, 23 Sep 1999 13:27:00 -0500 emacs20 (20.3-10) unstable; urgency=low * Restructure debian/rules to build -el in binary-indep (closes: #26761) * Add emacsclient.1 manpage submitted ages ago. (closes: #22463) * Handle duplicate DOC files (closes: #27668) * Switch to gnu icon from old B&W drippy sink (closes: #33260) -- Rob Browning Tue, 6 Jul 1999 23:21:44 -0500 emacs20 (20.3-9) unstable; urgency=low * Added HURD patch from Marcus Brinkmann . (closes: #38571). * Backed out (global-set-key [delete] 'delete-char) modification (Ref: #26366). This is too controversial (think cross-platform) and needs to be resolved by the Debian Keyboard Czar in concert with others. For now we revert to the upstream behavior... * Add /usr/share/info to info search path (closes: #38285). -- Rob Browning Fri, 11 Jun 1999 00:43:51 -0500 emacs20 (20.3-8) unstable; urgency=low * Added patch to emacs.c from Wolfram Gloger to fix exit segfaults. (closes: #37745) * Fixed suidregister inconsistency between postinst and postrm (closes #36845) -- Rob Browning Sun, 30 May 1999 14:38:51 -0500 emacs20 (20.3-7) unstable frozen; urgency=low * Needed to go to frozen too: --print-architecture was an important bug. Should be OK since other fixes since -5 are minor and important. * Add conflict with w3-el (as per Ben Pfaff's request). (closes: #30413). * Undo broken (and unneeded) "fix" for suidregister call in postrm. -- Rob Browning Thu, 28 Jan 1999 14:49:27 -0600 emacs20 (20.3-6) unstable; urgency=low * Use --print-installation-architecture rather than --print-architecture (closes: #28177). * Remove "#undef SIGIO" from m/arm.h as indicated by David Welton (closes: #31279). * Fix call to suidunregister (I didn't realize that it can't take multiple file arguments) (closes: #21243 #26886). -- Rob Browning Wed, 27 Jan 1999 11:50:14 -0600 emacs20 (20.3-5) frozen unstable; urgency=low * Added NetWinder patches (closes: #28277). (Thanks to David Welton) * Rebuilt emacs20-el so the versions coincide. In the future, people need to be sure to build *both* binary packages when doing a non-maintainer binary release. (This fix justifies inclusion into frozen). -- Rob Browning Sun, 1 Nov 1998 20:14:36 -0600 emacs20 (20.3-4) unstable; urgency=low * Fix gnus to default to /var/spool/mail rather than /usr/spool/mail for mailbox locations (closes: #21364). -- Rob Browning Sat, 17 Oct 1998 14:28:45 -0500 emacs20 (20.3-3) unstable; urgency=low * Fixed leim. All the input methods should work now (closes: #27398). * Made (global-set-key [delete] 'delete-char) the default (closes: #26366). * Fix ownership on emacs20-el files (closes: #27398). -- Rob Browning Tue, 13 Oct 1998 16:57:51 -0500 emacs20 (20.3-2) unstable; urgency=low * Added 20.2 patches for powerpc. I omitted the patches to the following files because it looks like equivalent fixes have already made it into 20.3. If anyone who understands that code better knows differently, please let me know. The rest of the patches applied cleanly. src/callproc.c.rej src/dired.c.rej src/fileio.c.rej src/process.c.rej src/regex.c.rej I also modified src/m/powerpc.h to fix problems calling the ldscript. -- Rob Browning Mon, 7 Sep 1998 18:20:41 -0500 emacs20 (20.3-1) unstable; urgency=low * New upstream version. * Modify all the debian/* stuff to automatically track version changes. * Major changes to info page handling. Emacs20 info is now integrated into the main info page. This was the best way I could think of to handle cross references, etc. without major source changes. * Locked emacs20-el and emacs20 package versions together with dependencies. * Add info direntries for widget, info, and customize. * Fix handling of /usr/local/share (which was badly broken). * Turn stripping back on. It appears to work. -- Rob Browning Tue, 1 Sep 1998 11:44:04 -0500 emacs20 (20.2-9) unstable; urgency=low * Fixes for leim problems (closes: #25536). Thanks to Junio Hamano * update-elc now made executable (closes: #25899). Thanks to Junio Hamano * Fix problem with package including dirs in /usr/local/share (closes: #23431). -- Rob Browning Sat, 22 Aug 1998 11:45:16 -0500 emacs20 (20.2-8) unstable; urgency=low * Regenerate .elc files for .el files we've modified. I didn't realize that some of the .elc files were in the upstream tar file. Hope this doesn't break anything. We haven't been using our sendmail and message modifications until now. (closes: #21079). * Fix i386ism in debian scripts use "dpkg --print-architecture" instead. (closes: #20548). * Fixed reference in README.add-on-package-maintainers (closes: #23445) * Fix some alpha problems (closes: #21834). * Had to add Replaces: emacs20 to emacs20-el to fix problem with copyright files being in the wrong package (closes: #21531). -- Rob Browning Fri, 7 Aug 1998 20:39:59 -0500 emacs20 (20.2-7) frozen unstable; urgency=low * Changed emacs20-el from standard to optional. * Fixed broken postrm (release critical) (closes: #24236) * Don't strip emacs binary (strip is broken see binutils #23153). * Since we can't strip, don't compile or link with "-g". -- Rob Browning Thu, 16 Jul 1998 16:58:04 -0500 emacs20 (20.2-6) frozen unstable; urgency=low * Gack. Fix reject due to changed .tar.gz file (./leim added to tar). -- Rob Browning Wed, 8 Apr 1998 14:04:54 -0500 emacs20 (20.2-5) frozen unstable; urgency=low * Make sure to preserve timestamps on .el files in emacs20-el (closes: #20274) * Add leim support for alternate input methods. May close several bugs. -- Rob Browning Sun, 5 Apr 1998 10:38:20 -0500 emacs20 (20.2-4) frozen unstable; urgency=low * Added copright file to emacs20-el package (closes: #19300) * suidmanager doesn't understand symbolic perms (closes: #18448, #19213) -- Rob Browning Fri, 13 Mar 1998 13:01:07 -0600 emacs20 (20.2-3) unstable; urgency=low * Fixed problem with permissions on /usr/share/emacs/20.2/site-lisp/ (closes: #18717) -- Rob Browning Mon, 2 Mar 1998 12:02:33 -0600 emacs20 (20.2-2) unstable; urgency=low * fixed bad menu line (closes: #18362). -- Rob Browning Thu, 19 Feb 1998 10:52:58 -0600 emacs20 (20.2-2) unstable; urgency=low * Explicit dependency on liblockfile0 until bug is fixed (closes #18186) * added lisp/site-lisp.el to fix info path problem (closes #18190) -- Rob Browning Sat, 14 Feb 1998 19:19:09 -0600 emacs20 (20.2-1) unstable; urgency=low * movemail no longer suid -- not needed. * start from scratch with emacs-20.2 source and old emacs-19.34 and xemacs patches. -- Rob Browning Tue, 16 Dec 1997 01:20:27 -0600 Local Variables: coding: utf-8 End: debian/control.in0000644000000000000000000000677312164175106011216 0ustar Source: @DEB_FLAVOR@ Section: editors Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff5-dev | libtiff-dev, xaw3dg-dev, libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ Standards-Version: 3.7.2 Package: @DEB_FLAVOR@-lucid Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk Description: The GNU Emacs editor GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a Lucid user interface. Package: @DEB_FLAVOR@-nox Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk 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: @DEB_FLAVOR@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk Description: The GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a GTK+ user interface. Package: @DEB_FLAVOR@-bin-common Architecture: any Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} 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 @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox. Package: @DEB_FLAVOR@-common Architecture: all Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, @DEB_FLAVOR@-common-non-dfsg, ${shlibs:Depends}, ${misc:Depends} Suggests: @DEB_FLAVOR@-el Conflicts: @DEB_FLAVOR@-el (<< ${source:Version}), cedet, eieio, speedbar Description: The GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox. Package: @DEB_FLAVOR@-el Architecture: all Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${misc:Depends} Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, saving space in the main package for small systems. debian/emacsVER.postinst0000644000000000000000000000303512164175107012445 0ustar #!/bin/sh set -e FLAVOR=@DEB_FLAVOR@ update-alternatives \ --install /usr/bin/emacs emacs \ /usr/bin/${FLAVOR}-@X_SUPPORT@ @BIN_PRIORITY@ \ --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \ /usr/share/man/man1/emacs.${FLAVOR}.1.gz \ --slave /usr/share/icons/hicolor/scalable/apps/emacs.svg emacs.svg \ /usr/share/icons/hicolor/scalable/apps/${FLAVOR}.svg \ --slave /usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg \ emacs-document.svg \ /usr/share/icons/hicolor/scalable/mimetypes/${FLAVOR}-document.svg \ --slave /usr/share/icons/hicolor/16x16/apps/emacs.png emacs-16x16.png \ /usr/share/icons/hicolor/16x16/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/24x24/apps/emacs.png emacs-24x24.png \ /usr/share/icons/hicolor/24x24/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/32x32/apps/emacs.png emacs-32x32.png \ /usr/share/icons/hicolor/32x32/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/48x48/apps/emacs.png emacs-48x48.png \ /usr/share/icons/hicolor/48x48/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/128x128/apps/emacs.png emacs-128x128.png \ /usr/share/icons/hicolor/128x128/apps/${FLAVOR}.png update-alternatives \ --install /usr/bin/editor editor \ /usr/bin/${FLAVOR} 0 \ --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ /usr/share/man/man1/emacs.${FLAVOR}.1.gz # emacsen-common registration. /usr/lib/emacsen-common/emacs-install ${FLAVOR} #DEBHELPER# debian/emacsVER.lintian-overrides0000644000000000000000000000034612164175106014221 0ustar @PKG_NAME@ binary: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm @PKG_NAME@ binary: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm debian/.git-dpm0000644000000000000000000000043012164175107010531 0ustar # see git-dpm(1) from git-dpm package e53a987370a1ea362b4247d4a621257c28f35f52 e53a987370a1ea362b4247d4a621257c28f35f52 4edc7f7569f39278c30a9a64da6e0b313bbed458 4edc7f7569f39278c30a9a64da6e0b313bbed458 emacs23_23.4+1.orig.tar.bz2 155466351ad8e2e10af8a1f7f23af0a801cf7db2 23111569 debian/autofiles-diff-header0000644000000000000000000000016212164175106013242 0ustar * The autoconf related files have been updated. Patch: autofiles.dpatch Author: N/A (automatically generated) debian/emacsVER-common.lintian-overrides0000644000000000000000000000013612164175106015504 0ustar @PKG_NAME@ binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs debian/emacsVER.menu0000644000000000000000000000127312164175107011530 0ustar ?package(@PKG_NAME@):\ needs="X11"\ section="Applications/Editors"\ title="Emacs @MENU_VERSION@ (X11)"\ command="/usr/bin/@DEB_FLAVOR@"\ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\ icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm"\ hints="Text" ?package(@PKG_NAME@):\ needs="text"\ section="Applications/Editors"\ title="Emacs @MENU_VERSION@ (text)"\ command="/usr/bin/@DEB_FLAVOR@ -nw"\ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\ icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm"\ hints="Text" debian/emacsVER.prerm0000644000000000000000000000060012164175107011702 0ustar #!/bin/sh set -e MAJOR=@MAJOR_VERSION@ FLAVOR=@DEB_FLAVOR@ # update-alternatives on things that collide with xemacs, other editors if [ "$1" != "upgrade" ] then update-alternatives --remove emacs /usr/bin/${FLAVOR}-@X_SUPPORT@ update-alternatives --remove editor /usr/bin/${FLAVOR} fi # emacsen-common registration. /usr/lib/emacsen-common/emacs-remove ${FLAVOR} #DEBHELPER# debian/README.add-on-package-maintainers0000644000000000000000000000021112164175107015106 0ustar Please see /usr/share/doc/emacsen-common/debian-emacs-policy.gz for information on how to properly structure your emacs add-on packages.