lp://qastaging/ubuntu/trusty-proposed/emacs23
- Get this branch:
- bzr branch lp://qastaging/ubuntu/trusty-proposed/emacs23
Branch merges
Branch information
Recent revisions
- 31. By Iain Lane
-
* Merge with Debian. Remaining changes:
- debian/control.in:
- Do not suggest emacs23-common- non-dfsg.
- Replace use of Source-Version with source:Version.
- Have emacs23-common Depends on emacs23-common- non-dfsg, now that it
is going to main.
- Use libtiff5-dev in place of libtiff4-dev.
- debian/patches:
- emacsVER-lp725988. patch: Set the X EMACS_CLASS to "Emacs23" to please
bamf and gnome-shell
- 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/emacsVER. desktop: also set StartupWMClass for bamf and
gnome-shell - 30. By Iain Lane
-
* Cherry-pick from emacs24:
- debian/rules: Make sure the emacs23-el directory exists. - 29. By Colin Watson
-
* Resynchronise with Debian. Remaining changes:
- debian/control.in:
- Do not suggest emacs23-common- non-dfsg.
- Replace use of Source-Version with source:Version.
- Have emacs23-common Depends on emacs23-common- non-dfsg, now that it
is going to main.
- Use libtiff5-dev in place of libtiff4-dev.
- debian/patches:
- emacsVER-lp725988. patch: Set the X EMACS_CLASS to "Emacs23" to please
bamf and gnome-shell
- 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/emacsVER. desktop: also set StartupWMClass for bamf and
gnome-shell - 28. 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 - 26. By Iain Lane
-
* Merge with Debian, remaining changes:
- debian/control.in:
- Do not suggest emacs23-common- non-dfsg.
- Replace use of Source-Version with source:Version.
- debian/patches:
- emacsVER-lp725988. patch: Set the X EMACS_CLASS to "Emacs23" to please
bamf and gnome-shell
- 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/emacsVER. desktop: also set StartupWMClass for bamf and
gnome-shell
* Dropped changes:
- use_crtdir_in_startfiles. diff: Now upstream
- emacs-xgselect.patch: Now applied in Debian
- Drop the horror that was ubuntu-restore- nondfsg- files.diff. We'll move
the package into main.
* Have emacs23-common Depends on emacs23-common- non-dfsg, now that it is
going to main. - 25. By Barry Warsaw
-
debian/
patches/ unity-shrinkage .patch: Back port of upstream Emacs 24
patch to prevent automatic uncontrollable shrinkage of the window to
one row high when no menu bar is used under Unity/Gtk+/Ubuntu 12.04.
(LP: #941790) - 24. By Fabien Tassin
-
* debian/
patches/ emacsVER- lp725988. patch: Set the X EMACS_CLASS
to "Emacs23" to please bamf and gnome shell (LP: #725988)
* debian/emacsVER. desktop: also set StartupWMClass (same reason) - 23. By Anders Kaseorg
-
debian/
patches/ emacs-xgselect. patch: Initialize xgselect in
function xg_select when gfds_size == 0. Fixes 100% CPU startup
freeze with glib 2.31. (LP: #902043)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/utopic/emacs23