~ubuntu-branches/ubuntu/raring/emacs23/raring

Viewing all changes in revision 29.

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-09-22 14:04:56 UTC
  • mfrom: (4.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20120922140456-okacfsfv2773zsdr
Tags: 23.4+1-4ubuntu1
* 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: