-
Committer:
Package Import Robot
-
Author(s):
Iain Lane
-
Date:
2012-07-11 14:54:23 UTC
-
Revision ID:
package-import@ubuntu.com-20120711145423-fohrov9bnltk2foc
Tags: 24.1+1-2ubuntu1
* Merge with Debian, remaining changes
- 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
- 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
* Dropped changes:
- debian/patches/unity-shrinkage.patch: Was upstream backport, in this
release now.
- debian/patches/no_cpp_multiarch_dir_mangling.diff: Was FTBFS fix. No
longer does FTBFS without it.