~ubuntu-branches/ubuntu/vivid/emacs24/vivid

Viewing all changes in revision 14.

  • Committer: Package Import Robot
  • Author(s): Barry Warsaw
  • Date: 2014-03-07 12:33:33 UTC
  • mfrom: (3.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20140307123333-wmzrf30bltba0ib1
Tags: 24.3+1-2ubuntu1
* 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. 
  - debian/control.in: Use libtiff5-dev in place of libtiff4-dev.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: