emacs24 (24.5+1-6ubuntu1) xenial; urgency=medium

  * Merge with Debian; remaining changes:
    - debian/rules: Make sure the emacs24-el directory exists.
    - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs24" to
      please bamf and gnome-shell.
    - debian/emacsVER.desktop: Also set StartupWMClass for bamf and
      gnome-shell.
    - debian/control.in: Have emacs24-common Depends on
      emacs24-common-non-dfsg, now that it is out of multiverse.
      Update debian/copyright to match.
    - Add -no-pie on s390x.

 -- Matthias Klose <doko@ubuntu.com>  Sun, 17 Apr 2016 15:20:46 +0200

emacs24 (24.5+1-6) unstable; urgency=medium

  * Fix a ppc64el, bss-related build problem.
    Builds on ppc64el were failing like this:
      emacs: Program segment above .bss in
      /«BUILDDIR»/emacs24-24.5+1/debian/build-x/src/temacs
    Add these upstream patches to fix the problem:
      0010-ELF-unexec-Correct-section-header-index.patch
      0011-ELF-unexec-Tidy-code.patch
      0012-ELF-unexec-Merge-Alpha-and-MIPS-COFF-debug-handling.patch
      0013-ELF-unexec-Symbol-table-patching.patch
      0014-ELF-unexec-_OBJC_-symbols-in-bss-sections.patch
      0015-ELF-unexec-R_-_NONE-relocs.patch
      0016-ELF-unexec-Drive-from-PT_LOAD-header-rather-than-sec.patch
      0017-ELF-unexec-Don-t-insert-a-new-section.patch
      0018-src-unexelf.c-NEW_PROGRAM_H-Remove-unused-macro-Bug-.patch
      0019-ELF-unexec-align-section-header.patch
    Thanks to Paul Eggert <eggert@cs.ucla.edu> for help locating the set
    of patches, and Esa Peuha <esa.peuha@gmail.com> for reporting the
    problem. (Closes: 808347)

 -- Rob Browning <rlb@defaultvalue.org>  Mon, 18 Jan 2016 17:58:10 -0600

emacs24 (24.5+1-5) unstable; urgency=medium

  * Only test timestamp preservation for $(flavor)-el.  Only check
    el.gz timestamp preservation when $(flavor)-el is one of the
    packages being built (so the canary file will actually be there),
    but go ahead and fix up the timestamps across all packages.
    Thanks to David Matthew Mattli <dmm@mattli.us> for reporting the
    problem. (Closes: 805904)

 -- Rob Browning <rlb@defaultvalue.org>  Fri, 27 Nov 2015 14:28:00 -0600

emacs24 (24.5+1-4) unstable; urgency=medium

  * Ensure elc timestamps are newer than el files.  Since
    strip-nodeterminism changes the *.el.gz file timestamps, restore
    the timestamps after it runs.  Otherwise, Emacs will think that
    corresponding .elc files are stale.  Thanks to Yuri D'Elia
    <wavexx@thregr.org> for reporting the problem.  (Closes: 803060)

 -- Rob Browning <rlb@defaultvalue.org>  Sat, 07 Nov 2015 13:20:43 -0600

emacs24 (24.5+1-3) unstable; urgency=medium

  * Split desktop file into term and non-term versions.  Thanks to
    Norbert Preining <preining@logic.at> for reporting the
    problem. (Closes: 799935)

  * Add upstream StartupWMClass/Keywords to *.desktop.  Copy them from
    the upstream etc/emacs.desktop.

  * Suggest ncurses-term, needed by term mode.  Thanks to Jorge Morais
    for reporting the problem and era+debian@iki.fi for forwarding it
    to Debian. (Closes: 790402)

  * Remove redundant libtiff-dev dependency.

  * emacs-common: recommend emacs-el.  Without it, important bits of
    Emacs don't work (i.e. C-h f, etc.), and it's not likely to be a
    significant burden these days.

 -- Rob Browning <rlb@defaultvalue.org>  Sat, 24 Oct 2015 14:38:04 -0500

emacs24 (24.5+1-2) unstable; urgency=medium

  [ Martin Račák ]
  * emacsVER.desktop: don't use absolute path to icon. (Closes: 778884)

  [ Rob Browning ]
  * Remove .menu file as per TC resolution of #741573.
  * Update .desktop file and add terminal flavor.

  [ David Bremner ]
  * Explicity specify QUILT_PATCHES_PREFIX in rules.  The current use
    relies on the names of patches being prefixed with debian/patches,
    which doesn't seem to be completely reliable (e.g. it doesn't
    happen in a wheezy build environment).  The environment variable
    QUILT_PATCHES_PREFIX is documented to do this. (Closes: 775068)

  [ Rob Browning ]
  * Don't assume grep supports GREP_OPTIONS.
    Add 0008-Emacs-won-t-assume-grep-supports-GREP_OPTIONS.patch to
    incorporate the relevant upstream patch.  Thanks to Bob Proulx
    <bob@proulx.com> for reporting the problem, and Ben Finney
    <ben+debian@benfinney.id.au> for tracking down the fix. (Closes: 793741)
  * Don't hang during large yanks.
    Add 0009-Emacs-should-no-longer-hang-during-large-yanks.patch to
    incorporate the relevant upstream patch.  Thanks to Mike Crowe
    <mac@mcrowe.com> for reporting the problem and tracking down the
    fix. (Closes: 795909)

 -- Rob Browning <rlb@defaultvalue.org>  Sat, 19 Sep 2015 14:49:07 -0500

emacs24 (24.5+1-1ubuntu7) xenial; urgency=medium

  * Cherry-pick change from 24.5+1-2:
    + emacsVER.desktop: don't use absolute path to icon. (Closes: 778884)

 -- Iain Lane <iain@orangesquash.org.uk>  Fri, 04 Mar 2016 15:56:45 +0000

emacs24 (24.5+1-1ubuntu6) xenial; urgency=medium

  * No-change rebuild for gnutls transition.

 -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Feb 2016 22:24:39 +0000

emacs24 (24.5+1-1ubuntu5) xenial; urgency=high

  * Add -no-pie on s390x.

 -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 04 Jan 2016 13:04:01 +0000

emacs24 (24.5+1-1ubuntu4) xenial; urgency=medium

  * Fix build failure on ppc64el.

 -- Matthias Klose <doko@ubuntu.com>  Thu, 29 Oct 2015 14:53:15 +0100

# For older changelog entries, run 'apt-get changelog emacs24-bin-common'