* Merge with Debian, remaining changes: - debian/control.in: - Do not suggest emacs23-common-non-dfsg. - Replace use of Source-Version with source:Version. - 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 * Dropped changes: - use_crtdir_in_startfiles.diff: Now upstream - emacs-xgselect.patch: Now applied in Debian - Drop the horror that was ubuntu-restore-nondfsg-files.diff. We'll move the package into main. * Have emacs23-common Depends on emacs23-common-non-dfsg, now that it is going to main.