lp://staging/ubuntu/quantal-proposed/emacs24

Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp://staging/ubuntu/quantal-proposed/emacs24
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Development

Recent revisions

6. By Colin Watson

* Backport from Debian (Rob Browning):
  - 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.

5. By Marc Deslauriers

* 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

4. By Iain Lane

* Merge with Debian, remaining changes
   - 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
   - Have emacs24-common Depends on emacs24-common-non-dfsg, now that it is
     out of multiverse. Update debian/copyright to match
   - debian/control.in: use libtiff5-dev in place of libtiff4-dev
* Dropped changes:
  - debian/patches/unity-shrinkage.patch: Was upstream backport, in this
    release now.
  - debian/patches/no_cpp_multiarch_dir_mangling.diff: Was FTBFS fix. No
    longer does FTBFS without it.

3. By Rob Browning <email address hidden>

Restrict libselinux1-dev build dependency to [linux-any].
Thanks to James McCoy <email address hidden> for the report.
(Closes: #679679)

2. By Rob Browning <email address hidden>

* Upgrade to upstream version 24.1.

* Fix Prefer-usr-share-info-emacs-23-over-usr-share-info.patch for emacs24.

* Update Debian-specific documentation in patches/ for emacs24.
  Adjust 0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
  header to refer to 'emacs24. Refer to emacs24-common in /etc/NEWS
  in 0004-Adjust-documentation-references-for-Debian.patch.

* Update debian/control* and debian/copyright for emacs24.

* Update debian/.gitignore for emacs24.

* Add 0009-Restore-doc-emacs-emacsver.texi.patch.

* Add 0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch.

* Add build-deps: libgnutls-dev libxml2-dev libselinux1-dev libmagick++-dev.

* Clean up debian/rules, and update it for emacs24.

* Allow DEB_BUILD_OPTIONS parallel builds again.

* Change emacs package to stick with emacs23 for now.

* Fix emacsVER.lintian-overrides to refer to the correct icon paths.

* Fix package descriptions to satisfy lintian.

* Don't compile with -DDEBIAN anymore (no longer needed).

* Don't switch to -O1 for m68k and ia64; hopefully unnecessary now.

* Verify that movemail was compiled against liblockfile.

* Don't copy .git to build trees.

* Uncompress manpages before trying to give them versioned names.

1. By Rob Browning <email address hidden>

Import upstream version 24.1+1

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/ubuntu/quantal/emacs24
This branch contains Public information 
Everyone can see this information.

Subscribers