-
Committer:
Package Import Robot
-
Author(s):
Iain Lane
-
Date:
2013-10-25 12:47:09 UTC
-
mfrom:
(4.1.21 sid)
-
Revision ID:
package-import@ubuntu.com-20131025124709-o1qd3o4hd5wlyowq
Tags: 23.4+1-4.1ubuntu1
* 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