lp:ubuntu/oneiric/emacs23

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

20. By Daniel T Chen on 2011-08-14

Revert addition of ubuntu-fix-extract-filename-on-gcc-warn-or-err.diff
that broke armel build. Reopens LP #814468.

19. By Daniel T Chen on 2011-08-14

Apply patch from longo resolving gcc-include's failure to
properly extract the filename and to jump to line position.
(LP: #814468)

18. By Matthias Klose on 2011-08-13

src/s/gnu-linux.h (START_FILES): Use CRT_DIR.

17. By Steve Langasek on 2011-05-28

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

16. By Steve Langasek on 2011-04-04

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.

15. By Hajime Mizuno on 2010-12-12

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

14. By Anders Kaseorg on 2010-11-04

debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499
(Emacs gets stuck waiting for menu input). (LP: #569914)

13. By Michael Olson on 2010-08-31

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

12. By Kees Cook on 2010-03-23

* SECURITY UPDATE: arbitrary mailbox read/write via race condition.
  - Add debian/patches/fix-movemail-race.diff: thanks to Dan Rosenberg.
  - CVE-2010-0825

11. By Colin Watson on 2010-03-11

fix bug closure