lp:ubuntu/wily/emacs24
- Get this branch:
- bzr branch lp:ubuntu/wily/emacs24
Branch merges
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 25. By Barry Warsaw
-
debian/
patches/ 2e4c2fe. patch: Patch to drop use of GREP_OPTIONS,
which is deprecated in our current version of grep. Upstream
patch has lisp/ChangeLog diff stripped. - 24. By Matthias Klose
-
* 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. - 19. By Anders Kaseorg
-
* Merge from Debian unstable (LP: #1387323). 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. - 17. By Anders Kaseorg
-
debian/
patches/ 0015-Work- around- flaky-XIM- modules. patch,
debian/patches/ 0016-Improve- XIC-fix. patch,
debian/patches/ 0017-Further- improve- create_ frame_xic- patch.patch,
debian/patches/ 0018-Further- improve- XIM-init. patch:
Apply upstream patches to make Emacs work with IBus and UIM.
(Closes: #753534) (LP: #493766) - 16. By Dimitri John Ledkov
-
* Merge from Debian, with remaining changes:
- debian/patches/ 0009-upstream-bug-14829.patch: Patch from upstream
issue tracker to fix window splitting when split-window-keep-point
is nil.
- debian/patches/ 0008-No- redisplay- when-reading- dbus-events. patch:
Cherry pick from upstream bzr a fix for a redisplay bug while
reading dbus events.
- 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.* Drop changes, applied in Debian:
- debian/control.in: Use libtiff5-dev in place of libtiff4-dev.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/utopic/emacs24