emacs22 (22.1-0ubuntu5.2) gutsy-security; urgency=low

  * SECURITY UPDATE: buffer overflow in format function
  * debian/patches/fix-format-overflow.diff: fix src/editfns.c to account
    for precision in integer formatting (LP: #174177)
  * SECURITY UPDATE: temporary file race condition in vcdiff
  * debian/patches/vcdiff-tmp-race.diff: update lib-src/vcdiff to use
    mktemp
  * References
    CVE-2007-6109
    CVE-2008-1694

 -- Jamie Strandboge <jamie@ubuntu.com>  Thu, 01 May 2008 10:58:07 -0400

emacs22 (22.1-0ubuntu5.1) gutsy-security; urgency=low

  * SECURITY UPDATE: unsafe variables loadable from opened files.
  * Add debian/patches/fix-local-vars-security.diff: fix behavior, thanks
    to Michael Olson.
  * References
    CVE-2007-5795

 -- Kees Cook <kees@ubuntu.com>  Sat, 03 Nov 2007 18:14:10 -0700

emacs22 (22.1-0ubuntu5) gutsy; urgency=low

  * Trigger rebuild for hppa

 -- LaMont Jones <lamont@ubuntu.com>  Thu, 04 Oct 2007 19:36:25 +0000

emacs22 (22.1-0ubuntu4) gutsy; urgency=low

  [ Michael Olson ]
  * debian/control(.in): Add emacs22 as a Depends option for the emacs
    metapackage

  [ Reinhard Tartler ]
  * Don't install postinst in emacs metapackage, Fixes LP: #128978

 -- Reinhard Tartler <siretart@tauware.de>  Sun, 29 Jul 2007 10:40:00 +0200

emacs22 (22.1-0ubuntu3) gutsy; urgency=low

  [ Michael Olson ]
  * debian/control(.in): Build-Depend on quilt >= 0.42, because earlier
    versions do not have the "header" command.
  * debian/patches:
    - fix-emacs-manpage.diff: New patch that includes the current version
      of etc/emacs.1 from upstream.  This fixes several typographical
      errors, and documents the -Q option.
    - debian-emacs-manpage.diff: Rebase against fix-emacs-manpage.diff.

  [ Reinhard Tartler ]
  * debian/control(.in): add "emacs" metapackage, prefer emacs-gtk over
    emacs-nox

 -- Reinhard Tartler <siretart@tauware.de>  Sat, 28 Jul 2007 11:29:55 +0200

emacs22 (22.1-0ubuntu2) gutsy; urgency=low

  [ Michael Olson ]
  * Review patches from Debian's emacs22 package.
    - patches/debian-fakemail-program-name.diff: New patch for
      lib-src/fakemail.c that changes a mention of /bin/mail to
      /usr/bin/mail.  We don't go as far as Debian in throwing errors,
      because that seems like overkill.
    - patches/fix-cc-mode-local-vars.diff: New patch for
      lisp/progmodes/cc-mode.el that fixes a buggy interaction with
      file local variables.  Include ChangeLog entry as well.
    - patches/debian-require-liblockfile.diff: New patch for
      lib-src/movemail.c that causes the build to fail if liblockfile is
      not being used.
    - patches/debian-mail-from-style.diff: Modify to also set
      `message-sendmail-f-is-evil' to t by default.
    - patches/debian-site-init.diff: Place the emacs22-specific Info
      directory before the site-wide Info directory, rather than after it.
    - patches/debian-version-mention.diff: Set to my name rather than
      Rob's, and change description to mention Ubuntu.
    - patches/debian-startup.diff: Remove commented-out code and provide
      a more detailed explanation of what's going on.
  * Rename some patches:
    - patches/feature-dbp-horizontal-split.diff: Rename from
      debian-dp-split.dpatch to indicate that this is a feature-adding
      patch.
    - patches/debian-site-init.diff: Rename from
      debian-default-info-directory.dpatch.
    - patches/debian-startup.diff: Rename from debian-emacs-flavor.dpatch.
    - patches/fix-vc-bfn.diff: Rename from patches/debian-vc-bfn.dpatch
      to indicate that this a bugfix patch.
    - patches/fix-font-lock-tty.diff: Rename from
      debian-font-lock-tty.dpatch to indicate that this is a bugfix patch.
  * Migrate debian/patches from dpatch to quilt.
    - debian/control(.in): Remove dpatch from Build-Depends and add quilt.
      Add cdbs to Build-Depends to silence lintian.
    - debian/rules:
      - Migrate to quilt.
      - New function patch_info to extract information from the headers
        of patches that begin with a certain prefix.
      - Split patch output in README.Debian into several sections, in
        order make it easier to categorize by the type of patch.  We use
        the name of the patch to determine what kind it is.
      - Lines with '#' in the headers of patches are stripped out.
      - Multiple consecutive blank lines are trimmed to only one.
    - debian/patches: Rename *.dpatch to *.diff and prettify headers.
      Also, refresh patches that applied with offsets.
    - debian/README.in: Remove lines at the end.

  [ Reinhard Tartler ]
  * Add X-Vcs-Bzr headers to debian/control.

 -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Thu, 19 Jul 2007 08:52:36 -0400

emacs22 (22.1-0ubuntu1) gutsy; urgency=low

  * New upstream release.
  * This package borrows much from the work on emacs-snapshot by Romain
    Francoise.

 -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Fri, 06 Jul 2007 18:41:48 -0400