diff -Nru emacs24-24.4+1/debian/changelog emacs24-24.4+1/debian/changelog --- emacs24-24.4+1/debian/changelog 2014-10-25 15:41:42.000000000 -0400 +++ emacs24-24.4+1/debian/changelog 2014-10-29 14:49:03.000000000 -0400 @@ -1,3 +1,17 @@ +emacs24 (24.4+1-4ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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. + + -- Anders Kaseorg Wed, 29 Oct 2014 14:47:43 -0400 + emacs24 (24.4+1-4) unstable; urgency=medium * Update emacsen-common dependency as per policy. @@ -99,6 +113,41 @@ -- Rob Browning Sat, 06 Sep 2014 11:38:08 -0500 +emacs24 (24.3+1-4ubuntu2) vivid; urgency=medium + + * debian/patches/0015-Work-around-flaky-XIM-modules.patch, + debian/patches/0016-Improve-XIC-fix.patch, + debian/patches/0017-Further-improve-create_frame_xic-patch.patch, + debian/patches/0018-Further-improve-XIM-init.patch: + Apply upstream patches to make Emacs work with IBus and UIM. + (Closes: #753534) (LP: #493766) + + -- Anders Kaseorg Thu, 28 Aug 2014 06:57:06 -0400 + +emacs24 (24.3+1-4ubuntu1) utopic; urgency=medium + + * 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. + + * Drop changes, applied in Debian: + - debian/control.in: Use libtiff5-dev in place of libtiff4-dev. + + + -- Dimitri John Ledkov Fri, 06 Jun 2014 15:36:08 +0100 + emacs24 (24.3+1-4) unstable; urgency=medium [ Rob Browning ] @@ -149,6 +198,33 @@ -- Rob Browning Mon, 05 May 2014 19:36:05 -0500 +emacs24 (24.3+1-2ubuntu2) utopic; urgency=medium + + * Build-depend on gnutls28. + + -- Dimitri John Ledkov Thu, 08 May 2014 01:28:01 +0100 + +emacs24 (24.3+1-2ubuntu1) trusty; urgency=medium + + * 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. + + -- Barry Warsaw Fri, 07 Mar 2014 12:33:33 -0500 + emacs24 (24.3+1-2) unstable; urgency=low * Set CFLAGS, CPPFLAGS, and LDFLAGS solely via configure in debian/rules. @@ -180,6 +256,36 @@ -- Rob Browning Thu, 26 Sep 2013 17:42:00 -0500 +emacs24 (24.3+1-1ubuntu3) saucy; urgency=low + + * debian/patches/0009-upstream-bug-14829.patch: Patch from upstream + issue tracker to fix window splitting when split-window-keep-point + is nil. + + -- Barry Warsaw Fri, 26 Jul 2013 22:54:28 -0400 + +emacs24 (24.3+1-1ubuntu2) saucy; urgency=low + + * 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. + + -- Barry Warsaw Fri, 14 Jun 2013 10:57:09 -0400 + +emacs24 (24.3+1-1ubuntu1) saucy; urgency=low + + * Merge from 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. + + -- Dmitrijs Ledkovs Mon, 03 Jun 2013 10:28:00 +0100 + emacs24 (24.3+1-1) unstable; urgency=low * Upgrade to upstream version 24.3 and update debian/copyright, @@ -202,6 +308,28 @@ -- Rob Browning Sat, 13 Apr 2013 11:11:16 -0500 +emacs24 (24.2+1-2ubuntu2) raring; urgency=low + + * Fix 'Ediff' window shrinks horizontally to one column wide (LP: + #1059633) Thanks marga-9 for the patch. + + -- Dmitrijs Ledkovs Tue, 09 Apr 2013 10:32:32 +0100 + +emacs24 (24.2+1-2ubuntu1) raring; urgency=low + + * Resynchronise 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. + - Apply upstream patch for bug 12764 to fix maddeningly broken behavior + with quit-window. + + -- Dmitrijs Ledkovs Tue, 05 Mar 2013 01:01:46 +0000 + emacs24 (24.2+1-2) unstable; urgency=low * Switch emacs24 from GTK+ 2 to GTK+ 3. (Closes: #679931) @@ -212,6 +340,26 @@ -- Rob Browning Sun, 20 Jan 2013 16:18:00 -0600 +emacs24 (24.2+1-1ubuntu2) raring; urgency=low + + * Apply upstream patch for bug 12764 to fix maddeningly broken behavior + with quit-window. + + -- Barry Warsaw Thu, 13 Dec 2012 14:34:07 -0500 + +emacs24 (24.2+1-1ubuntu1) raring; urgency=low + + * Resynchronise 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. + + -- Colin Watson Mon, 26 Nov 2012 17:58:27 +0000 + emacs24 (24.2+1-1) unstable; urgency=high * Upgrade to upstream version 24.2 and update debian/patches. @@ -254,6 +402,44 @@ -- Rob Browning Tue, 17 Jul 2012 19:25:59 -0500 +emacs24 (24.1+1-2ubuntu3) quantal-proposed; urgency=low + + * Backport from Debian (Rob Browning): + - Stop producing the emacs binary metapackage. + Move the emacs binary metapackage to its own source package + (emacs-defaults, cf. gcc-defaults). This will prevent emacs23 and + emacs24 from producing the same binary package. + + -- Colin Watson Sat, 22 Sep 2012 14:24:57 +0100 + +emacs24 (24.1+1-2ubuntu2) quantal-proposed; urgency=low + + * SECURITY UPDATE: arbitrary lisp code execution via crafted file + - debian/patches/CVE-2012-3479.patch: ignore eval: forms that are not + known to be safe if enable-local-variables is set to :safe in + lisp/files.el. + - CVE-2012-3479 + + -- Marc Deslauriers Fri, 21 Sep 2012 11:14:32 -0400 + +emacs24 (24.1+1-2ubuntu1) quantal; urgency=low + + * 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. + + -- Iain Lane Wed, 11 Jul 2012 14:54:23 +0100 + emacs24 (24.1+1-2) unstable; urgency=low * Restrict libselinux1-dev build dependency to [linux-any]. @@ -305,6 +491,36 @@ -- Rob Browning Fri, 29 Jun 2012 16:16:28 -0500 +emacs23 (23.4+1-3ubuntu2) quantal; urgency=low + + * debian/control.in: use libtiff5-dev in place of libtiff4-dev + + -- Serge Hallyn Mon, 09 Jul 2012 15:42:40 -0500 + +emacs23 (23.4+1-3ubuntu1) quantal; urgency=low + + * 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. + + -- Iain Lane Sat, 12 May 2012 12:30:20 +0100 + emacs23 (23.4+1-3) unstable; urgency=low * Add 0017-Initialize-xgselect-in-function-xg_select-when-gfds_.patch. @@ -423,6 +639,104 @@ -- Rob Browning Sun, 23 Oct 2011 01:22:00 -0500 +emacs23 (23.3+1-1ubuntu9) precise; urgency=low + + * debian/patches/unity-shrinkage.patch: Back port of upstream Emacs 24 + patch to prevent automatic uncontrollable shrinkage of the window to + one row high when no menu bar is used under Unity/Gtk+/Ubuntu 12.04. + (LP: #941790) + + -- Barry Warsaw Sat, 24 Mar 2012 13:07:38 -0400 + +emacs23 (23.3+1-1ubuntu8) precise; urgency=low + + * debian/patches/emacsVER-lp725988.patch: Set the X EMACS_CLASS + to "Emacs23" to please bamf and gnome shell (LP: #725988) + * debian/emacsVER.desktop: also set StartupWMClass (same reason) + + -- Fabien Tassin Wed, 15 Feb 2012 18:42:46 +0100 + +emacs23 (23.3+1-1ubuntu7) precise; urgency=low + + * debian/patches/emacs-xgselect.patch: Initialize xgselect in + function xg_select when gfds_size == 0. Fixes 100% CPU startup + freeze with glib 2.31. (LP: #902043) + + -- Anders Kaseorg Fri, 09 Dec 2011 02:17:48 -0500 + +emacs23 (23.3+1-1ubuntu6) precise; urgency=low + + * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. + + -- Adam Conrad Fri, 02 Dec 2011 17:29:34 -0700 + +emacs23 (23.3+1-1ubuntu5) precise; urgency=low + + * Transition to libjpeg8-dev, so our build-deps no longer conflict. + + -- Adam Conrad Thu, 01 Dec 2011 21:52:48 -0700 + +emacs23 (23.3+1-1ubuntu4) oneiric; urgency=low + + * Revert addition of ubuntu-fix-extract-filename-on-gcc-warn-or-err.diff + that broke armel build. Reopens LP #814468. + + -- Daniel T Chen Sun, 14 Aug 2011 12:13:49 -0400 + +emacs23 (23.3+1-1ubuntu3) oneiric; urgency=low + + * Apply patch from longo resolving gcc-include's failure to + properly extract the filename and to jump to line position. + (LP: #814468) + + -- Daniel T Chen Sun, 14 Aug 2011 10:33:32 -0400 + +emacs23 (23.3+1-1ubuntu2) oneiric; urgency=low + + * src/s/gnu-linux.h (START_FILES): Use CRT_DIR. + + -- Matthias Klose Sat, 13 Aug 2011 12:54:07 +0200 + +emacs23 (23.3+1-1ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable; remaining changes: + - 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/control.in: + - Conflict and Replace emacs23-common-non-dfsg, since we provide + all of its features. + - Do not suggest emacs23-common-non-dfsg. + - Replace use of Source-Version with source:Version. + - debian/copyright.in: + - Remove text about removed files. + - debian/emacsVER-common.{postinst,prerm}: Don't install info files to + info/dir. This happens automatically now. + - debian/patches: + - -Remove-files-that-appear-to-be-incompatible-with-the.patch: Remove. + - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces + the non-DFSG files, with the exception of .elc files and info + files, which use special characters and thus can't be easily + represented in patch form. These will be regenerated at build + time. + - debian/rules: + - Do not install replacements for non-DFSG files. + - Install all info files, not just efaq. + - Avoid uselessly building info files a 2nd time. + * Dropped changes: + - debian/patches/fix-ftbfs-xft-fontconfig.diff: merged in Debian. + - debian/patches/fix-menus.diff: present upstream. + - Require autotools-dev (>= 20100122.1) in Build-Depends: don't use + versioned build-depends to work around buggy versions. + - debian/patches/fix-decimal-point-in-font-size.diff: no documentation in + the changelog for this change, from an upstream bug report but not + upstreamed. + * debian/patches/no_cpp_multiarch_dir_mangling.diff: only include i386 + here; if the toolchain triplet matches the multiarch path, this is + already handled in configure.in. + + -- Steve Langasek Sat, 28 May 2011 05:57:27 +0000 + emacs23 (23.3+1-1) unstable; urgency=low * Incorporate new upstream version 23.3. @@ -452,6 +766,56 @@ -- Rob Browning Sun, 10 Apr 2011 10:33:31 -0500 +emacs23 (23.2+1-7ubuntu2) natty; urgency=low + + * 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. LP: #749270. + + -- Steve Langasek Mon, 04 Apr 2011 08:51:24 +0000 + +emacs23 (23.2+1-7ubuntu1) natty; urgency=low + + [ Hajime Mizuno ] + * Merge from debian unstable(LP: #705383). Remaining changes: + * debian/control.in: + - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy. + - Conflict and Replace emacs23-common-non-dfsg, since we provide + all of its features. + - Do not suggest emacs23-common-non-dfsg. + - Replace use of Source-Version with source:Version. + - Require autotools-dev (>= 20100122.1) in Build-Depends, since + the version in Karmic will fail due to a missing Perl module. + * debian/control: Regenerate. + * debian/copyright.in: + - Remove text about removed files. + * debian/copyright: Regenerate. + * debian/emacsVER-common.postinst: + - Don't install info files to info/dir. This happens + automatically now. + * debian/emacsVER-common.prerm: + - Don't remove info files from info/dir. This happens + automatically now. + * debian/emacsVER-common.prerm: + - Don't remove info files from info/dir. This happens + automatically now. + * debian/patches: + - handle-dfsg-split.diff: Remove. + - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces + the non-DFSG files, with the exception of .elc files and info + files, which use special characters and thus can't be easily + represented in patch form. These will be regenerated at build + time. + * debian/rules: + - Do not install replacements for non-DFSG files. + - Install all info files, not just efaq. + - Avoid uselessly building info files a 2nd time. + * fix-ftbfs-xft-fontconfig.diff to avoid FTBFS. + * debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499 + (Emacs gets stuck waiting for menu input). (LP: #569914) + + -- Hajime Mizuno Sun, 12 Dec 2010 11:24:28 +0000 + emacs23 (23.2+1-7) unstable; urgency=low * Don't initialize the terminal twice. Previously a console-mode @@ -507,6 +871,60 @@ -- Rob Browning Mon, 18 Oct 2010 00:17:56 -0500 +emacs23 (23.2+1-4ubuntu2) natty; urgency=low + + * debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499 + (Emacs gets stuck waiting for menu input). (LP: #569914) + + -- Anders Kaseorg Thu, 04 Nov 2010 15:56:10 -0400 + +emacs23 (23.2+1-4ubuntu1) natty; urgency=low + + [ Michael W. Olson (GNU address) ] + * Resync with Debian. Remaining changes: + * debian/control.in: + - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy. + - Conflict and Replace emacs23-common-non-dfsg, since we provide + all of its features. + - Do not suggest emacs23-common-non-dfsg. + - Replace use of Source-Version with source:Version. + - Require autotools-dev (>= 20100122.1) in Build-Depends, since + the version in Karmic will fail due to a missing Perl module. + * debian/control: Regenerate. + * debian/copyright.in: + - Remove text about removed files. + * debian/copyright: Regenerate. + * debian/emacsVER-common.postinst: + - Don't install info files to info/dir. This happens + automatically now. + * debian/emacsVER-common.prerm: + - Don't remove info files from info/dir. This happens + automatically now. + * debian/patches: + - handle-dfsg-split.diff: Remove. + - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces + the non-DFSG files, with the exception of .elc files and info + files, which use special characters and thus can't be easily + represented in patch form. These will be regenerated at build + time. + * debian/rules: + - Do not install replacements for non-DFSG files. + - Install all info files, not just efaq. + - Avoid uselessly building info files a 2nd time. + + [ Reinhard Tartler ] + * Reintegrate ubuntu history in debian/changelog + * verified that debian/patches/fix-movemail-race.diff can be dropped, + it is integrated in the new upstream version. + * Rebuild against new debhelper to get trigger support: LP: #449729 + * New upstream version (LP: #588203) solves: + - huge font sizes. LP: #445402 + - scroll bar in emacs highlights/selects text, LP: #581486 + - org and tbl menus are no longer missing in org-mode, LP: #640504 + * Add patch fix-ftbfs-xft-fontconfig.diff to avoid FTBFS. + + -- Michael W. Olson (GNU address) Tue, 31 Aug 2010 17:26:34 -0700 + emacs23 (23.2+1-4) unstable; urgency=low * Disable parallel builds (via DEB_BUILD_OPTIONS=parallel) until an @@ -655,6 +1073,91 @@ -- Rob Browning Sun, 01 Nov 2009 10:00:58 -0800 +emacs23 (23.1+1-4ubuntu7) lucid; urgency=low + + * SECURITY UPDATE: arbitrary mailbox read/write via race condition. + - Add debian/patches/fix-movemail-race.diff: thanks to Dan Rosenberg. + - CVE-2010-0825 + + -- Kees Cook Tue, 23 Mar 2010 16:11:55 -0700 + +emacs23 (23.1+1-4ubuntu6) lucid; urgency=low + + * Don't suggest emacs23-common-non-dfsg, as it does not exist in + Ubuntu (LP: #444094) + + -- Ralf Doering Fri, 05 Mar 2010 13:42:50 +0100 + +emacs23 (23.1+1-4ubuntu5) lucid; urgency=low + + [ Rob Browning ] + * Apply upstream patch to fix problem with GTK and dynamically + generated menus (which could be unexpectedly empty). Thanks to + Baylis Shanks for the report. + (closes: 550541) + + [ Reinhard Tartler ] + * snatched patch from debian upload 23.1+1-5. LP: #415101 + + -- Reinhard Tartler Fri, 06 Nov 2009 09:21:16 +0100 + +emacs23 (23.1+1-4ubuntu4) lucid; urgency=low + + * reintroduce the "emacs" binary package. emacs22 will be changed to + no longer build it. + + -- Reinhard Tartler Wed, 04 Nov 2009 15:21:35 +0100 + +emacs23 (23.1+1-4ubuntu3) karmic; urgency=low + + * Also comment out emacs binary in debian/control.in (LP: #433397) really + this time + + -- Scott Kitterman Wed, 14 Oct 2009 11:46:59 -0400 + +emacs23 (23.1+1-4ubuntu2) karmic; urgency=low + + * Stop shipping emacs binary so emacs22 in main doesn't get hijacked + (LP: #433397) + - Comment out the binary in debian/control + + -- Scott Kitterman Sun, 11 Oct 2009 23:22:39 -0400 + +emacs23 (23.1+1-4ubuntu1) karmic; urgency=low + + * FFe granted in LP: #433397, #408085 + * debian/control.in: + - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy. + - Conflict and Replace emacs23-common-non-dfsg, since we provide + all of its features. + - Do not suggest emacs23-common-non-dfsg. + - Replace use of Source-Version with source:Version. + * debian/control: Regenerate. + * debian/copyright.in: + - Remove text about removed files. + * debian/copyright: + - Regenerate. + * debian/emacsVER-common.postinst: + - Install info files. Rules copied from nondfsg package, with + the change that we use INFO_SUBDIR and INFO_FILES. + * debian/emacsVER-common.prerm: + - Remove info files. Rules copied from nondfsg package, with + the change that we use INFO_SUBDIR and INFO_FILES. + * debian/patches: + - handle-dfsg-split.diff: Remove. + - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces + the non-DFSG files, with the exception of .elc files and info + files, which use special characters and thus can't be easily + represented in patch form. Both will be regenerated at build + time. + * debian/rules: + - Do not install replacements for non-DFSG files. + - Install all info files, not just efaq. + - During cleanup, chmod mangle-info back to 644, so it does not + show up as modified. + + -- Michael W. Olson (GNU address) Wed, 16 Sep 2009 19:35:02 -0700 + emacs23 (23.1+1-4) unstable; urgency=low * Remove redundant upstream emacs.desktop files from emacs23-common, @@ -2139,3 +2642,4 @@ Local Variables: coding: utf-8 End: + diff -Nru emacs24-24.4+1/debian/control emacs24-24.4+1/debian/control --- emacs24-24.4+1/debian/control 2014-10-25 15:41:42.000000000 -0400 +++ emacs24-24.4+1/debian/control 2014-10-29 14:49:13.000000000 -0400 @@ -1,7 +1,8 @@ Source: emacs24 Section: editors Priority: optional -Maintainer: Rob Browning +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff-dev | libtiff-dev, xaw3dg-dev, libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, @@ -19,7 +20,6 @@ Architecture: any Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: emacs24, emacsen, editor, info-browser, mail-reader, news-reader -Suggests: emacs24-common-non-dfsg Conflicts: emacs24, emacs24-nox Replaces: emacs24, emacs24-nox Description: GNU Emacs editor (with Lucid GUI support) @@ -47,7 +47,6 @@ Architecture: any Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: emacs24, editor, emacsen, info-browser, mail-reader, news-reader -Suggests: emacs24-common-non-dfsg Conflicts: emacs24, emacs24-lucid Replaces: emacs24, emacs24-lucid Description: GNU Emacs editor (without GUI support) @@ -69,7 +68,6 @@ Architecture: any Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader -Suggests: emacs24-common-non-dfsg Conflicts: emacs24-lucid, emacs24-nox Replaces: emacs24-lucid, emacs24-nox Description: GNU Emacs editor (with GTK+ GUI support) @@ -97,8 +95,9 @@ Package: emacs24-common Architecture: all -Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} -Suggests: emacs24-el, emacs24-common-non-dfsg +Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, + emacs24-common-non-dfsg, ${shlibs:Depends}, ${misc:Depends} +Suggests: emacs24-el Conflicts: emacs24-el (<< ${Source-Version}), cedet, eieio, speedbar Description: GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. diff -Nru emacs24-24.4+1/debian/control.in emacs24-24.4+1/debian/control.in --- emacs24-24.4+1/debian/control.in 2014-10-25 15:41:42.000000000 -0400 +++ emacs24-24.4+1/debian/control.in 2014-10-29 14:42:45.000000000 -0400 @@ -1,7 +1,8 @@ Source: @DEB_FLAVOR@ Section: editors Priority: optional -Maintainer: Rob Browning +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff-dev | libtiff-dev, xaw3dg-dev, libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, @@ -19,7 +20,6 @@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader -Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox Description: GNU Emacs editor (with Lucid GUI support) @@ -47,7 +47,6 @@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader -Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid Description: GNU Emacs editor (without GUI support) @@ -69,7 +68,6 @@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader -Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox Description: GNU Emacs editor (with GTK+ GUI support) @@ -97,8 +95,9 @@ Package: @DEB_FLAVOR@-common Architecture: all -Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} -Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg +Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, + @DEB_FLAVOR@-common-non-dfsg, ${shlibs:Depends}, ${misc:Depends} +Suggests: @DEB_FLAVOR@-el Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar Description: GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. diff -Nru emacs24-24.4+1/debian/copyright emacs24-24.4+1/debian/copyright --- emacs24-24.4+1/debian/copyright 2014-10-25 15:48:55.000000000 -0400 +++ emacs24-24.4+1/debian/copyright 2014-10-29 14:49:13.000000000 -0400 @@ -27,6 +27,12 @@ (this includes front and back cover texts). See this Debian General Resolution on the topic: http://www.debian.org/vote/2006/vote_001. +The Ubuntu project does not consider that GFDL invariant sections make a +work non-free, so has placed the package emacs24-common-non-free in +the "main" archive section, and added a dependency from +emacs24-common. You should therefore have all documentation on your +system. + Some other files have been removed because their license only allows verbatim copying, or because there was some other question. diff -Nru emacs24-24.4+1/debian/copyright.in emacs24-24.4+1/debian/copyright.in --- emacs24-24.4+1/debian/copyright.in 2014-10-25 15:40:41.000000000 -0400 +++ emacs24-24.4+1/debian/copyright.in 2014-10-29 10:39:44.000000000 -0400 @@ -27,6 +27,12 @@ (this includes front and back cover texts). See this Debian General Resolution on the topic: http://www.debian.org/vote/2006/vote_001. +The Ubuntu project does not consider that GFDL invariant sections make a +work non-free, so has placed the package @DEB_FLAVOR@-common-non-free in +the "main" archive section, and added a dependency from +@DEB_FLAVOR@-common. You should therefore have all documentation on your +system. + Some other files have been removed because their license only allows verbatim copying, or because there was some other question. diff -Nru emacs24-24.4+1/debian/emacsVER.desktop emacs24-24.4+1/debian/emacsVER.desktop --- emacs24-24.4+1/debian/emacsVER.desktop 2014-10-25 15:40:41.000000000 -0400 +++ emacs24-24.4+1/debian/emacsVER.desktop 2014-10-29 10:39:44.000000000 -0400 @@ -10,3 +10,4 @@ Type=Application Terminal=false Categories=Utility;Development;TextEditor; +StartupWMClass=Emacs@MENU_VERSION@ diff -Nru emacs24-24.4+1/debian/patches/emacsVER-lp725988.patch emacs24-24.4+1/debian/patches/emacsVER-lp725988.patch --- emacs24-24.4+1/debian/patches/emacsVER-lp725988.patch 1969-12-31 19:00:00.000000000 -0500 +++ emacs24-24.4+1/debian/patches/emacsVER-lp725988.patch 2014-03-07 11:31:17.000000000 -0500 @@ -0,0 +1,11 @@ +--- a/src/frame.h ++++ b/src/frame.h +@@ -1196,7 +1196,7 @@ + #ifdef HAVE_WINDOW_SYSTEM + + /* The class of this X application. */ +-#define EMACS_CLASS "Emacs" ++#define EMACS_CLASS "Emacs24" + + /* These are in xterm.c, w32term.c, etc. */ + diff -Nru emacs24-24.4+1/debian/patches/series emacs24-24.4+1/debian/patches/series --- emacs24-24.4+1/debian/patches/series 2014-10-25 15:40:41.000000000 -0400 +++ emacs24-24.4+1/debian/patches/series 2014-10-29 14:46:59.000000000 -0400 @@ -6,3 +6,4 @@ 0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch 0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch 0008-A-race-to-create-info-has-been-eliminated.patch +emacsVER-lp725988.patch diff -Nru emacs24-24.4+1/debian/rules emacs24-24.4+1/debian/rules --- emacs24-24.4+1/debian/rules 2014-10-25 15:40:41.000000000 -0400 +++ emacs24-24.4+1/debian/rules 2014-10-29 10:39:44.000000000 -0400 @@ -475,17 +475,6 @@ dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \ usr/share/emacs/$(runtime_ver)/lisp/COPYING - # Install replacements for non-free files that can be reached - # through C-h - for f in THE-GNU-PROJECT; \ - do \ - sed \ - -e "s/@FILE@/$$f/g" \ - -e "s/@MAJOR_VERSION@/$(major_ver)/g" \ - $(CURDIR)/debian/missing-file.dfsg > \ - $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/$$f.dfsg ; \ - done - $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm -f @@ -581,6 +570,7 @@ ifneq (,$(findstring $(flavor)-el, $(shell dh_listpackages))) install -d $(pkgdir_el) $(pf); \ + mkdir -p $(pkgdir_el); \ (cd $(install_dir_x) && find -name "*.el" -o -name "*.el.gz" -print0 \ | tar cpf - --null --files-from -) \ | (cd $(pkgdir_el) && tar xpf -)