lisp/site-init.el | 11 11 + 0 - 0 !
1 file changed, 11 insertions(+)

 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/startup.el | 21 19 + 2 - 0 !
1 file changed, 19 insertions(+), 2 deletions(-)

 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.

Makefile.in | 30 2 + 28 - 0 !
configure.in | 4 2 + 2 - 0 !
doc/misc/Makefile.in | 490 3 + 487 - 0 !
lisp/help.el | 10 9 + 1 - 0 !
4 files changed, 16 insertions(+), 518 deletions(-)

 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.

etc/NEWS | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 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.

lib-src/movemail.c | 4 4 + 0 - 0 !
src/s/bsd-common.h | 4 4 + 0 - 0 !
2 files changed, 8 insertions(+)

 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

lib-src/fakemail.c | 6 4 + 2 - 0 !
lisp/gnus/message.el | 8 7 + 1 - 0 !
lisp/mail/feedmail.el | 7 6 + 1 - 0 !
lisp/mail/sendmail.el | 7 6 + 1 - 0 !
4 files changed, 23 insertions(+), 5 deletions(-)

 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

lisp/version.el | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 modify the output of (version) to indicate debian modifications.

The output of (version) has been modified to indicate Debian modifications.

src/callproc.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 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 <svenjoac@gmx.de>
Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
Date: Mon, 28 Apr 2008 11:20:23 +0200
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific

lisp/progmodes/flymake.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 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 <jjudin+debian@iki.fi>
Date: Sat, 20 Oct 2007 14:42:02 UTC
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific
Bug: 447378

src/s/gnu-kfreebsd.h | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 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 <rlb@defaultvalue.org>
Provided-By: Petr Salinger <Petr.Salinger@seznam.cz>
Bug: 559392
Status: new

configure.in | 8 4 + 4 - 0 !
src/m/macppc.h | 4 2 + 2 - 0 !
2 files changed, 6 insertions(+), 6 deletions(-)

 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 <yama1066@gmail.com>
Date: Wed, 26 Oct 2011 01:39:35 +0900
Applied-by: Rob Browning <rlb@defaultvalue.org>
Bug-Debian: http://bugs.debian.org/646609

src/s/gnu.h | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 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.

lib-src/movemail.c | 34 16 + 18 - 0 !
1 file changed, 16 insertions(+), 18 deletions(-)

 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 <jmm@debian.org>

src/ChangeLog | 13 13 + 0 - 0 !
src/xterm.c | 45 33 + 12 - 0 !
src/xterm.h | 3 2 + 1 - 0 !
3 files changed, 48 insertions(+), 13 deletions(-)

 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 <rlb@defaultvalue.org>

src/ChangeLog | 4 4 + 0 - 0 !
src/coding.c | 6 3 + 3 - 0 !
2 files changed, 7 insertions(+), 3 deletions(-)

 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 <rlb@defaultvalue.org>

leim/ChangeLog | 4 4 + 0 - 0 !
leim/quail/indian.el | 2 1 + 1 - 0 !
2 files changed, 5 insertions(+), 1 deletion(-)

 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 <rlb@defaultvalue.org>

src/xgselect.c | 13 9 + 4 - 0 !
1 file changed, 9 insertions(+), 4 deletions(-)

 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).

lisp/ChangeLog | 6 6 + 0 - 0 !
lisp/files.el | 15 10 + 5 - 0 !
2 files changed, 16 insertions(+), 5 deletions(-)

 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