debian/0000775000000000000000000000000012306401504007163 5ustar debian/emacsVER-common.docs0000664000000000000000000000006512306371370013000 0ustar BUGS README debian/README.add-on-package-maintainers debian/missing-file.dfsg0000664000000000000000000000065612306371370012434 0ustar The file that would normally be displayed here (@FILE@) has been moved to the emacs@MAJOR_VERSION@-common-non-dfsg package because its license does not appear to be compatible with the Debian Free Software Guidelines (DFSG). Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/copyright for more information. Please install @FILE@ from Debian's non-free distribution if you would like for Emacs to display the original file. debian/changelog0000664000000000000000000027407412306401377011063 0ustar 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. Don't override the CFLAGS, CPPFLAGS, and LDFLAGS values chosen by the upstream configure script; instead, make any adjustments at configure time. Our quashing of "-Wl,-znocombreloc" during the make invocation was causing i386 builds of emacs24-lucid to fail under X. Thanks to Łukasz Pankowski for the report, and Samuel Bronson for the patch. (Closes: 684788) * debian/rules: clean src/stamp-h.in. Thanks to Samuel Bronson for the patch. * Explicitly create $(pkgdir_el) in debian/rules (fix FTBS). Thanks to Lucas Nussbaum for the report, Matt Kraai for the patch, and Dmitrijs Ledkovs for the 24.3+1-1.1 NMU. (Closes: 707488) * Specify --without-gsettings for emacsFLAVOR-nox and emacsFLAVOR-lucid. Thanks to Yuri D'Elia for the report. (Closes: 687299, 687303) * Fix hang at startup on kFreeBSD. Add debian/patches/0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch and debian/patches/0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch to incorporate the two relevant upstream patches. Thanks to Christoph Egger for the report. (Closes: 712974) -- 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, debian/patches, debian/rules, etc. * Remove patches that appear to have been incorporated upstream: 0008-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch 0009-Restore-doc-emacs-emacsver.texi.patch 0010-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch * 0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch: remove lisp/site-init.el in favor of a modification to lisp/info.el to directly prepend /usr/share/info/emacs-%d to Info-default-directory-list (setting it directly in site-lisp.el no longer worked, and was more complicated). * Automatically compute upstream version in debian/rules. * Mention the etc/publicsuffix.txt license in debian/copyright. -- 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) * Migrate to debhelper 9. * Add emacsVER-dbg, emacsVER-lucid-dbg, and emacsVER-nox-dbg packages. -- 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. * Remove patches that have been incorporated upstream: 0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch * 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. * Don't eval code when enable-local-variables is :safe. Previously, Emacs might eval forms in file-local variable sections even when the Emacs user option `enable-local-variables' was set to :safe (CVE-2012-3479). Emacs 24.2 fixes the problem. Thanks to Henri Salo for the report. (Closes: #684695) * Have debian/% depend on debian/rules since it now sets the upstream_ver. * Update debian/rules upstream_ver to 24.2 and run "debian/rules debian-sync". -- Rob Browning Sun, 09 Sep 2012 12:03:31 -0500 emacs24 (24.1+1-4) unstable; urgency=low * Fix FTBS on ia64 with -O1. Remove redundant LDFLAGS+=-g and CFLAGS+=-O2. See also: #582439. (Closes: #679986) -- Rob Browning Fri, 20 Jul 2012 12:51:32 -0500 emacs24 (24.1+1-3) unstable; urgency=low * Add 0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch. Fix FTBS on i386 by adding an upstream patch to skip fabs() errno checking. Since fabs() has no error conditions, it doesn't guarantee that it won't clobber errno. -- 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]. Thanks to James McCoy for the report. (Closes: #679679) -- Rob Browning Wed, 04 Jul 2012 19:16:00 -0500 emacs24 (24.1+1-1) unstable; urgency=low * Upgrade to upstream version 24.1. * Fix Prefer-usr-share-info-emacs-23-over-usr-share-info.patch for emacs24. * Update Debian-specific documentation in patches/ for emacs24. Adjust 0002-Run-debian-startup-and-set-debian-emacs-flavor.patch header to refer to 'emacs24. Refer to emacs24-common in /etc/NEWS in 0004-Adjust-documentation-references-for-Debian.patch. * Update debian/control* and debian/copyright for emacs24. * Update debian/.gitignore for emacs24. * Add 0009-Restore-doc-emacs-emacsver.texi.patch. * Add 0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch. * Add build-deps: libgnutls-dev libxml2-dev libselinux1-dev libmagick++-dev. * Clean up debian/rules, and update it for emacs24. * Allow DEB_BUILD_OPTIONS parallel builds again. * Change emacs package to stick with emacs23 for now. * Fix emacsVER.lintian-overrides to refer to the correct icon paths. * Fix package descriptions to satisfy lintian. * Don't compile with -DDEBIAN anymore (no longer needed). * Don't switch to -O1 for m68k and ia64; hopefully unnecessary now. * Verify that movemail was compiled against liblockfile. * Don't copy .git to build trees. * Uncompress manpages before trying to give them versioned names. -- 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. Patch xgselect.c to prevent hang when using newer versions of GLib. Thanks to Vincent Lefevre and Sven Arvidsson for the initial reports, and Karel Klíč for the patch. (Closes: #666691) -- Rob Browning Sat, 07 Apr 2012 14:35:51 -0500 emacs23 (23.4+1-2) unstable; urgency=low * Add 0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch. Incorporate upstream fix to prevent Emacs from crashing while decoding input with DOS EOLs. * Add 0016-quail-indian.el-indian-tlg-base-table-Fix-typo-dev-t.patch. Rename indian-dev-base-table to indian-tlg-base-table to correct a typo in quail/indian.el. -- Rob Browning Wed, 21 Mar 2012 01:19:53 -0500 emacs23 (23.4+1-1) unstable; urgency=low * Upgrade to upstream version 23.4. Emacs 23.4 includes grammars that were missing for some of its bison parsers. Thanks to Julian Andres Klode for the report. (Closes: #635938) * Update debian/* for Emacs 23.4. * Depend on libpng-dev rather than libpng12-dev. Thanks to Nobuhiro Iwamatsu for the report. (Closes: #662312) * Add 0014-Fix-hang-after-C-z-in-gnome-shell.patch. Emacs should no longer hang when C-z is pressed within the Gnome shell. Thanks to Nikolay Pelov for the report. (Closes: #655592) -- Rob Browning Tue, 20 Mar 2012 23:39:44 -0500 emacs23 (23.3+1-5) unstable; urgency=high * Add 0017-Define-POSIX_SIGNALS-for-GNU-Hurd.patch. Thanks to Samuel Thibault for the report and the patch. (Closes: #650976) * Add 0018-Don-t-let-CEDET-execute-code-from-an-arbitrary-Proje.patch. Don't execute arbitrary elisp code from any file named Project.ede in or above a CEDET-related directory (CVE-2012-0035). Thanks to Florian Weimer for the report. (Closes: #655299) * Add 0019-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch. Use varargs in movemail.c error() and add a printf attribute to support hardened build flags. * Add debian/rules support for hardened build flags. Thanks to Moritz Muehlenhoff for the report and the patch. (Closes: #655118) * Add conflict with cedet, eieio, and speedbar. Don't allow the older standalone packages to remain installed since they break emacs23, emacs23 includes them, and they're no longer in unstable/testing. Thanks to Ivan Vilata i Balaguer for the report. (Closes: #632142) * Change negated build-dep [!hurd-i386...] to [linux-any]. Thanks to Robert Millan for the report. (Closes: #634336) -- Rob Browning Sun, 29 Jan 2012 14:06:03 -0600 emacs23 (23.3+1-4) unstable; urgency=low * Add 0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch. Thanks to Hiroyuki Yamamoto for the report and the patch. (Closes: #646609) -- Rob Browning Tue, 25 Oct 2011 19:58:32 -0500 emacs23 (23.3+1-3) unstable; urgency=low * Add 0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch. Thanks to Sven Joachim for the report and the patch, and and Philipp Kern for the 23.3+1-1.1 NMU, which included it. (Closes: #629567) -- Rob Browning Mon, 24 Oct 2011 22:45:37 -0500 emacs23 (23.3+1-2) unstable; urgency=low * Add 0014-Add-i386-to-cpp_undefs-in-configure.in-to-fix-i386-m.patch. Thanks to Steve Langasek for the report, Sven Joachim for the patch, and Philipp Kern for the 23.3+1-1.1 NMU, which included it. (Closes: #620795) * Don't explicitly add leim to locallispath since it's no longer necessary. (Closes: #476660) * Don't test for src/emacs.c in rules since the whole tree is in git now. * Drop dh --with autotools_dev; it doesn't work if config.* files are missing. * Build-depend on libjpeg-dev rather than libjpeg62-dev. Thanks to Bill Allombert for the report and Philipp Kern for the 23.3+1-1.1 NMU which included a patch. (Closes: #633744) * Pass the correct crt-dir to ./configure for multiarch. Thanks to Sven Joachim for the report and the patch, and thanks to Philipp Kern for the 23.3+1-1.1 NMU which included the patch. (Closes: #629567) -- 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. * Don't clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS in configure. Thanks to Peter Fritzsche for the report and Matthias Klose for the patch. (closes: #554324) * Adjust emacsVER-common.README to accommodate new patch headers. Add debian/patch-to-news to handle converting new git-dpm style patch headers to emacsVER-common.README. * Rely on autotools-dev for config.guess and config.sub. * Fix a tty-related preprocessor inclusion error affecting GNU/Hurd systems. Thanks to Samuel Thibault for the report and the patch. (closes: #610576) * Expect 0 from kill() for zombies on GNU/Hurd. This should prevent Emacs from hanging on affected systems. Thanks to Samuel Thibault for the report and the patch. (closes: #611591) * Remove debian/dfsg-splitter since the split is now being handled directly in git. -- 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 Emacs would send the escape sequence to switch to the alternate screen twice. At a minimum, this caused problems with screen. Thanks to Courtney Bane for the report and the patch. (closes: #599463) * Fix the value for RIPEMD-160 in epg-digest-algorithm-alist according to RFC 4880. Thanks to Daniel Kahn Gillmor for the report and the fix. (closes: #594510) -- Rob Browning Sat, 11 Dec 2010 11:00:07 -0600 emacs23 (23.2+1-6) unstable; urgency=low * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since the latter is a virtual package. Thanks to Cyril Brulebois for the report, and thanks to Mehdi Dogguy for the 23.2+1-5.1 NMU. (closes: #600826) -- Rob Browning Fri, 26 Nov 2010 11:34:32 -0600 emacs23 (23.2+1-5) unstable; urgency=low * Apply upstream patches to prevent the string and unibyte-string functions from overflowing the stack (prevent-string-stack-overflow.diff, prevent-let-eval-apply-stack-overflow.diff, and use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff). Thanks to Carl Worth and Sven Joachim for finding the patches (closes: #586459). * Apply upstream patch to prevent mail destined for mail-archive-file-name from being lost (fix-gnus-output-to-mail-with-live-rmail-buffers.diff). Thanks to Jeroen Nijhof for the report and Sven Joachim for tracking down the patch. (closes: #597255) * Remove debian-adjust-mail-from-addresses-patch.diff to stop adjusting the message-sendmail-f-is-evil default. Match the behavior of the Debian gnus package, Emacs upstream, and emacs-snapshot. Thanks to Artem Chuprina for the report. (closes: #397757) * Apply upstream patch to fix the computation of the width of dual-width fonts (fix-fc-dual-font-width-calculation.diff). Thanks to mizuno hajime for the report and Sven Joachim for tracking down the patch. (closes: #588808) -- 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 upstream race condition is fixed. Thanks to Sven Joachim for the report. (closes: #592992) -- Rob Browning Sat, 14 Aug 2010 16:34:11 -0500 emacs23 (23.2+1-3) unstable; urgency=low * Don't try to "mkdir $(infodir)" in doc/*/Makefile.in. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Use -O1 rather than -O2 on ia64. Fixes a build failure (looks like a broken byte compiler) with newer versions of gcc (c.f. #207580). Thanks to Sven Joachim for the report and thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. (closes: #582439) * Remove deprecated Encoding field from emacsVER.desktop. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Use "set -e" rather than "/bin/sh -e" in emacsVER-common.postinst and emacsVER-bin-common.postinst. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Add a Homepage field to debian/control.in. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Remove redundant Section and Priority fields from binary packages in debian/control.in. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Change quilt Build-Depends from (>= 0.42-1) to (>= 0.42). Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Change debhelper Build-Depends from (>=4) to (>= 7.0.50~) to support rules overrides. Thanks to Sven Joachim , and thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Add ${misc:Depends} to debian/control for debhelper. Thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff). Thanks to antoine beaupre for the report and Petr Salinger for the patch. (closes: #559392) -- Rob Browning Sat, 14 Aug 2010 11:57:17 -0500 emacs23 (23.2+1-2) unstable; urgency=low * Respect DESTDIR in doc/misc/Makefile.in. (closes: #581642) -- Rob Browning Fri, 14 May 2010 21:56:27 -0700 emacs23 (23.2+1-1) unstable; urgency=low * New emacs23 packages. * Update debian/dfsg-splitter. * Add dependency on libgconf2-dev and use --without-gconf for emacsFLAVOR-nox and emacsFLAVOR-lucid builds. * Remove patches: patches/fix-dynamic-menus.diff patches/fix-gtk-scroll-bar-events.diff patches/fix-rmail-capitalized-month-names.diff patches/use-zwj-and-zwnj-for-indic-scripts.diff * Refresh remaining patches. -- Rob Browning Thu, 13 May 2010 19:21:32 -0700 emacs23 (23.1+1-9) unstable; urgency=low * Fix binary-only builds (dpkg-buildpackage -B) and conditionalize all packages in dh_auto_install. (closes: #580067) -- Rob Browning Thu, 06 May 2010 22:59:26 -0700 emacs23 (23.1+1-8) unstable; urgency=low * Add automake to Build-Depends. (closes: #580006) -- Rob Browning Sun, 02 May 2010 19:53:36 -0700 emacs23 (23.1+1-7) unstable; urgency=low * Remove Jerome from debian/control Uploaders since he has retired. (closes: #573442) * Support DEB_BUILD_OPTIONS parallel=N. * Follow current autotools-dev recommendations - build-depend on autoconf, remove the automatically generated files in clean, and regenerate them before building. * Update debian/compat from 4 to 7. * Switch to Debian 3.0 (quilt) source format and drop debian/rules "protected_files" handling since we don't build in $(CURDIR) and haven't for a while. * Fix ctags manpage rewriting so that ctags.FLAVOR.1 actually refers to man1/etags.FLAVOR.1 as intended. * Change debian/rules to use "dh $@" approach. * Update emacsFLAVOR-common dpkg dependency to require "dpkg (>= 1.15.4) | install-info" for proper info page handling (Debian Policy 12.2), and remove install-info dependency from packages without info files. * Don't define unix when building emacs (add-unix-to-cpp-undefs.diff). -- Rob Browning Sun, 02 May 2010 10:56:09 -0700 emacs23 (23.1+1-6) unstable; urgency=low * Apply an upstream patch to fix a problem with GTK+ scroll bars. Thanks to Eugen Dedu for the report and Sven Joachim for tracking down the patch. (closes: #560573) * Apply an upstream patch to include ZWJs and ZWNJs for all Indic scripts. Thanks to Praveen A for the report. (closes: #559292) * Fix update-alternatives call for emacs manpage. Thanks to Jörg-Volker Peetz and Sven Joachim for the report. (closes: #552565) -- Rob Browning Tue, 26 Jan 2010 22:51:54 -0800 emacs23 (23.1+1-5) unstable; urgency=low * 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) -- 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, and merge some of the upstream emacs.desktop file info into the Debian files. Thanks to Michael Biebl for the report. (closes: #541173) * Handle the fact that the share/info/emacs-VER/dir{,.old} files may not be created during the install (and so may not need to be removed). This may be the case with dpkg 1.5.4 or newer. Thanks to Sven Joachim for the report and the fix. (closes: 545379) * Add a bit to the emacsVER-lucid description. Thanks to Drew Parsons for the suggestion. (closes: #545263) * Add provides emacs23-gtk to emacs23 as a transition measure (to be deleted in emacs24) to allow more seamless upgrades from the earlier unstable/testing packages. Thanks to Josh Triplett for the suggestion. (closes: #545405) -- Rob Browning Sun, 13 Sep 2009 18:10:28 -0700 emacs23 (23.1+1-3) unstable; urgency=low * Fix overlooked manpage rename in emacsVER.postinst. Thanks to Sven Joachim . (closes: #539926) * Change emacsVER to be the GTK+ version to match the upstream default, and add an emacsVER-lucid package for those who still want the non-GTK+ version. Thanks to Romain Francoise and others for the report. (closes: #539800) * Don't build-depend on libgmp-dev on hurd or kfreebsd. Thanks to Cyril Brulebois . (closes: #541353) * Fix emacsVER.desktop to refer to SVG file instead of incorrect PNG, remove emacs22.png files from unversioned /usr/share/icons directory, and change emacs*.png and emacs*.svg files to emacsVER*.png and emacsVER*.svg. Also use update-alternatives to manage the unversioned names for these files. Thanks to Atsuhito KOHDA for the initial report. (closes: #539851) * Fix Rmail to handle capitalized month names in Date lines, i.e. "Date: Thu, 06 Aug 2009 18:33:32 +0100". Thanks to Jeroen Nijhof for the report and Sven Joachim for the fix. (closes: #540234) -- Rob Browning Thu, 03 Sep 2009 21:55:25 -0700 emacs23 (23.1+1-2) unstable; urgency=low * Add dependencies on install-info to primary binary packages and remove install-info from meta package provides. Thanks to Norbert Preining . (See emacs21 bugs #532600, #532599, #532597, and #532602.) * Add libpm-dev and libdbus-1-dev build dependencies. Thanks to Sven Joachim for reporting this and most of the following additional issues. * Fix a spelling error, fix a menu section error, add a version to the GPL file referred to by debian/copyright, and add a number of debian/emacsVER*.lintian-overrides to quiet long-standing warnings. * Fix update-alternatives to reflect the fact that all the binaries have manpages now. Rename manpages from NAME.1FLAVOR to NAME.FLAVOR.1. * Remove obsolete dependencies and conflicts (w3-el, emacs22 packages, etc.). * Remove explicit install-info calls. Rely on triggers now. * Set debian-emacs-flavor to 'emacs23. Somehow that change didn't make it in to the initial package and it was still set to emacs22. * Search /usr/share/info/emacs-23 rather than /usr/share/info/emacs-22. -- Rob Browning Sun, 02 Aug 2009 19:55:15 -0700 emacs23 (23.1+1-1) unstable; urgency=low * New emacs23 packages. * The debian/dfsg-splitter has been updated. * Patches have been removed or adjusted. -- Rob Browning Sat, 18 Jul 2009 18:41:25 -0700 emacs22 (22.3+1-1) unstable; urgency=low * New upstream release. (closes: #512134) -- Rob Browning Sat, 28 Mar 2009 19:18:43 -0700 emacs22 (22.2+2-5) unstable; urgency=low * Add a build dependency on libasound2-dev which emacs22 is already linked against on i386. This change just makes things consistent across all the relevant platforms. Thanks to Sven Joachim for the fix. (closes: #503054) * Set mail-interactive to t if /usr/bin/mail is not an executable and fakemail is chosen. This should still help avoid silent mail loss, but won't signal an error if the mailer is never invoked. Thanks to Ralf Resack for proposing the fix. (closes: #429059) -- Rob Browning Sun, 09 Nov 2008 12:05:33 -0800 emacs22 (22.2+2-4) unstable; urgency=medium * Fix a security problem related to the invocation of python (CVE-2008-3949). Avoid including the current directory in the module lookup path when invoking python from python.el. Thanks to Sven Joachim and Michael Berg . (closes: #499568) * Invoke xmlstarlet from flymake as xmlstarlet rather than xml. Thanks to Jussi Judin . (closes: #447378) * Fix vc-mode's handling of internal temporary buffers. This should avoid failures when trying to open files under monotone version control. Thanks to Sven Joachim and Michael Berg . (closes: #476108) -- Rob Browning Tue, 14 Oct 2008 21:28:47 -0700 emacs22 (22.2+2-3) unstable; urgency=medium * Fix an insecurity related to fast-lock-cache-directories (CVE-2008-2142). Thanks to Sven Joachim and Morten Welinder . (closes: #480885) * Don't remove /usr/local/share/emacs/site-lisp in emacs22-common. Leave that up to emacsen-common. Thanks to Sven Joachim . (closes: #490524) * Don't prematurely raise an error when trying to save a non-ASCII buffer when select-safe-coding-system-accept-default-p is set to a function. Thanks to Jun Inoue . (closes: #488427) * Don't look for GNU to find etc/. Look for NEWS instead. Thanks to "Bernhard Michler" for the report and Sven Joachim for the fix. (closes: #478240) * Fix a problem in WoMan which caused it to raise an error for a number of manpages. Thanks to Sven Joachim . (closes: #476223) -- Rob Browning Wed, 23 Jul 2008 20:56:33 -0700 emacs22 (22.2+2-2) unstable; urgency=medium * Fix debian-expand-file-name-dfsg and describe-gnu-project (C-h C-p). Thanks to Valery V. Vorotyntsev . (closes: #448391, #477215) * Fix an insecurity in vcdiff's temporary file handling (CVE-2008-1694). Thanks to Moritz Muehlenhoff and Steve Grubb. (closes: #476611) -- Rob Browning Sat, 26 Apr 2008 22:02:40 -0700 emacs22 (22.2+2-1) unstable; urgency=low * Move mh-e.texi here from the non-DFSG package because the license does appear to be DFSG compatible. Thanks to Peter S Galbraith . (closes: #433953) * Add Conflicts and Replaces emacs22-common-non-dfsg (<< 22.2+1-2) to debian/control.in to handle move of mh-e. -- Rob Browning Sun, 20 Apr 2008 13:25:33 -0700 emacs22 (22.2+1-1) unstable; urgency=low * New upstream release. (closes: #473021, #474271) * Move dired-x.texi to the non-DFSG package because the license has changed. * Update debian/copyright to reflect recent changes. * Update debian/dfsg-splitter for new upstream release. * Add libgif-dev to debian/control. Thanks to Sven Joachim . (closes: #472419) -- Rob Browning Thu, 10 Apr 2008 18:41:02 -0700 emacs22 (22.1+1-3) unstable; urgency=low * Incorporate a patch to fix a vulnerability in the handling of file local variables (CVE-2007-5795) (closes: #449008). Thanks to Drake Wilson , and also thanks to Romain Francoise for the 22.1+1-2.1 NMU. [rlb] * Support has been added for GNU/kFreeBSD. Thanks to Petr Salinger (closes: #451178) * Incorporate a patch to fix a a stack-based buffer overflow in the format function which can occur when dealing with high precision values. The overflow could lead to arbitrary code execution (CVE-2007-6109). Thanks to Nico Golde for the 22.1+1-2.2 and 22.1+1-2.3 NMUs. The patch fixes both the CVE (#455432) and a bug introduced by an incomplete initial patch (#456235). * Don't override install-info anymore. (closes: #438695) * Fix a problem with auto save file names. Thanks to Sven Joachim . (closes: #469017) * Fix the switch-to-buffer-other-frame function so that it returns the new buffer. This also means that find-file-read-only-other-frame will now correctly mark the new buffer as read only. Thanks to Sven Joachim . (closes: #457539) -- Rob Browning Sun, 02 Mar 2008 14:22:35 -0800 emacs22 (22.1+1-2) unstable; urgency=low * Fix mail locking patch for Debian's non-Linux architectures. Thanks to Michael Banck . (closes: #433816) [rlb] * Fix control file for binary NMUs. Thanks to Lior Kaplan . (closes: #432957) [rlb] * Fix problem with --no-bitmap-icon with upstream patch. Thanks to Sven Joachim . (closes: #433969) [rlb] * Add build dependency versions of quilt that include support for "header". Thanks to Max Dmitrichenko . (closes: #432695) [rlb] * Incorporate upstream fixes to Emacs manpage. Thanks to Sven Joachim . (closes: #432732) [rlb] * Symlink etc/COPYING and lisp/COPYING to /usr/share/common-licenses/GPL-2. Thanks to Milan Zamazal for the report. (closes: #436810) [rlb] -- Rob Browning Tue, 21 Aug 2007 22:29:09 -0700 emacs22 (22.1+1-1) unstable; urgency=low * New upstream release. (closes: #427279) [rlb] * Change build dependency from libpng3-dev to libpng12-dev. (closes: #424622) [rlb] * If allowed, create and remove non-flavor-specific /usr/local/share/emacs/site-lisp. * Fix cc-mode local variable problem. Thanks to Sven Joachim for forwarding the upstream patch. (closes: #428898) [rlb] * Add desktop file for emacs22-gtk. (closes: #424069) [rlb] * Remove /var/games/emacs/ since Emacs doesn't use it unless update-game-score is setuid and Debian's isn't. (closes: #423948, #430533) [rlb] * New release restores python mode. (closes: #430553) [rlb] * Add /usr/share/info/emacs-22 to Info-default-directory-list before /usr/share/info. (closes: #425924, #429526) [rlb] * Change the desktop file to only use the major version in the name, rather than the full upstream version, so that the string won't change from say 22.0.99 to 22.1. -- Rob Browning Fri, 06 Jul 2007 20:20:15 -0700 emacs22 (22.0.99+1-1) experimental; urgency=low * Update to 22.0.99. -- Rob Browning Sat, 12 May 2007 11:01:29 -0700 emacs22 (22.0.95+1-1) experimental; urgency=low * New emacs22 packages. * The debian/dfsg-splitter has been updated. [rlb] * Obsolete patches have been removed. [rlb] -- Rob Browning Sun, 11 Mar 2007 10:14:16 -0700 emacs21 (21.4a+1-5) unstable; urgency=low * Move man pages back to emacs21-common. (closes: #414321) [rlb] - debian/rules -- Rob Browning Sat, 10 Mar 2007 16:16:15 -0800 emacs21 (21.4a+1-4) unstable; urgency=low * Merge useful bits from Jerome and my orphaned emacs22 tree (which itself was based on Jérôme's snapshot tree) in preparation for upcoming emacs22 branch. Many thanks to Jérôme. A partial summary of these changes follows: Add debian/rules info_subdir variable. Modify desktop and menu files version. This approach should work for normal versions, "Emacs 21.4a (X11)", and for snapshots, "Emacs 2006-09-09 (X11)". See the menu_ver variable in debian/rules. Overhaul debian/rules to build all of the install trees at once and then call the dh_* programs generically rather than calling them once per package. [rlb] - emacsVER-bin-common.postinst - emacsVER-bin-common.prerm - emacsVER-common.postinst - emacsVER-common.prerm - emacsVER.desktop - emacsVER.menu - rules -- Rob Browning Sat, 3 Mar 2007 16:13:23 -0800 emacs21 (21.4a+1-3) unstable; urgency=high * Fix build failure on mipsel. Thanks to Aurelien Jarno . (closes: #401665) [Jérôme Marant] - debian/patches/arch-mipsel.diff: set OUTPUT_ARCH to `mips' instead of `mipsel'. * Changed FSF address in copyright file. [Jérôme Marant] - debian/copyright.in - debian/copyright -- Jerome Marant Thu, 04 Jan 2007 08:31:28 +0100 emacs21 (21.4a+1-2) unstable; urgency=low * Make both emacs21 and emacs21-nox packages suggest non-DFSG packages and fix erroneous emacs21-common dependency on it [Jérôme Marant] - debian/control.in - debian/control * Grab yow mode from the CVS trunk so it is now compatible with yow.lines replacement which also comes from the CVS trunk. (closes: #395501) [Jérôme Marant] - debian/patches/yow-mode-from-cvs.diff: new patch. - debian/patches/series: updated. * Properly handle ldapsearch output from OpenLDAP version 2 and above. Thanks to both Joshua Judson Rosen and Henrik Holmboe . (closes: #381484) [Jérôme Marant] - debian/patches/ldapsearch-output.diff: new patch. - debian/patches/series: updated. * Mention license of both emacs.1 and etags.1 manpages and add a copy of the GFDL to the copyright file (closes: #396875) [Jérôme Marant] - debian/copyright.in - debian/copyright: re-generated. * Fix generation of emacs21-common README.Debian. [rlb] -- Rob Browning Sat, 2 Dec 2006 11:45:44 -0800 emacs21 (21.4a+1-1) unstable; urgency=low * In accordance with the recent General Resolution (http://www.debian.org/vote/2006/vote_001), move all non-DFSG files to new packages that will be included in Debian's non-free section. The debian/dfsg-splitter script has been used to split the upstream archive. (closes: #207932) [rlb] - debian/control.in - debian/copyright.in - debian/dfsg-splitter - debian/emacs-common.README - debian/patches/handle-dfsg-split.diff - debian/patches/series - debian/replacement/yow.lines.uu - debian/rules - debian/missing-file.dfsg: new template file used to generate replacements for non-free files normally accessible through C-h key bindings. Those files will be displayed if the original ones are not available. * Acknowledge NMU. Thanks Marc Brockschmidt (Closes: #381452) [Jérôme Marant] * Separate mipsel from mips autodetection in configure.in [Jérôme Marant] - debian/patches/arch-mipsel.diff: update. * Split mips and mipsel ports into two separate patches [Jérôme Marant] - debian/patches/arch-mips.diff: new file. Add mips-specific code from arch-mipsel+mips.diff patch - debian/patches/arch-mipsel.diff: add mipsel-specific code from arch-mipsel+mips.diff patch - debian/patches/arch-mipsel+mips.diff: remove. * Bump Standards-Version to 3.7.2 [Jérôme Marant] - debian/control.in * Add a new dummy `emacs' package which depends on the latest Emacs release (closes: #82687) - debian/control.in: added new entry for `emacs' package. - debian/control: re-generated. - debian/emacs.*: renamed to debian/emacsVER.* - debian/emacs-*.*: renamed to debian/emacsVER-*.* - debian/rules: changed accordingly. * Remove erroneous semicolon character when reading XBM files. Thanks to Jochen Voss . (closes: #392651) [Jérôme Marant] - debian/patches/xbm-read-erroneous-semicolon.diff: new file. - debian/patches/series: updated. * Properly point to README.Debian.gz from Emacs NEWS file. Thanks to Per Bojsen . (closes: #389063) [Jérôme Marant] - debian/patches/misc-unseparated.diff: updated. -- Rob Browning Wed, 25 Oct 2006 00:40:34 -0700 emacs21 (21.4a-6.2) unstable; urgency=low * Non-maintainer brown paper bag release. * Apply patch from 21.4a-6.1 properly, somehow quilt hates me. -- Marc 'HE' Brockschmidt Wed, 27 Sep 2006 08:30:33 +0200 emacs21 (21.4a-6.1) unstable; urgency=low * Non-maintainer upload. * debian/patches/arch-mipsel+mips.diff: Add patch from Max Kellermann (updated by Thiemo Seufer ) to fix segfaults on mips and mipsel. Thanks for the hard work! (Closes: #381452) -- Marc 'HE' Brockschmidt Wed, 27 Sep 2006 00:13:30 +0200 emacs21 (21.4a-6) unstable; urgency=low * When we create an empty aclocal.m4 after patching (to get around quilt's use of patch -E), make the timestamp match the timestamp of configure.in, so that we won't accidentally re-run autoconf given the dependency in Makefile.in. [rlb]. - debian/rules -- Rob Browning Sun, 14 May 2006 15:24:35 -0700 emacs21 (21.4a-5) unstable; urgency=low * Don't include dpatch.make in debian/rules since the package no longer depends on dpatch. Thanks to Romain Francoise . (closes: #367177) [rlb] - debian/rules -- Rob Browning Sun, 14 May 2006 10:18:04 -0700 emacs21 (21.4a-4) unstable; urgency=low * Migrate from dpatch to quilt and update generation of README. [rlb] - debian/README.in - debian/rules - debian/control.in - debian/patches/* * Change occurrence of "find ... -perm +u+x" to "find ... -perm /u+x". The former is no longer handled the way it used to be, and *doesn't* find all files with execute permission. Thanks to François Fleuret for pointing out the initial problem. [rlb] - debian/rules * Replace $(pwd) with $(CURDIR) in debian/rules. - debian/rules * Remove PACKAGE variable. - debian/rules * Arrange DEB_ vars as recommended by /usr/share/doc/autotools-dev/README.Debian.gz and do the same with DEB_HOST_ARCH and DEB_HOST_GNU_CPU. [rlb] - debian/rules * Use DEB_HOST_GNU_TYPE for the value of target rather than DEB_BUILD_GNU_TYPE. [rlb] - debian/rules * Add $(src_name) and $(flavor) and use them. [rlb] - debian/rules * Remove show-upstream-diffs target (use check-diff instead). [rlb] - debian/rules * Rename orig_tgz and orig_tgz_dir variables to deb_orig_tgz and deb_orig_tgz_dir. [rlb] - debian/rules * Lowercase local makefile variable names. [rlb] - debian/rules * Migrate to debhelper (while consulting Jérôme Marant's work on emacs-snapshot). There may still be a bit to do. [rlb] - debian/rules - debian/changelog - debian/compat - debian/control - debian/control.in - debian/emacs-bin-common.postinst - debian/emacs-bin-common.postrm - debian/emacs-bin-common.prerm - debian/emacs-common.README - debian/emacs-common.docs - debian/emacs-common.postinst - debian/emacs-common.prerm - debian/emacs-el.prerm - debian/emacs.README - debian/emacs.menu - debian/emacs.postinst - debian/emacs.postrm - debian/emacs.preinst - debian/emacs.prerm - debian/rules - debian/README.binpkg.in (moved to debian/emacs.README) - debian/README.in (moved to debian/emacs-common.README) - debian/build-binary-pkg (removed - now handled in debian/rules) - debian/menu.in (moved to debian/emacs.menu) * Change nominal_ver computation to match code in configure.in. [rlb] - debian/rules * Add libxaw7-dev dependency to make sure we get that instead of libxaw8-dev. Thanks to Tollef Fog Heen . (closes: #365597) [rlb] - debian/control.in * Apply an upstream patch to fix an mmap related Hurd build problem. Thanks to Michael Banck . (closes: #347554) [rlb] - debian/patches/series - debian/patches/hurd-mmap.diff -- Rob Browning Sat, 13 May 2006 16:24:05 -0700 emacs21 (21.4a-3) unstable; urgency=low * Disable support for the ppc64 architecture: the patch breaks the powerpc support and does not work on ppc64 any more anyway. (closes: #329459) [Jérôme Marant] - debian/patches/00list: disable arch-ppc64 patch. - debian/patches/autofiles.dpatch: regenerated. -- Rob Browning Sun, 2 Oct 2005 19:00:13 -0700 emacs21 (21.4a-2) unstable; urgency=low * Apply patch applying modifiers to multibyte-char keys. Thanks to Martin Stjernholm (closes: #309963) [Jérôme Marant] - debian/patches/multibyte-char-key-modifiers.dpatch: new file. - debian/00list: updated. * Apply patch supporting the ppc64 architecture. This is a slightly modified patch derived from the Emacs CVS mainline. (closes: #300368) [Jérôme Marant] - debian/patches/arch-ppc64.patch: new file. - debian/00list: updated. * Add real dependency as an alternative to the libtiff-dev build dependency in order for the build to be deterministic. (closes: #311074) [Jérôme Marant] - debian/control.in: add libtiff4-dev as alternative libtiff-dev build dependency. - debian/control: regenerated. * Bump Standards-Version to 3.6.2. [Jérôme Marant] - debian/control.in - debian/control: regenerated. * Use the "kitchen sink" bitmap icon when iconifying the Emacs window. (closes: #309930) [Jérôme Marant] - debian/menu.in: pass the `-i' option to the command launching Emacs under X11. - debian/emacs.desktop: likewise. * Work around bug in Xorg which makes AltGr incorrectly recognized. This patch has been backported from Emacs CVS trunk. [Jérôme Marant] - debian/patches/xorg-altgr-fix.dpatch: new file. - debian/00list: updated. * Apply patch preventing an infinite loop in whitespace.el if kill-read-only is set to t. Thanks to Romain Francoise (closes: #273123) [Jérôme Marant] - debian/patches/whitespace-readonly-infloop.dpatch: new file. - debian/00list: updated. -- Rob Browning Sat, 17 Sep 2005 23:39:52 -0700 emacs21 (21.4a-1) unstable; urgency=medium * New upstream release. (closes: #294313) [Jérôme Marant] - debian/patches/movemail-pop-fmt-vulnerability.dpatch: removed since it has been applied upstream. * Apply patch from Romain Francoise making PCL-CVS compliant with recent versions of CVS. (closes: #291221) [Jérôme Marant] - debian/patches/pcl-cvs-format.dpatch: new file. - debian/00list: updated. - debian/control: tightened dependency on dpatch (>= 2.0.9). * Add MIME type to desktop file. (closes: #296618) [Jérôme Marant] - debian/emacs.desktop: added MimeType entry. * Apply patch supporting the AMD64 architecture. This is a slightly modified patch derived from the Emacs CVS mainline. Thanks to Goswin von Brederlow and amd64 porters. (closes: #248796) [Jérôme Marant] - debian/patches/arch-amd64.patch: new file. - debian/00list: updated. * Hard code leim version in copyright.in for now. with 21.4a the emacs tar.gz name changed, but the leim archive name didn't. [rlb] - debian/copyright.in - debian/copyright * Remove prebuild target from debian/rules. Instead, just issue instructions to the user. [rlb] - debian/rules * Fix invocation of wc -l when counting fns-*.el files. [rlb] - debian/rules * Use dpatch for the autotool related diff rather than generating and applying a diff manually. What was the debian/autofiles.diff is now handled via debian/patches/autofiles.dpatch. Also, we no longer try to automatically generate the diff when needed. Instead, the diff must be generated manually via "debian/rules autofiles-sync". The earlier approach was broken because dpatch files that autofiles.diff depended on could end up later in the Debian diff (and hence have newer timestamps). This would cause an unexpected run of aclocal, etc. and break the buildds. If we ever want to re-automate generation of the autofiles diff, we'll need to use dpatch md5 sigs (or similar) rather than timestamps. (closes: #297796) [rlb] - debian/autofiles.diff: removed - debian/patches/00list: added autofiles - debian/patches/autofiles.dpatch: new - debian/rules: updated -- Rob Browning Tue, 15 Mar 2005 11:00:04 -0600 emacs21 (21.3+1-9) unstable; urgency=high * Modify debian/rules to support using an arch source repository and an archive arrangement somewhat similar to, but not compatible with arch-buildpackage's. [rlb] - debian/rules * Applied patch to fix mailspool pop format string vulnerability (CAN-2005-0100). [rlb] Thanks to Max Vozeler . - debian/patches/movemail-pop-fmt-vulnerability.dpatch -- Rob Browning Thu, 3 Feb 2005 21:02:03 -0600 emacs21 (21.3+1-8) unstable; urgency=medium * Apply patch allowing Emacs to properly interpret logo keys as Meta rather than Meta+Super+Hyper. This problem has been showing up since latest XFree86 and Xorg introducted `fake keys'. Thanks to Denis Barbier (closes: #255286, #274103) [Jérôme Marant] - debian/patches/xfree86-4.3-modifiers.dpatch: new file - debian/patches/00list: updated. * Apply patch fixing long-standing memory leak in decode-coding-region and similar routines. Thanks to Florian Weimer . (closes: #273919) [Jérôme Marant] - debian/patches/coding-region-leak.dpatch: new file. - debian/patches/00list: updated. * Apply patch tightening permissions of local backup copies of remote files. Thanks to Michael Albinus . (closes: #274427) [Jérôme Marant] - debian/patches/remote-files-permissions.dpatch: new file. - debian/patches/00list: updated. -- Rob Browning Sat, 16 Oct 2004 11:10:32 -0500 emacs21 (21.3+1-7) unstable; urgency=medium * set recompile against libtiff4-dev and upload with urgency=medium. (closes: #262828) [rlb] - debian/changelog -- Rob Browning Tue, 3 Aug 2004 11:34:43 -0500 emacs21 (21.3+1-6) unstable; urgency=low * fix debian/README rendering problem. [rlb] * Stop provinding www-browser since the w3-el-e21 package provides it now. [Jérôme Marant] - debian/control.in: remove www-browser provides for emacs and emacs-nox. - debian/control: synced. * Fixed installation of .desktop entry. [Jérôme Marant] - debian/build-binary-pkg: fixed typo. * Set value of the auto-save-file-name-transforms variable at run-time in order to override its build-time value. (closes: #160615, #167295, #175346, #241826, #250676, #178792) [Jérôme Marant] - debian/patches/startup-auto-save-file-name-transforms.dpatch: new file. - debian/patches/00list: updated. * Add Python byte-compiled file extensions to completion-ignore-extensions variable. (closes: #177276) [Jérôme Marant] - debian/patches/python-completion-ignored-extensions.dpatch: new file. - debian/patches/00list: updated. * Fixed removal of alternatives (closes: #251822, #206901, #241820, #163034) [Jérôme Marant] - debian/emacs-bin-common.prerm * Add a slave alternative for "editor" manpage. Thanks to Daniel Kraft . (closes: #255639) [Jérôme Marant] - debian/emacs.postinst * Apply a 2003-06-21 patch from upstream CVS to fix a non-interactive signal handling problem that could cause Emacs to die prematurely as the result of a SIGIO or SIGHUP. (closes: #253887) [rlb] - debian/patches/fix-batch-mode-signal-handling.dpatch - debian/patches/00list * Add warning message to prepare-release explaining that you have to run it as a normal user (not root). [rlb] - debian/rules -- Rob Browning Mon, 26 Jul 2004 10:27:10 -0500 emacs21 (21.3+1-5) unstable; urgency=low * Apply patch allowing emacsclient to handle ALTERNATE_EDITOR properly when the command is run without any parameter [Jérôme Marant] (closes: #219658) - debian/patches/emacsclient-alternate-editor.dpatch: new file. * Provide the `editor' virtual package. [Jérôme Marant] (closes: #66243, #90154, #158807) - debian/control.in: emacs and emacs-nox now provide the `editor' virtual package. - debian/control: synchronized with debian/control.in. - debian/emacs.postinst: adding an `editor' alternative with a priority of 0 as discussed in http://lists.debian.org/debian-policy/2000/debian-policy-200006/msg00122.html - debian/emacs.prerm: removing the `editor' alternative on package removal. * Added automatic switching to UTF-8 encoding when editing the debian changelog file. [Jérôme Marant] - debian/changelog: added Emacs local variables forcing coding to UTF-8. * Fix handling of menu entry for text version of Emacs [Jérôme Marant] (closes: #221171) - debian/menu.in: call the text version of emacs with the `-nw' parameter. * Install the emacsclient manpage [Jérôme Marant] (closes: #222767) - debian/build-common-pkg: install missing emacsclient manpage. - debian/emacs-common.postinst: install alternative for emacsclient manpage. * Install .desktop entry in order to make Emacs easy to start in both GNOME and KDE. Thanks to Adam C Powell IV [Jérôme Marant] (closes: #233711) - emacs.desktop: new template file for desktop entries - debian/rules: generate desktop file from emacs.desktop template and install it for emacs21. * test -n "${major_ver}" in a few places so that we don't accidentally generate bad output files from our .in files. [rlb] - debian/rules * truncate aclocal.m4 during autofiles-sync so that old bits won't kill new autoconf run. Also ignore autom4te.cache when generating autofiles.diff. [rlb] - debian/rules * fix bug in prepare-release autodiff prompt handling. [rlb] - debian/rules * update configure.in for newer autoconf versions. [rlb] - autoconf-updates.dpatch * add an emacsXY-bin-common package containing all the architecture specific bits, so that emacsXY-common can be architecture independent. This should save many megabytes * architectures in the debian pool. [rlb] (closes: #232888, #233345) - debian/rules: move some build-* code from debian/ scripts to rules and adjust to build emacsXY-bin-common. - debian/emacs-common.postinst debian/emacs-common.prerm: some code moved to new emacs-bin-common scripts. - debian/emacs-common.postrm: deleted. - debian/emacs-bin-common.postinst: new file. - debian/emacs-bin-common.prerm: new file. - debian/emacs-bin-common.postrm: new file. - debian/build-common-pkg: deleted - code now in debian/rules. - debian/build--pkg: deleted - code now in debian/rules. - debian/emacs-el.postinst: deleted - was empty. - debian/control.in: add emacsXY-bin-common and adjust other entries. - debian/fix-debian-scripts: deleted - no longer used. - debian/build-binary-pkg: adjusted to handle more of the common code. * Add support for linux 2.6 to ACPI in lisp/battery.el. Thanks to Mario Lang [Jérôme Marant] (closes: #228658) - debian/patches/battery-acpi-support.dpatch: updated. * Generate md5sums file for every package [Jérôme Marant] (closes: #22590) - debian/rules: generate md5sums file just before building packages. - debian/build-binary-pkg: likewise. * no point in byte-compiling fns-*.el according to upstream authors (closes: #189277) * fix configure args (--build alone doesn't seem to work anymore). [rlb] - debian/rules * re-enable gif support via libungif. [rlb] - debian/rules * re-enable toolkit scrollbars, but make it really easy for people to disable them in debian/rules. Search for --without-toolkit-scrollbars. [rlb] - debian/rules - debian/README.in * fix problem with upgrades by adding emacs21-common (<< 21.3+1-4) to Replaces for the common packages. [rlb] - debian/control.in - debian/control -- Rob Browning Tue, 6 Apr 2004 18:07:38 -0500 emacs21 (21.3+1-4) unstable; urgency=medium * debian/changelog: converted to UTF-8 as per Policy. [Jérôme Marant] * debian/control.in: - Bumped Standards-Version to 3.6.1. [Jérôme Marant] - Added versioned build-dependency on dpatch >= 1.23 since this version no longer requires numerial prefixes to dpatches. [Jérôme Marant] * debian/patches/*.dpatch: removed numerical prefix since the patch order is specified in debian/patches/00list. [Jérôme Marant] * debian/patches/hurd-libio-glibc.dpatch: new patch allowing Emacs to be built on Hurd systems using a libio-based glibc. Thanks to Markus Brinkmann . (closes: #143220) [Jérôme Marant] * debian/patches/battery-acpi-support.dpatch: new patch adding ACPI support to lisp/battery.el. Thanks to Mario Lang . (closes: #208812) [Jérôme Marant] * debian/patches/scroll-margin.dpatch: new patch preventing emacs to hang with a non-0 scroll-margin set. (closes: #175658) [Jérôme Marant] * debian/patches/save-buffer.dpatch: new patch fixing a bug which makes a file being removed when the coding system of its buffer has changed and saving the changes was canceled. (closes: #194171) [Jérôme Marant] * debian/patches/00list: updated with respect to new patches. [Jérôme Marant] * debian/menu.in: - Added hints to menu entries. (closes: #144282) [Jérôme Marant] - Changed titles for both text and X11 entries in order to differenciate them. (closes: #197527, #188598) [Jérôme Marant] * debian/patches/browse-url.dpatch: - Updated patch fixing a wrong call to galeon. Thanks to Mikael Hedin . (closes: #208206) [Jérôme Marant] - Updated patch fixing browse-url's invocation of Mozilla. Thanks to Jeff Sheinberg , Martin Pool and KATO Kazuyoshi . (closes: #148408, #216067) [Jérôme Marant] * Use -O1 rather than -O2 on m68k. Fixes a build failure (looks like a broken byte compiler) with newer versions of gcc. (closes: #207580) -- Rob Browning Fri, 31 Oct 2003 00:00:10 -0600 emacs21 (21.3+1-3) unstable; urgency=low * create debian/stmap it doesn't exist. (closes: #210802) -- Rob Browning Sat, 13 Sep 2003 14:49:18 -0500 emacs21 (21.3+1-2) unstable; urgency=low * add back accidentally removed dpatch Build-Depends. (closes: #210627) -- Rob Browning Fri, 12 Sep 2003 10:30:21 -0500 emacs21 (21.3+1-1) unstable; urgency=low * repackage without .elc files since we regenerate all of them anyway. This will save space, and will also allow us to use dpatch in a straightforward way. * modify debian/rules computation of version numbers to handle (i.e. ignore) the +1 in 21.3+1. * rework to use dpatch and to patch/unpatch the debian source in-place rather than using a debian/build-src copy of the whole source tree. * incorporated patch (500-detect-coding-iso2022.dpatch) to fix raw-text coding problem. Thanks to Kenichi Handa . (closes: #198736) -- Rob Browning Thu, 11 Sep 2003 23:15:44 -0500 emacs21 (21.3-2) unstable; urgency=low * Compile --without-toolkit-scroll-bars for now (my pref, and to avoid xaw3d issues for the moment). * Update copyright to reflect documentation licenses. (closes: #161500) -- Rob Browning Wed, 13 Aug 2003 08:53:35 -0500 emacs21 (21.3-1) unstable; urgency=low * new upstream version. -- Rob Browning Wed, 23 Apr 2003 13:16:06 -0500 emacs21 (21.2-6) unstable; urgency=low * changed sort behavior for x-vs-no-x fix in cus-dep.el based on suggestion from Matt Kraai . (closes: #166139) * finish breaking up most of the debian/patch/* files. * set up automatic generation for autofiles.diff which contains all the diffs to automatically generated files and is applied after all of the debian/patch/*.diff files. * add an apply-patches-upto command so it's easier to create partially patched trees for editing. -- Rob Browning Thu, 6 Feb 2003 18:12:41 -0600 emacs21 (21.2-5) unstable; urgency=low * fix bug in rules and binary-pkg generation. (closes: #164770) * fix problem with config.sub and config.guess updates. (closes: #164763) * time to stop creating the /usr/doc symlinks... -- Rob Browning Tue, 15 Oct 2002 16:34:52 -0500 emacs21 (21.2-4) unstable; urgency=low * create debian/patches/ and start migrating to represent changes as patches against the upstream source. Don't edit the main tree anymore. * rework tree and packaging to have emacs21-common, emacs21, and emacs21-nox packages with emacs21-common containing nearly all the data. -- Rob Browning Sat, 12 Oct 2002 15:09:37 -0500 emacs21 (21.2-3) unstable; urgency=low * Update emacs21-nox package description. -- Rob Browning Wed, 29 May 2002 14:04:57 -0500 emacs21 (21.2-2) unstable; urgency=low * fix control file priorities to match overrides. * fix rules to handle autotools more correctly. See /usr/share/doc/autotools-dev/README.Debian.gz for details. (closes: #139998) * firewall, headless box, and anti-X users everywhere rejoice! Introducing emacs21-nox package :> -- Rob Browning Tue, 28 May 2002 12:09:48 -0500 emacs21 (21.2-1) unstable; urgency=low * new upstream release. * move outline of Debian specific Emacs changes to /usr/share/doc/*/README.Debian.gz.x -- Rob Browning Fri, 22 Mar 2002 11:41:17 -0600 emacs21 (21.1-9) unstable; urgency=low * fix control.in to use ${Source-Version}. (closes: #138994) -- Rob Browning Mon, 18 Mar 2002 21:54:47 -0600 emacs21 (21.1-8) unstable; urgency=low * Fix .texi problems with upstream patch. (closes: #138236) -- Rob Browning Sun, 17 Mar 2002 11:58:59 -0600 emacs21 (21.1-7) unstable; urgency=high * fix vc-path to be correct for a Debian system. (closes: #120079) * re-add lost hppa and s390 patches. (closes: #107251) -- Rob Browning Thu, 6 Dec 2001 14:10:45 -0600 emacs21 (21.1-6) unstable; urgency=medium * modify order in browse-url.el. * added upstream iso-acc.el patch to fix accent bug. (closes: #119852) * fix ppc nocombreloc bug with upstream patch. (closes: #117557) -- Rob Browning Tue, 4 Dec 2001 08:43:38 -0600 emacs21 (21.1-5) unstable; urgency=low * Run autoconf to remove stale ppc code. (closes: #119189) * Write new browse-url.el code with support for galeon and to default to searching for a suitable browser, free browsers first. (closes: #116822) -- Rob Browning Tue, 13 Nov 2001 09:51:31 -0600 emacs21 (21.1-4) unstable; urgency=low * Really fix alternatives problem this time. -- Rob Browning Fri, 9 Nov 2001 10:24:49 -0600 emacs21 (21.1-3) unstable; urgency=low * Fix but in grep in postinst. (closes: #117251, #117256, #117415, #118792) * Remove vestigal ppc bits and add upstream patch for ppc nocombreloc problem. (closes: #117557) * fix bug in upstream-files.tar handling. * don't configure gif support until our libungif is new enough. See bug #117729. * Fix manpage to list correct default window size. (closes: #118641) -- Rob Browning Thu, 8 Nov 2001 21:15:20 -0600 emacs21 (21.1-2) unstable; urgency=low * change to priority optional. * use xaw3d scrollbars after checking upstream preferences. (closes: #116831, #116911, #116638) * added some build-depends. (closes: #116981) * fixed typo in NEWS. (closes: #116814) * fixed alternatives bug in postinst/prerm for emacsclient (closes: #116915) -- Rob Browning Thu, 25 Oct 2001 16:02:45 -0500 emacs21 (21.1-1) unstable; urgency=low * New emacs21 packages. Many changes -- reviewed all Debian files. -- Rob Browning Thu, 18 Oct 2001 17:28:03 -0500 emacs20 (20.7-10) unstable; urgency=medium * Add arch header for mipsel and fix configure.in and configure. (closes: #103959) -- Rob Browning Mon, 23 Jul 2001 09:23:06 -0500 emacs20 (20.7-9) unstable; urgency=low * Added more Build-Depends. (closes: #101832) * Disable ralloc on Hurd. Thanks to Robert Bihlmeyer . (closes: #101926) -- Rob Browning Tue, 10 Jul 2001 12:48:22 -0500 emacs20 (20.7-8) unstable; urgency=low * Added ia64 patches from Bdale Garbee for ia64.h. (closes: #90518) * Added Build-Depends on mailx for now (though this is *wrong* for the long run -- I need to fix my fakemail handling). (closes: #95903, #96761) * Fix fakeroot sgid problem (move movemail chmod +s in debian/rules). * Remove emacs' overzealous dir.gz file. * Shrink gnu.xpm to 32x32 and make it the menu icon. (closes: #20253, #21310) * Update manpage to not refer to kitchen sink anymore -- though with emacs21, we're going to move back to using whatever they choose. (closes: #81682) -- Rob Browning Wed, 13 Jun 2001 23:56:16 -0500 emacs20 (20.7-7) unstable; urgency=low * Fixed reftex-info problem. (closes: #44837). * Fix install-strip target in Makefile.in. Thanks to Kalle Olavi Niemitalo . (closes: #51348) -- Rob Browning Sat, 5 May 2001 23:50:50 -0500 emacs20 (20.7-6) unstable; urgency=low * Fix improper usage of dpkg-statoverride and make sure movemail is set up right. (closes: #95953) * Fix bad manpage location in postinst update-alternatives call. * Fix bad .so in ctags manpage (closes: #88231, #45317, #65017, #74570) -- Rob Browning Sat, 5 May 2001 09:47:40 -0500 emacs20 (20.7-5) unstable; urgency=low * configure.in: add detection of CONF_MAIL_PROGRAM_NAME. * lib-src/fakemail.c: use CONF_MAIL_PROGRAM_NAME when appropriate (closes: #72103) -- need to forward upstream. * Add "modified by Debian" clause to (emacs-version) at RMS's request. * Start Debian modifications section in copyright file as per policy. * Add build fixes for hurd (closes: #78461). Changes suggested by Marcus.Brinkmann@ruhr-uni-bochum.de. Thanks. * Switch from Debian sendmail.el hack to Francesco's suggestion of setting mail-from-style to 'system-default by default at startup (closes: #35128). This allows the user to override when desired in the normal way. This should be discussed with the upstream maintainers. They may be amenable to making this the default on Debian systems. * add dependency on dpkg (>= 1.9.0) for new install-info. * info pages should finally work right (or at least closer to right). They're now installed in /usr/share/info/emacs-20/ under their normal names, and install-info can add the appropriate (emacs-20/emacs), etc. entries to /usr/share/info/dir. This hopefully closes a bunch of old bugs. (closes: #64994, #64512, #64025, #62155, #59332, #51163, #40443) * No more files in /usr/doc. (closes: #91454, #63768) * /usr/man moved to /usr/share/man. (closes: #91149) * This should be fixed, in addition we've switched to dpkg-statoverride (closes: #73007) * /usr/share/info/dir.gz should be gone. (closes: #75594, #68551, #65012) -- Rob Browning Sun, 29 Apr 2001 22:03:33 -0500 emacs20 (20.7-4) unstable frozen; urgency=low * Upload to unstable *and* frozen since this fixes outstanding grave bugs. -- Rob Browning Thu, 27 Jul 2000 16:21:15 -0500 emacs20 (20.7-3) unstable; urgency=low * Change code to rebuild *all* the install tree .elc files at build time. This should fix the grave problems with gnus trashing mail at the expense of more CPU at build time. -- Rob Browning Wed, 19 Jul 2000 20:27:27 -0500 emacs20 (20.7-2) frozen unstable; urgency=low * Revert to setting debian-emacs-flavor in startup.el as per recent flip-flop in debian-emacs-policy :< This was a *tiny* source change, and definitely has to go into frozen - too much breaks otherwise. -- Rob Browning Tue, 20 Jun 2000 11:31:29 -0500 emacs20 (20.7-1) frozen unstable; urgency=low * New upstream bug-fix version. Fixes security bugs, among others. * Removed some now redundant Debian patches. -- Rob Browning Sat, 17 Jun 2000 12:59:48 -0500 emacs20 (20.6-3) unstable frozen; urgency=medium * Temp fix for alpha corruption problem in cm/src.h src/termcap.c, src/terminfo.c, and src/sysdep.c (forwarded bug 63993). -- Rob Browning Mon, 12 Jun 2000 18:55:22 -0500 emacs20 (20.6-2) frozen unstable; urgency=low * Make sure info files get registered after /usr/share migration. -- Rob Browning Fri, 12 May 2000 15:30:02 -0500 emacs20 (20.6-1) frozen unstable; urgency=low * Let emacsen-common handle setting debian-emacs-flavor and modify "Depends:" accordingly. * Maintainer release of 20.6 - fixes same issues as 20.6-0.1, so it should go into frozen. * Move info files to /usr/share/info. * Make sure .elc files for .el files we've modified are *always* rebuilt. * Add new unexelf.c from Gerd Moellmann . Without this, emacs20 will *not* build on either frozen or unstable x86 machines. -- Rob Browning Fri, 12 May 2000 11:00:33 -0500 emacs20 (20.6-0.1) frozen unstable; urgency=low * Non-maintainer release. * New upstream bug fix release (closes:#60931). * ARM support merged upstream. * Add security patches from RUS-CERT posting on BugTraq. * postinst: Use 2775 as directory permissions in /usr/local (closes:#59919) -- Joel Klecker Wed, 26 Apr 2000 11:26:28 -0700 emacs20 (20.5a-2) unstable; urgency=low * Check in a bogus modification to all the .el files that we modified before 20.5a so that new .elc files with our changes will be generated when we build. This must be done every time an upstream change is merged in. -- Rob Browning Tue, 28 Dec 1999 19:51:14 -0600 emacs20 (20.5a-1) unstable; urgency=high * Upstream version number is just fine (20.5a *is* newer than 20.5). Switch to use it. -- Rob Browning Wed, 22 Dec 1999 11:12:44 -0600 emacs20 (20.4.pre20.5a-1) unstable; urgency=high * New upstream version, including some Y2K fixes. * Use weird version to avoid epochs. This is upstream 20.5a. -- Rob Browning Wed, 22 Dec 1999 00:16:52 -0600 emacs20 (20.4-3) unstable; urgency=low * Fix mistake in this file. Fix bug number in architecture dependency "closes" in last revision. * Powerpc configure.in patch from Susumu OSAWA . (Should close bug 48997, but marked forwarded instead until patch is resolved upstream.) * Jargon problems apparently fixed. (closes: #31103 #37030) * Gnus printing problems apparently fixed (closes: #20760) * Fix manpage to refer to more accurate Debian file locations. (closes: #35267) * cperl-mode problem apparently fixed. (closes: #46739) * Fix build stripping problem (use INSTALL_STRIP=-s rather than INSTALL_PROGRAM="install -s"). -- Rob Browning Sat, 4 Dec 1999 19:24:07 -0600 emacs20 (20.4-2) unstable; urgency=low * Modify mail-spool-directory/movemail patch in preparation for upstream inclusion. * Fix architecture dependency. (closes: #48997) -- Rob Browning Fri, 12 Nov 1999 17:59:01 -0600 emacs20 (20.4-1) unstable; urgency=low * New upstream version. * I decided to go ahead and get this out without the major overhaul that's coming, but I'm going to be working more tightly the core upstream developers from now on, so there will be some more substantial changes soon, including getting rid of more Debianisms and double checking all our current patches. * Fix movemail liblockfile detection to be non-Debian specific (currently working out the appropriate upstream patch (see etc/NEWS)). * Fix emacs to support a --with-mail-spool-directory configure option and to automagically detect the right answer most of the time without it (currently working out the appropriate upstream patch (see etc/NEWS)). * Add the lisp-level variable mail-spool-directory which always contains the location of the mail spool, and hack movemail, nnmail, rmail, and friends to use it (currently working out the appropriate upstream patch (see etc/NEWS)) . * hexl-mode bug fixed upstream. (closes: #21762) -- Rob Browning Sat, 30 Oct 1999 13:24:39 -0500 emacs20 (20.3-11) unstable; urgency=low * Fix liblockfile version skew. (closes: #43803 #45123) -- Rob Browning Thu, 23 Sep 1999 13:27:00 -0500 emacs20 (20.3-10) unstable; urgency=low * Restructure debian/rules to build -el in binary-indep (closes: #26761) * Add emacsclient.1 manpage submitted ages ago. (closes: #22463) * Handle duplicate DOC files (closes: #27668) * Switch to gnu icon from old B&W drippy sink (closes: #33260) -- Rob Browning Tue, 6 Jul 1999 23:21:44 -0500 emacs20 (20.3-9) unstable; urgency=low * Added HURD patch from Marcus Brinkmann . (closes: #38571). * Backed out (global-set-key [delete] 'delete-char) modification (Ref: #26366). This is too controversial (think cross-platform) and needs to be resolved by the Debian Keyboard Czar in concert with others. For now we revert to the upstream behavior... * Add /usr/share/info to info search path (closes: #38285). -- Rob Browning Fri, 11 Jun 1999 00:43:51 -0500 emacs20 (20.3-8) unstable; urgency=low * Added patch to emacs.c from Wolfram Gloger to fix exit segfaults. (closes: #37745) * Fixed suidregister inconsistency between postinst and postrm (closes #36845) -- Rob Browning Sun, 30 May 1999 14:38:51 -0500 emacs20 (20.3-7) unstable frozen; urgency=low * Needed to go to frozen too: --print-architecture was an important bug. Should be OK since other fixes since -5 are minor and important. * Add conflict with w3-el (as per Ben Pfaff's request). (closes: #30413). * Undo broken (and unneeded) "fix" for suidregister call in postrm. -- Rob Browning Thu, 28 Jan 1999 14:49:27 -0600 emacs20 (20.3-6) unstable; urgency=low * Use --print-installation-architecture rather than --print-architecture (closes: #28177). * Remove "#undef SIGIO" from m/arm.h as indicated by David Welton (closes: #31279). * Fix call to suidunregister (I didn't realize that it can't take multiple file arguments) (closes: #21243 #26886). -- Rob Browning Wed, 27 Jan 1999 11:50:14 -0600 emacs20 (20.3-5) frozen unstable; urgency=low * Added NetWinder patches (closes: #28277). (Thanks to David Welton) * Rebuilt emacs20-el so the versions coincide. In the future, people need to be sure to build *both* binary packages when doing a non-maintainer binary release. (This fix justifies inclusion into frozen). -- Rob Browning Sun, 1 Nov 1998 20:14:36 -0600 emacs20 (20.3-4) unstable; urgency=low * Fix gnus to default to /var/spool/mail rather than /usr/spool/mail for mailbox locations (closes: #21364). -- Rob Browning Sat, 17 Oct 1998 14:28:45 -0500 emacs20 (20.3-3) unstable; urgency=low * Fixed leim. All the input methods should work now (closes: #27398). * Made (global-set-key [delete] 'delete-char) the default (closes: #26366). * Fix ownership on emacs20-el files (closes: #27398). -- Rob Browning Tue, 13 Oct 1998 16:57:51 -0500 emacs20 (20.3-2) unstable; urgency=low * Added 20.2 patches for powerpc. I omitted the patches to the following files because it looks like equivalent fixes have already made it into 20.3. If anyone who understands that code better knows differently, please let me know. The rest of the patches applied cleanly. src/callproc.c.rej src/dired.c.rej src/fileio.c.rej src/process.c.rej src/regex.c.rej I also modified src/m/powerpc.h to fix problems calling the ldscript. -- Rob Browning Mon, 7 Sep 1998 18:20:41 -0500 emacs20 (20.3-1) unstable; urgency=low * New upstream version. * Modify all the debian/* stuff to automatically track version changes. * Major changes to info page handling. Emacs20 info is now integrated into the main info page. This was the best way I could think of to handle cross references, etc. without major source changes. * Locked emacs20-el and emacs20 package versions together with dependencies. * Add info direntries for widget, info, and customize. * Fix handling of /usr/local/share (which was badly broken). * Turn stripping back on. It appears to work. -- Rob Browning Tue, 1 Sep 1998 11:44:04 -0500 emacs20 (20.2-9) unstable; urgency=low * Fixes for leim problems (closes: #25536). Thanks to Junio Hamano * update-elc now made executable (closes: #25899). Thanks to Junio Hamano * Fix problem with package including dirs in /usr/local/share (closes: #23431). -- Rob Browning Sat, 22 Aug 1998 11:45:16 -0500 emacs20 (20.2-8) unstable; urgency=low * Regenerate .elc files for .el files we've modified. I didn't realize that some of the .elc files were in the upstream tar file. Hope this doesn't break anything. We haven't been using our sendmail and message modifications until now. (closes: #21079). * Fix i386ism in debian scripts use "dpkg --print-architecture" instead. (closes: #20548). * Fixed reference in README.add-on-package-maintainers (closes: #23445) * Fix some alpha problems (closes: #21834). * Had to add Replaces: emacs20 to emacs20-el to fix problem with copyright files being in the wrong package (closes: #21531). -- Rob Browning Fri, 7 Aug 1998 20:39:59 -0500 emacs20 (20.2-7) frozen unstable; urgency=low * Changed emacs20-el from standard to optional. * Fixed broken postrm (release critical) (closes: #24236) * Don't strip emacs binary (strip is broken see binutils #23153). * Since we can't strip, don't compile or link with "-g". -- Rob Browning Thu, 16 Jul 1998 16:58:04 -0500 emacs20 (20.2-6) frozen unstable; urgency=low * Gack. Fix reject due to changed .tar.gz file (./leim added to tar). -- Rob Browning Wed, 8 Apr 1998 14:04:54 -0500 emacs20 (20.2-5) frozen unstable; urgency=low * Make sure to preserve timestamps on .el files in emacs20-el (closes: #20274) * Add leim support for alternate input methods. May close several bugs. -- Rob Browning Sun, 5 Apr 1998 10:38:20 -0500 emacs20 (20.2-4) frozen unstable; urgency=low * Added copright file to emacs20-el package (closes: #19300) * suidmanager doesn't understand symbolic perms (closes: #18448, #19213) -- Rob Browning Fri, 13 Mar 1998 13:01:07 -0600 emacs20 (20.2-3) unstable; urgency=low * Fixed problem with permissions on /usr/share/emacs/20.2/site-lisp/ (closes: #18717) -- Rob Browning Mon, 2 Mar 1998 12:02:33 -0600 emacs20 (20.2-2) unstable; urgency=low * fixed bad menu line (closes: #18362). -- Rob Browning Thu, 19 Feb 1998 10:52:58 -0600 emacs20 (20.2-2) unstable; urgency=low * Explicit dependency on liblockfile0 until bug is fixed (closes #18186) * added lisp/site-lisp.el to fix info path problem (closes #18190) -- Rob Browning Sat, 14 Feb 1998 19:19:09 -0600 emacs20 (20.2-1) unstable; urgency=low * movemail no longer suid -- not needed. * start from scratch with emacs-20.2 source and old emacs-19.34 and xemacs patches. -- Rob Browning Tue, 16 Dec 1997 01:20:27 -0600 debian/rules0000775000000000000000000005324312306371466010267 0ustar #!/usr/bin/make -f # -*- makefile -*- # This file is licensed under the terms of the Gnu Public License. # With the one additional provision that Ian Jackson's name may not be # removed from the file. # Copyright 1994,1995 Ian Jackson # Copyright 2004-2005 Jrme Marant # Copyright 1998-2013 Rob Browning # Originally copied from the GNU Hello Debian rules file (1.3). # Modified for emacs by Mark Eichin . # Debhelper support added via one of Joey Hess' example files. # See the debian/changelog for further historical information. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 SHELL := /bin/bash quilt := QUILT_PATCHES=debian/patches quilt pf := set -o pipefail # This package uses debian/source/format 3.0 (quilt). # For now we assume that emacs' versioning scheme is always # MAJOR.MINORtinyrev where MAJOR and MINOR are integers and tinyrev is # an optional lowercase letter (or letters). We also assume that # upstream uses a numbering scheme that sorts in a "Debian friendly" # way. So far that's always been true. If it becomes false, some of # the values below will have to be set manually. # (You might imagine that a VPATH build would allow us to avoid having # to copy the entire source tree for each of the three builds, but it # turns out that without additional complexity, VPATH builds will # cause diff bloat. That's because the emacs build process doesn't # completely respect the .elc files; some are modified in srcdir, not # builddir.) # The official upstream version defined by AC_INIT in configure.in. upstream_ver := $(shell debian/upstream-version) ifeq (,$(upstream_ver)) $(error 'Unable to find upstream version number.') endif # This must be the version that's actually used at runtime for things # like load-path. It may not be the same as the upstream version # (i.e. when you have upstream 20.5a, the functional version may still # be 20.5), so sometimes we may have to do this by hand. runtime_ver := $(shell $(pf); echo $(upstream_ver) | perl -pe 's/[a-z]+$$//o') major_ver := $(shell $(pf); echo $(runtime_ver) | perl -pe 's/\..*$$//o') minor_ver := $(shell $(pf); echo $(runtime_ver) | perl -pe 's/^[^.]*\.//o') # The name of the Debian source package src_name := $(shell $(pf); dpkg-parsechangelog | egrep '^Source:') src_name := $(shell $(pf); echo $(src_name) | perl -pe 's/Source:\s+//o') # The version from the changelog (i.e. 20.5-1) debian_ver := $(shell $(pf); dpkg-parsechangelog | egrep '^Version:') debian_ver := $(shell $(pf); echo $(debian_ver) | perl -pe 's/Version:\s+//o') # The Debian revision (i.e. the 1 from 20.5-1) # Always everything after the last '-' debian_rev := $(shell $(pf); echo $(debian_ver) | perl -pe 's/.*-//o') # Might be 21.3, or it might be 21.3+1 if we've had to have more than # one re-release of the upstream source (rare, but it happens), or if # we have to split the package for DFSG purposes. Always everything # before the last '-' debsrc_ver := $(shell $(pf); echo $(debian_ver) | perl -pe 's/-[^-]+$$//o') # The flavor (i.e. emacs21) currently matches the source package name. flavor := $(src_name) info_subdir := emacs-$(major_ver) ###################################################################### # Customizable variables bin_priority := 27 # This might also be something like 2006-09-09 for snapshots. menu_ver := $(major_ver) ###################################################################### # Should these be exported like this (as autotools-dev recommends for # the two vars below) or not? export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) export DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) # As recommended by /usr/share/doc/autotools-dev/README.Debian.gz. # Handle cross-compiling and don't make ./configure guess. export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter $(DEB_HOST_ARCH),ia64)) # Fix a problem with newer versions of gcc on ia64. # See bugs #582439 and #679986. CFLAGS += -O1 endif # eq ia64 endif joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ifeq (,$(joblimit)) joblimit := 1 endif target := $(DEB_HOST_GNU_TYPE) movemail_bin := usr/lib/emacs/$(runtime_ver)/$(target)/movemail # Info files that are going to show up in the main dir. main_dir_info_files := efaq.info # Files that the build stage depends on (may also be listed in other vars). persistent_autogen_build_files := debian/control debian/copyright nonpersistent_autogen_build_files := # These files must always exist, i.e. can't ever be cleaned. persistent_autogen_install_files := nonpersistent_autogen_install_files := \ debian/$(flavor)-bin-common.lintian-overrides \ debian/$(flavor)-bin-common.postinst \ debian/$(flavor)-bin-common.prerm \ debian/$(flavor)-common.README.Debian \ debian/$(flavor)-common.docs \ debian/$(flavor)-common.lintian-overrides \ debian/$(flavor)-common.postinst \ debian/$(flavor)-common.prerm \ debian/$(flavor)-nox.README.Debian \ debian/$(flavor)-nox.lintian-overrides \ debian/$(flavor)-nox.menu \ debian/$(flavor)-nox.postinst \ debian/$(flavor)-nox.prerm \ debian/$(flavor)-lucid.README.Debian \ debian/$(flavor)-lucid.desktop \ debian/$(flavor)-lucid.lintian-overrides \ debian/$(flavor)-lucid.menu \ debian/$(flavor)-lucid.postinst \ debian/$(flavor)-lucid.prerm \ debian/$(flavor).README.Debian \ debian/$(flavor).desktop \ debian/$(flavor).menu \ debian/$(flavor).lintian-overrides \ debian/$(flavor).postinst \ debian/$(flavor).prerm autogen_build_files := \ $(nonpersistent_autogen_build_files) $(persistent_autogen_build_files) autogen_install_files := \ $(nonpersistent_autogen_install_files) $(persistent_autogen_install_files) persistent_autogen_files := \ $(persistent_autogen_build_files) $(persistent_autogen_install_files) nonpersistent_autogen_files := \ $(nonpersistent_autogen_build_files) $(nonpersistent_autogen_install_files) # Build directories pkgdir_common := $(CURDIR)/debian/$(flavor)-common pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common pkgdir_x := $(CURDIR)/debian/$(flavor) pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox pkgdir_lucid := $(CURDIR)/debian/$(flavor)-lucid pkgdir_el := $(CURDIR)/debian/$(flavor)-el install_dir_x := $(CURDIR)/debian/install-x install_dir_nox := $(CURDIR)/debian/install-nox install_dir_lucid := $(CURDIR)/debian/install-lucid local_lpath := /etc/$(flavor):/etc/emacs local_lpath := $(local_lpath):/usr/local/share/emacs/$(runtime_ver)/site-lisp local_lpath := $(local_lpath):/usr/local/share/emacs/site-lisp local_lpath := $(local_lpath):/usr/share/emacs/$(runtime_ver)/site-lisp local_lpath := $(local_lpath):/usr/share/emacs/site-lisp # Installation local_lpath local_lpath_install \ := $(pkgdir_common)/$(subst :,:$(pkgdir_common)/,$(local_lpath)) define testdir dh_testdir debian/emacsVER.postinst endef # If we ever need to do the stripping outside of dh_strip, just add an # INSTALL_STRIP="-s" to the make vars below. define emacs_inst $(MAKE) -C debian/$(1) install \ DESTDIR=$(2) \ infodir=/usr/share/info/emacs-$(major_ver) \ localstatedir=/var endef # If we ever need it, we can create a copy that doesn't assume ./debian/ define deb_sub perl -p \ -e "s|\@PKG_NAME\@|$(pkg_name)|go;" \ -e "s|\@MAJOR_VERSION\@|$(major_ver)|go;" \ -e "s|\@MINOR_VERSION\@|$(minor_ver)|go;" \ -e "s|\@FULL_VERSION\@|$(runtime_ver)|go;" \ -e "s|\@PACKAGE_VERSION\@|$(debian_ver)|go;" \ -e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \ -e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \ -e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \ -e "s|\@DEB_FLAVOR\@|$(flavor)|go;" \ -e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \ -e "s|\@INFO_FILES\@|$(main_dir_info_files)|go;" \ -e "s|\@INFO_SUBDIR\@|$(info_subdir)|go;" \ -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \ -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \ -e "s|\@MOVEMAIL_BIN\@|$(movemail_bin)|go;" \ < $(1) > $(2) endef %: dh $@ --parallel check-vars: @echo "src_name: $(src_name)" @echo "upstream_ver: $(upstream_ver)" @echo "debian_ver: $(debian_ver)" @echo "debsrc_ver: $(debsrc_ver)" @echo "debian_rev: $(debian_rev)" @echo "runtime_ver: $(runtime_ver)" @echo "major_ver: $(major_ver)" @echo "minor_ver: $(minor_ver)" @echo "movemail_bin: $(movemail_bin)" debian-sync: $(persistent_autogen_files) # so dh pattern rule doesn't try to handle this target true debian/$(flavor).%: xsupport := "x" debian/$(flavor).%: pkg_name := $(flavor) debian/$(flavor)-nox.%: xsupport := "nox" debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox debian/$(flavor)-lucid.%: xsupport := "lucid" debian/$(flavor)-lucid.%: pkg_name := $(flavor)-lucid debian/$(flavor)-common.%: pkg_name := $(flavor)-common debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common debian/%: debian/%.in debian/changelog debian/rules $(call deb_sub,$<,$@) debian/$(flavor)-bin-common.%: debian/emacsVER-bin-common.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-common.%: debian/emacsVER-common.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-el.%: debian/emacsVER-el.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor).%: debian/emacsVER.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-lucid.%: debian/emacsVER.% debian/changelog $(call deb_sub,$<,$@) debian/$(flavor)-common.README.Debian: \ debian/emacsVER-common.README debian/patches/*.patch debian/patches/series \ debian/rules debian/patch-to-news cd debian && \ csplit -s -f emacsVER-common.README. \ emacsVER-common.README '/@@PATCH_LIST_HERE@@/' cp debian/emacsVER-common.README.00 debian/emacsVER-common.README.tmp for p in $$($(quilt) series); do \ debian/patch-to-news debian/patches/$$p \ >> debian/emacsVER-common.README.tmp; \ echo >> debian/emacsVER-common.README.tmp; \ done tail -n +2 \ < debian/emacsVER-common.README.01 \ >> debian/emacsVER-common.README.tmp mv debian/emacsVER-common.README.tmp $@ debian/setup-stamp: $(testdir) ./autogen.sh mkdir -p $(dir $@) && touch $@ # common configure flags confflags += --prefix=/usr confflags += --sharedstatedir=/var/lib confflags += --libexecdir=/usr/lib confflags += --localstatedir=/var/lib confflags += --infodir=/usr/share/info confflags += --mandir=/usr/share/man confflags += --with-pop=yes confflags += --enable-locallisppath=$(local_lpath) # multiarch compatibility confflags += --with-crt-dir=/usr/lib/$(deb_host_multiarch) # x configure flags confflags_x := $(confflags) confflags_x += --with-x=yes confflags_x += --with-x-toolkit=gtk3 # For those who prefer the old-style non-toolkit scrollbars, just # change the assignment below to --without-toolkit-scroll-bars. The # resulting emacsXY package will have the old scrollbars. confflags_x += --with-toolkit-scroll-bars # nox configure flags confflags_nox := $(confflags) confflags_nox += --with-x=no confflags_nox += --without-gconf confflags_nox += --without-gsettings # lucid configure flags confflags_lucid := $(confflags) confflags_lucid += --with-x=yes confflags_lucid += --with-x-toolkit=lucid confflags_lucid += --with-toolkit-scroll-bars confflags_lucid += --without-gconf confflags_lucid += --without-gsettings define cfg_tree rm -rf $(1) mkdir $(1) cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') "$(1)" cd $(1) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(confflags) $(2) endef define build_cmd $(MAKE) -C $(1) -j $(joblimit) # If we don't use bootstrap, we need to explicitly build info. $(MAKE) -C $(1) -j $(joblimit) info # Make sure we chose liblockfile. ldd $(1)/lib-src/movemail | grep liblockfile endef override_dh_auto_configure: debian/setup-stamp # Can't use dh --with autotools_dev because it only works if # you haven't removed the config.sub and config.guess files # from the source tree. cp -a /usr/share/misc/config.guess . cp -a /usr/share/misc/config.sub . $(call cfg_tree,debian/build-x,$(confflags_x)) $(call cfg_tree,debian/build-nox,$(confflags_nox)) $(call cfg_tree,debian/build-lucid,$(confflags_lucid)) override_dh_auto_build: $(autogen_build_files) $(call build_cmd,debian/build-x) $(call build_cmd,debian/build-nox) $(call build_cmd,debian/build-lucid) define install_common_binpkg_bits # args: (1) srcdir (2) pkgdir (3) pkgname (4) bin-suffix install -d $(2)/usr/bin/ test -f $(1)/usr/bin/emacs-* cp -a $(1)/usr/bin/emacs-* $(2)/usr/bin/$(flavor)-$(4) dh_link -p$(3) usr/bin/$(flavor)-$(4) usr/bin/$(flavor) install -d $(2)/usr/share/emacs/$(runtime_ver)/etc cp -a $(1)/usr/share/emacs/$(runtime_ver)/etc/DOC-$(runtime_ver).1 \ $(2)/usr/share/emacs/$(runtime_ver)/etc/ install -d $(2)/usr/share/man/man1 dh_link -p$(3) \ usr/share/man/man1/emacs.$(flavor).1.gz \ usr/share/man/man1/$(flavor).1.gz dh_link -p$(3) \ usr/share/man/man1/emacs.$(flavor).1.gz \ usr/share/man/man1/$(flavor)-$(4).1.gz endef override_dh_auto_install: $(autogen_install_files) rm -rf \ $(install_dir_x) $(install_dir_nox) $(install_dir_lucid) \ $(pkgdir_common)/* \ $(pkgdir_bin_common)/* \ $(pkgdir_x)/* \ $(pkgdir_nox)/* \ $(pkgdir_lucid)/* \ $(pkgdir_el)/* $(call emacs_inst,build-x,$(install_dir_x)) ################################################## # emacsXY-common ifneq (,$(findstring $(flavor)-common, $(shell dh_listpackages))) install -d $(pkgdir_common) cp -a $(install_dir_x)/* $(pkgdir_common) rm -r $(pkgdir_common)/usr/bin rm -r $(pkgdir_common)/usr/lib cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \ && test -f DOC-$(runtime_ver).* cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \ && rm DOC-$(runtime_ver).* # lisp path directories install -d $(pkgdir_common)/etc/$(flavor)/site-start.d install -d $(pkgdir_common)/usr/share/$(flavor) # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs # to be in share/FLAVOR so that as we upgrade from 21.1 to 21.2, # etc., add-on package bits don't get left behind. mv $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/site-lisp \ $(pkgdir_common)/usr/share/$(flavor) dh_link -p$(flavor)-common usr/share/$(flavor)/site-lisp \ usr/share/emacs/$(runtime_ver)/site-lisp # This is a duplicate of the file in FLAVOR/site-lisp rm $(pkgdir_common)/usr/share/emacs/site-lisp/subdirs.el cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ && convert hicolor/16x16/apps/emacs.{png,xpm} cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ && convert hicolor/32x32/apps/emacs.{png,xpm} # Fixup image files in unversioned directories (version # unversioned images) and prepare for update-alternatives. cd $(pkgdir_common)/usr/share/icons/hicolor \ && mv scalable/apps/emacs.svg scalable/apps/${flavor}.svg \ && mv 16x16/apps/emacs.png 16x16/apps/${flavor}.png \ && mv 24x24/apps/emacs.png 24x24/apps/${flavor}.png \ && mv 32x32/apps/emacs.png 32x32/apps/${flavor}.png \ && mv 48x48/apps/emacs.png 48x48/apps/${flavor}.png \ && mv 128x128/apps/emacs.png 128x128/apps/${flavor}.png cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \ && mv emacs-document.svg ${flavor}-document.svg # Remove redundant emacs.desktop file. rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/emacs.desktop rm $(pkgdir_common)/usr/share/applications/emacs.desktop # Mangle info files. chmod 755 debian/mangle-info for f in $(main_dir_info_files); \ do \ gunzip $(pkgdir_common)/usr/share/info/$(info_subdir)/$$f.gz; \ DEBIAN_INFO_PREFIX=$(info_subdir) \ debian/mangle-info \ $(pkgdir_common)/usr/share/info/$(info_subdir)/$$f; \ done gunzip $(pkgdir_common)/usr/share/man/man1/*.gz perl -pi -e "s|man1/etags\\.1|man1/etags\\.$(flavor)\\.1|" \ $(pkgdir_common)/usr/share/man/man1/ctags.1 cd $(pkgdir_common)/usr/share/man/man1/ && \ for f in *.1; do mv $$f $$(basename $${f} .1).$(flavor).1; done # At least etc/COPYING is needed by M-x describe-copying. rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \ usr/share/emacs/$(runtime_ver)/etc/COPYING dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \ usr/share/emacs/$(runtime_ver)/lisp/COPYING $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm -f $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el\.gz/o' | xargs rm -f # Remove extraneous info dir files. These may not exist if dpkg # is 1.5.4 or newer. rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old # Remove the shared game score directory as a simple way to # avoid a conflict with other flavors of Emacs. Since # Debian's update-game-score binary isn't setuid, that # directory is never used. rm $(pkgdir_common)/var/games/emacs/tetris-scores rm $(pkgdir_common)/var/games/emacs/snake-scores rmdir $(pkgdir_common)/var/games/emacs/ rmdir $(pkgdir_common)/var/games/ rmdir $(pkgdir_common)/var/ # Make sure /usr/local dir doesn't exist. rm -r $(pkgdir_common)/usr/local endif ################################################## # emacsXY-bin-common ifneq (,$(findstring $(flavor)-bin-common, $(shell dh_listpackages))) # Move common binaries to emacs-bin-common. install -d $(pkgdir_bin_common)/usr cp -a $(install_dir_x)/usr/bin $(pkgdir_bin_common)/usr cp -a $(install_dir_x)/usr/lib $(pkgdir_bin_common)/usr # Make sure there's just one. test -f $(pkgdir_bin_common)/usr/bin/emacs-* rm $(pkgdir_bin_common)/usr/bin/{emacs,emacs-*} # Set up movemail. chown root.mail $(pkgdir_bin_common)/$(movemail_bin) chmod g+s $(pkgdir_bin_common)/$(movemail_bin) # Set up alternatives. alternatives=`ls $(pkgdir_bin_common)/usr/bin | xargs` && \ set -x && \ for f in debian/$(flavor)-bin-common.*; \ do \ perl -pwi -e "s|\@ALTERNATIVES\@|$${alternatives}|go" $$f ; \ done for f in `ls $(pkgdir_bin_common)/usr/bin`; \ do \ mv $(pkgdir_bin_common)/usr/bin/$$f \ $(pkgdir_bin_common)/usr/bin/$$f.$(flavor) ; \ done endif ################################################## # emacsXY ifneq (,$(findstring $(flavor), $(shell dh_listpackages))) $(call install_common_binpkg_bits,\ $(install_dir_x),$(pkgdir_x),$(flavor),x) # install desktop entry install -d $(pkgdir_x)/usr/share/applications install -m 0644 \ debian/$(flavor).desktop $(pkgdir_x)/usr/share/applications/ endif ################################################## # emacsXY-nox ifneq (,$(findstring $(flavor)-nox, $(shell dh_listpackages))) $(call emacs_inst,build-nox,$(install_dir_nox)) $(call install_common_binpkg_bits,\ $(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox) rm -rf $(install_dir_nox) endif ################################################## # emacsXY-lucid ifneq (,$(findstring $(flavor)-lucid, $(shell dh_listpackages))) $(call emacs_inst,build-lucid,$(install_dir_lucid)) $(call install_common_binpkg_bits,\ $(install_dir_lucid),$(pkgdir_lucid),$(flavor)-lucid,lucid) # install desktop entry install -d $(pkgdir_lucid)/usr/share/applications install -m 0644 \ debian/$(flavor)-lucid.desktop \ $(pkgdir_lucid)/usr/share/applications/ rm -rf $(install_dir_lucid) endif ################################################## # emacsXY-el 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 -) endif ################################################## # final cleanup rm -rf $(install_dir_x) rm -rf $(install_dir_nox) rm -rf $(install_dir_lucid) .PHONY: override_dh_strip override_dh_strip: dh_strip -p$(flavor) --dbg-package=$(flavor)-dbg dh_strip -p$(flavor)-lucid --dbg-package=$(flavor)-lucid-dbg dh_strip -p$(flavor)-nox --dbg-package=$(flavor)-nox-dbg dh_strip override_dh_testdir: $(testdir) override_dh_fixperms: dh_fixperms -X$(movemail_bin) override_dh_clean: $(persistent_autogen_files) rm -rf \ aclocal.m4 \ build-aux/compile \ build-aux/config.guess \ build-aux/config.sub \ build-aux/depcomp \ build-aux/install-sh \ build-aux/missing \ config.guess \ config.sub \ configure \ debian/*-stamp \ debian/build-lucid \ debian/build-nox \ debian/build-x \ debian/emacsVER-common.README.00 \ debian/emacsVER-common.README.01 \ debian/install-lucid \ debian/install-nox \ debian/install-x \ lib/Makefile.in \ src/config.in \ src/stamp-h1 src/stamp-h.in rm -f $(nonpersistent_autogen_files) dh_clean debian/emacsVER.desktop0000664000000000000000000000103312306371370012227 0ustar [Desktop Entry] Version=1.0 Name=GNU Emacs @MENU_VERSION@ GenericName=Text Editor Comment=View and edit files MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Exec=/usr/bin/@DEB_FLAVOR@ %F TryExec=@DEB_FLAVOR@ Icon=/usr/share/icons/hicolor/scalable/apps/@DEB_FLAVOR@.svg Type=Application Terminal=false Categories=Utility;Development;TextEditor; StartupWMClass=Emacs@MENU_VERSION@ debian/emacsVER-common.prerm0000664000000000000000000000041512306371370013174 0ustar #!/bin/sh set -e MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ set +e # Only remove these directories if they're empty. rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null rmdir /usr/local/share/emacs/${FULL} 2>/dev/null set -e #DEBHELPER# debian/emacsVER.prerm0000664000000000000000000000060012306371370011702 0ustar #!/bin/sh set -e MAJOR=@MAJOR_VERSION@ FLAVOR=@DEB_FLAVOR@ # update-alternatives on things that collide with xemacs, other editors if [ "$1" != "upgrade" ] then update-alternatives --remove emacs /usr/bin/${FLAVOR}-@X_SUPPORT@ update-alternatives --remove editor /usr/bin/${FLAVOR} fi # emacsen-common registration. /usr/lib/emacsen-common/emacs-remove ${FLAVOR} #DEBHELPER# debian/emacsVER-common.lintian-overrides0000664000000000000000000000013612306371370015505 0ustar @PKG_NAME@ binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs debian/patches/0000775000000000000000000000000012306401471010615 5ustar debian/patches/0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch0000664000000000000000000000427112306372142023466 0ustar From 5f08d4eba0c5bb51294ee89d4285f3cc6dde925f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 20 Aug 2013 23:11:50 -0700 Subject: Emacs should no longer hang at startup on kFreeBSD. Applied upstream patch (in conjunction with 5113963): Port close-on-exec pty creation to FreeBSD 9.1-RELEASE. * configure.ac (PTY_OPEN): If posix_openpt with O_CLOEXEC fails and reports EINVAL, try it again without O_CLOEXEC. This should port PTY_OPEN to FreeBSD 9, which stupidly rejects O_CLOEXEC. What were they thinking? Origin: upstream, commit: 5113964, 5c41cec3858f1828303b67be634b8c39937c8580 Added-by: Rob Browning Provided-By: Paul Eggert Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15129 --- ChangeLog | 8 ++++++++ configure.ac | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-08-21 Paul Eggert + + Port close-on-exec pty creation to FreeBSD 9.1-RELEASE (Bug#15129). + * configure.ac (PTY_OPEN): If posix_openpt with O_CLOEXEC fails + and reports EINVAL, try it again without O_CLOEXEC. This should + port PTY_OPEN to FreeBSD 9, which stupidly rejects O_CLOEXEC. + What were they thinking? + 2013-03-11 Glenn Morris * Version 24.3 released. --- a/configure.ac +++ b/configure.ac @@ -3555,7 +3555,7 @@ AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname = 0; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); if (grantpt (fd) != -1 && unlockpt (fd) != -1) ptyname = ptsname(fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (!ptyname) { close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); }]) dnl if HAVE_POSIX_OPENPT if test "x$ac_cv_func_posix_openpt" = xyes; then - AC_DEFINE(PTY_OPEN, [fd = posix_openpt (O_RDWR | O_NOCTTY)]) + AC_DEFINE(PTY_OPEN, [do { fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY); if (fd < 0 && errno == EINVAL) fd = posix_openpt (O_RDWR | O_NOCTTY); } while (0)]) AC_DEFINE(PTY_NAME_SPRINTF, []) dnl if HAVE_GETPT elif test "x$ac_cv_func_getpt" = xyes; then debian/patches/series0000664000000000000000000000121712306371524012040 0ustar 0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch 0002-Run-debian-startup-and-set-debian-emacs-flavor.patch 0003-Remove-files-that-appear-to-be-incompatible-with-the.patch 0004-Adjust-documentation-references-for-Debian.patch 0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch 0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch 0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch emacsVER-lp725988.patch 0008-No-redisplay-when-reading-dbus-events.patch 0009-upstream-bug-14829.patch 0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch 0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch debian/patches/0008-No-redisplay-when-reading-dbus-events.patch0000664000000000000000000000153612306371370021405 0ustar Description: Prevent bogus redisplays when reading dbus events, leading to incorrect buffer scrolling afterward. Forwarded: not-needed Applied-Upstream: http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/112741 Origin: http://savannah.gnu.org/projects/emacs --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -270,7 +270,8 @@ ;; default 25". Events which are not from D-Bus must be restored. (with-timeout ((if timeout (/ timeout 1000.0) 25)) (while (eq (gethash key dbus-return-values-table :ignore) :ignore) - (let ((event (let (unread-command-events) (read-event nil nil 0.1)))) + (let ((event (let ((inhibit-redisplay t) unread-command-events) + (read-event nil nil 0.1)))) (when (and event (not (ignore-errors (dbus-check-event event)))) (setq unread-command-events (append unread-command-events (list event))))))) debian/patches/0004-Adjust-documentation-references-for-Debian.patch0000664000000000000000000000132712306372113022406 0ustar From 66d1e35877764d3448cbec5d28c28532b0a2bc89 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:25 -0500 Subject: Adjust documentation references for Debian. Various documentation references have been adjusted for Debian. References to /usr/local/... have been changed to /usr/... as appropriate, etc. --- etc/NEWS | 5 +++++ 1 file changed, 5 insertions(+) --- a/etc/NEWS +++ b/etc/NEWS @@ -14,6 +14,11 @@ You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. + +* Debian specific changes to Emacs + +Please see /usr/share/doc/emacs24-common/README.Debian.gz. + * Installation Changes in Emacs 24.3 debian/patches/0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch0000664000000000000000000000334012306372137023465 0ustar From e6b8536b5a4ffe74bde2d3281f39295a70457287 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 20 Aug 2013 22:39:51 -0700 Subject: Emacs should no longer hang at startup on kFreeBSD. Applied upstream patch (in conjunction with 5113964): * process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag. We can't portably rely on PTY_OPEN doing that, even if it calls posix_openpt with O_CLOEXEC. Origin: upstream, commit: 5113963, 57c5937ff85bce49f9dc8f4c66851620416bdc07 Added-by: Rob Browning Provided-By: Paul Eggert Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15129 --- src/ChangeLog | 6 ++++++ src/process.c | 9 +++++++++ 2 files changed, 15 insertions(+) --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-08-21 Paul Eggert + + * process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag. + We can't portably rely on PTY_OPEN doing that, even if + it calls posix_openpt with O_CLOEXEC. + 2013-03-11 Glenn Morris * Version 24.3 released. --- a/src/process.c +++ b/src/process.c @@ -661,6 +661,15 @@ if (fd >= 0) { +#ifdef PTY_OPEN + /* Set FD's close-on-exec flag. This is needed even if + PT_OPEN calls posix_openpt with O_CLOEXEC, since POSIX + doesn't require support for that combination. + Multithreaded platforms where posix_openpt ignores + O_CLOEXEC (or where PTY_OPEN doesn't call posix_openpt) + have a race condition between the PTY_OPEN and here. */ + fcntl (fd, F_SETFD, FD_CLOEXEC); +#endif /* check to make certain that both sides are available this avoids a nasty yet stupid bug in rlogins */ #ifdef PTY_TTY_NAME_SPRINTF debian/patches/0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch0000664000000000000000000000202612306372074023427 0ustar From bc5e6ce204e218d658c56ff6f84df4caf52a069d Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 7 Apr 2013 15:03:05 -0500 Subject: Prefer /usr/share/info/emacs-24 over /usr/share/info. Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info. The value of Info-default-directory-list has been augmented via lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before /usr/share/info. --- lisp/info.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/lisp/info.el +++ b/lisp/info.el @@ -214,7 +214,8 @@ (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) - dirs + ;; Debian: add per-flavor info directory in front. + (cons (format "/usr/share/info/emacs-%d" emacs-major-version) dirs) ;; Include the info directory near where Emacs executable was installed. (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) debian/patches/0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch0000664000000000000000000000277012306372120023155 0ustar From 29a4e33107f12c44f34fa111e049499b8ee3dc8b Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:29 -0500 Subject: Look for NEWS in order to find etc/ rather than GNU. Emacs will now look for NEWS in order to find etc/ rather than GNU. Since Debian doesn't include GNU in the Debian packages (the common licenses are in /usr/share/common-licenses), Emacs will now look for NEWS to find the etc directory instead of GNU. Provided-by: Sven Joachim Originally-reported-by: Bernhard Michler Date: Mon, 28 Apr 2008 11:20:23 +0200 Added-by: Rob Browning Status: Debian specific --- src/callproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/src/callproc.c +++ b/src/callproc.c @@ -1580,14 +1580,14 @@ srcdir = Fexpand_file_name (build_string ("../src/"), build_string (PATH_DUMPLOADSEARCH)); - tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory); + tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory); tem1 = Ffile_exists_p (tem); if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) { Lisp_Object newdir; newdir = Fexpand_file_name (build_string ("../etc/"), build_string (PATH_DUMPLOADSEARCH)); - tem = Fexpand_file_name (build_string ("GNU"), newdir); + tem = Fexpand_file_name (build_string ("NEWS"), newdir); tem1 = Ffile_exists_p (tem); if (!NILP (tem1)) Vdata_directory = newdir; debian/patches/0009-upstream-bug-14829.patch0000664000000000000000000000112112306371370015323 0ustar Description: Fix window splitting when split-window-keep-point is nil. Forwarded: not-needed Origin: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14829#56 --- a/lisp/window.el +++ b/lisp/window.el @@ -5449,6 +5449,9 @@ (let ((buffer (if (bufferp buffer-or-name) buffer-or-name (get-buffer buffer-or-name))) + ;; Make sure that when we split windows the old window keeps + ;; point, bug#14829. + (split-window-keep-point t) ;; Handle the old form of the first argument. (inhibit-same-window (and action (not (listp action))))) (unless (listp action) (setq action nil)) debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch0000664000000000000000000000166612306372116024170 0ustar From ac816724bc650c3ee163a9ce64e3116780977b2d Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:28 -0500 Subject: Modify the output of (version) to indicate Debian modifications. The output of (version) has been modified to indicate Debian modifications. Author: Rob Browning Added-by: Rob Browning --- lisp/version.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/lisp/version.el +++ b/lisp/version.el @@ -56,8 +56,8 @@ (interactive "P") (let ((version-string (format (if (not (called-interactively-p 'interactive)) - "GNU Emacs %s (%s%s%s)\n of %s on %s" - "GNU Emacs %s (%s%s%s) of %s on %s") + "GNU Emacs %s (%s%s%s)\n of %s on %s, modified by Debian" + "GNU Emacs %s (%s%s%s) of %s on %s, modified by Debian") emacs-version system-configuration (cond ((featurep 'motif) debian/patches/emacsVER-lp725988.patch0000664000000000000000000000035612306372125014432 0ustar --- 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. */ debian/patches/bug-12764.patch0000664000000000000000000000156112306371370013103 0ustar Description: quit-window (bound to 'q' in many modes) will incorrectly iconify the frame in some cases. This upstream patch for 24.2 is purported to fix the problem. Author: Barry Warsaw Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12764 Forwarded: not-needed --- a/lisp/window.el +++ b/lisp/window.el @@ -3035,7 +3035,12 @@ quad resize) (cond ((and (not prev-buffer) - (memq (nth 1 quit-restore) '(window frame)) + (or (eq (nth 1 quit-restore) 'frame) + (and (eq (nth 1 quit-restore) 'window) + ;; If the window has been created on an existing + ;; frame and winds up as the sole window on that + ;; frame, do not delete it (Bug#12764). + (not (eq window (frame-root-window window))))) (eq (nth 3 quit-restore) buffer) ;; Delete WINDOW if possible. (window--delete window nil kill)) debian/patches/0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch0000664000000000000000000000200312306372122024233 0ustar From ddf9e08026a67cd040984ff42dd1597d205b214d Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:30 -0500 Subject: Invoke the correct xmlstarlet executable on Debian systems. Emacs now invokes the correct xmlstarlet executable on Debian systems. Emacs invokes xmlstarlet rather than xml, which is the correct executable name on Debian systems. Provided-by: Jussi Judin Date: Sat, 20 Oct 2007 14:42:02 UTC Added-by: Rob Browning Status: Debian specific Bug: 447378 --- lisp/progmodes/flymake.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -1829,7 +1829,7 @@ ;;;; xml-specific init-cleanup routines (defun flymake-xml-init () - (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) + (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) (provide 'flymake) debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch0000664000000000000000000007222612306372110024164 0ustar From cfd8695fcd33f4693c8074a6380c5ac1b69dd09b Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:24 -0500 Subject: Remove files that appear to be incompatible with the DFSG. Files that appear to be incompatible with the DFSG have been removed. A number of files have been removed from this package because their licenses are not compatible with the Debian Free Software Guidelines (DFSG), or because it wasn't completely clear that their licenses are compatible. In particular, all of the files which are covered under the GFDL and have invariant sections have been removed in accordance with this General Resolution: http://www.debian.org/vote/2006/vote_001. The files that have been removed, but still appear to be distributable, have been moved to packages in Debian's non-free section. Author: Rob Browning Added-by: Rob Browning Status: new --- Makefile.in | 22 +- configure.ac | 6 +- doc/misc/Makefile.in | 615 +-------------------------------------------------- lisp/help.el | 10 +- 4 files changed, 22 insertions(+), 631 deletions(-) --- a/Makefile.in +++ b/Makefile.in @@ -137,7 +137,9 @@ infodir=@infodir@ # Info files not in the doc/misc directory (we get those via make echo-info). INFO_EXT=@INFO_EXT@ -INFO_NONMISC=emacs$(INFO_EXT) eintr$(INFO_EXT) elisp$(INFO_EXT) +# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg +# pacakge (see /usr/share/doc/emacs*-common/copyright). +INFO_NONMISC= # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes". HAVE_MAKEINFO=@HAVE_MAKEINFO@ @@ -739,10 +741,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean) -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean) (cd leim; $(MAKE) $(MFLAGS) mostlyclean) ### `clean' @@ -760,10 +759,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) clean) -(cd doc/misc && $(MAKE) $(MFLAGS) clean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) clean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) (cd nextstep && $(MAKE) $(MFLAGS) clean) @@ -786,10 +782,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) - (cd doc/emacs && $(MAKE) $(MFLAGS) distclean) (cd doc/misc && $(MAKE) $(MFLAGS) distclean) - (cd doc/lispref && $(MAKE) $(MFLAGS) distclean) - (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean) (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) (cd nextstep && $(MAKE) $(MFLAGS) distclean) @@ -804,10 +797,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean) -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean) @@ -863,10 +853,7 @@ .PHONY: info dvi dist check html info-real force-info check-info-dir info-real: - (cd doc/emacs; $(MAKE) $(MFLAGS) info) (cd doc/misc; $(MAKE) $(MFLAGS) info) - (cd doc/lispref; $(MAKE) $(MFLAGS) info) - (cd doc/lispintro; $(MAKE) $(MFLAGS) info) force-info: # Note that man/Makefile knows how to put the info files in $(srcdir), @@ -906,10 +893,7 @@ echo "info/dir is OK" dvi: - (cd doc/emacs; $(MAKE) $(MFLAGS) dvi) (cd doc/misc; $(MAKE) $(MFLAGS) dvi) - (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi) - (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) #### Bootstrapping. --- a/configure.ac +++ b/configure.ac @@ -4599,11 +4599,11 @@ dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). dnl That doesn't have any obvious consequences for Emacs, but on the whole dnl it seems better to just live with the duplication. -SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \ - doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ - doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \ + doc/misc/Makefile \ + src/Makefile lwlib/Makefile lisp/Makefile \ leim/Makefile nextstep/Makefile]) dnl test/ is not present in release tarfiles. --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -41,126 +41,13 @@ MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force -I$(emacsdir) -INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \ - dbus dired-x ebrowse ede ediff edt eieio \ - emacs-mime epa erc ert eshell eudc efaq \ - flymake forms gnus emacs-gnutls htmlfontify idlwave info.info \ - mairix-el message mh-e newsticker nxml-mode \ - org pcl-cvs pgg rcirc remember reftex sasl \ - sc semantic ses sieve smtpmail speedbar srecode tramp \ - url vip viper widget wisent woman - -DVI_TARGETS = \ - ada-mode.dvi \ - auth.dvi \ - autotype.dvi \ - bovine.dvi \ - calc.dvi \ - cc-mode.dvi \ - cl.dvi \ - dbus.dvi \ - dired-x.dvi \ - ebrowse.dvi \ - ede.dvi \ - ediff.dvi \ - edt.dvi \ - eieio.dvi \ - emacs-mime.dvi \ - epa.dvi \ - erc.dvi \ - ert.dvi \ - eshell.dvi \ - eudc.dvi \ - faq.dvi \ - flymake.dvi \ - forms.dvi \ - gnus.dvi \ - emacs-gnutls.dvi \ - htmlfontify.dvi \ - idlwave.dvi \ - info.dvi \ - mairix-el.dvi \ - message.dvi \ - mh-e.dvi \ - newsticker.dvi \ - nxml-mode.dvi \ - org.dvi \ - pcl-cvs.dvi \ - pgg.dvi \ - rcirc.dvi \ - reftex.dvi \ - remember.dvi \ - sasl.dvi \ - sc.dvi \ - semantic.dvi \ - ses.dvi \ - sieve.dvi \ - smtpmail.dvi \ - speedbar.dvi \ - srecode.dvi \ - tramp.dvi \ - url.dvi \ - vip.dvi \ - viper.dvi \ - widget.dvi \ - wisent.dvi \ - woman.dvi - -PDF_TARGETS = \ - ada-mode.pdf \ - auth.pdf \ - autotype.pdf \ - bovine.pdf \ - calc.pdf \ - cc-mode.pdf \ - cl.pdf \ - dbus.pdf \ - dired-x.pdf \ - ebrowse.pdf \ - ede.pdf \ - ediff.pdf \ - edt.pdf \ - eieio.pdf \ - emacs-mime.pdf \ - epa.pdf \ - erc.pdf \ - ert.pdf \ - eshell.pdf \ - eudc.pdf \ - faq.pdf \ - flymake.pdf \ - forms.pdf \ - gnus.pdf \ - htmlfontify.pdf \ - emacs-gnutls.pdf \ - idlwave.pdf \ - info.pdf \ - mairix-el.pdf \ - message.pdf \ - mh-e.pdf \ - newsticker.pdf \ - nxml-mode.pdf \ - org.pdf \ - pcl-cvs.pdf \ - pgg.pdf \ - rcirc.pdf \ - reftex.pdf \ - remember.pdf \ - sasl.pdf \ - sc.pdf \ - semantic.pdf \ - ses.pdf \ - sieve.pdf \ - smtpmail.pdf \ - speedbar.pdf \ - srecode.pdf \ - tramp.pdf \ - url.pdf \ - vip.pdf \ - viper.pdf \ - widget.pdf \ - wisent.pdf \ - woman.pdf +# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg +# pacakge (see /usr/share/doc/emacs*-common/copyright). +INFO_TARGETS = efaq + +DVI_TARGETS = faq.dvi + +PDF_TARGETS = faq.pdf HTML_TARGETS = emacs-faq.html @@ -201,195 +88,6 @@ # Note: "<" is not portable in ordinary make rules. -ada-mode : $(buildinfodir)/ada-mode$(INFO_EXT) -$(buildinfodir)/ada-mode$(INFO_EXT): ${srcdir}/ada-mode.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ada-mode.texi -ada-mode.dvi: ${srcdir}/ada-mode.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi -ada-mode.pdf: ${srcdir}/ada-mode.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi - -auth : $(buildinfodir)/auth$(INFO_EXT) -$(buildinfodir)/auth$(INFO_EXT): ${srcdir}/auth.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/auth.texi -auth.dvi: ${srcdir}/auth.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi -auth.pdf: ${srcdir}/auth.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi - -autotype : $(buildinfodir)/autotype$(INFO_EXT) -$(buildinfodir)/autotype$(INFO_EXT): ${srcdir}/autotype.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/autotype.texi -autotype.dvi: ${srcdir}/autotype.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi -autotype.pdf: ${srcdir}/autotype.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi - -bovine : $(buildinfodir)/bovine$(INFO_EXT) -$(buildinfodir)/bovine$(INFO_EXT): ${srcdir}/bovine.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/bovine.texi -bovine.dvi: ${srcdir}/bovine.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/bovine.texi -bovine.pdf: ${srcdir}/bovine.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/bovine.texi - -calc : $(buildinfodir)/calc$(INFO_EXT) -$(buildinfodir)/calc$(INFO_EXT): ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/calc.texi -calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi -calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi - -ccmode : $(buildinfodir)/ccmode$(INFO_EXT) -$(buildinfodir)/ccmode$(INFO_EXT): ${srcdir}/cc-mode.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cc-mode.texi -cc-mode.dvi: ${srcdir}/cc-mode.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi -cc-mode.pdf: ${srcdir}/cc-mode.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi - -cl : $(buildinfodir)/cl$(INFO_EXT) -$(buildinfodir)/cl$(INFO_EXT): ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cl.texi -cl.dvi: ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi -cl.pdf: ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi - -dbus : $(buildinfodir)/dbus$(INFO_EXT) -$(buildinfodir)/dbus$(INFO_EXT): ${srcdir}/dbus.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dbus.texi -dbus.dvi: ${srcdir}/dbus.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi -dbus.pdf: ${srcdir}/dbus.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi - -dired-x : $(buildinfodir)/dired-x$(INFO_EXT) -$(buildinfodir)/dired-x$(INFO_EXT): ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dired-x.texi -dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi -dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi - -ebrowse : $(buildinfodir)/ebrowse$(INFO_EXT) -$(buildinfodir)/ebrowse$(INFO_EXT): ${srcdir}/ebrowse.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ebrowse.texi -ebrowse.dvi: ${srcdir}/ebrowse.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi -ebrowse.pdf: ${srcdir}/ebrowse.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi - -ede : $(buildinfodir)/ede$(INFO_EXT) -$(buildinfodir)/ede$(INFO_EXT): ${srcdir}/ede.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ede.texi -ede.dvi: ${srcdir}/ede.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi -ede.pdf: ${srcdir}/ede.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi - -ediff : $(buildinfodir)/ediff$(INFO_EXT) -$(buildinfodir)/ediff$(INFO_EXT): ${srcdir}/ediff.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ediff.texi -ediff.dvi: ${srcdir}/ediff.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi -ediff.pdf: ${srcdir}/ediff.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi - -edt : $(buildinfodir)/edt$(INFO_EXT) -$(buildinfodir)/edt$(INFO_EXT): ${srcdir}/edt.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/edt.texi -edt.dvi: ${srcdir}/edt.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi -edt.pdf: ${srcdir}/edt.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi - -eieio : $(buildinfodir)/eieio$(INFO_EXT) -$(buildinfodir)/eieio$(INFO_EXT): ${srcdir}/eieio.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eieio.texi -eieio.dvi: ${srcdir}/eieio.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi -eieio.pdf: ${srcdir}/eieio.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi - -emacs-gnutls : $(buildinfodir)/emacs-gnutls$(INFO_EXT) -$(buildinfodir)/emacs-gnutls$(INFO_EXT): ${srcdir}/emacs-gnutls.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi -emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi -emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi - -emacs-mime : $(buildinfodir)/emacs-mime$(INFO_EXT) -$(buildinfodir)/emacs-mime$(INFO_EXT): ${srcdir}/emacs-mime.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi -emacs-mime.dvi: ${srcdir}/emacs-mime.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi -emacs-mime.pdf: ${srcdir}/emacs-mime.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi - -epa : $(buildinfodir)/epa$(INFO_EXT) -$(buildinfodir)/epa$(INFO_EXT): ${srcdir}/epa.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/epa.texi -epa.dvi: ${srcdir}/epa.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi -epa.pdf: ${srcdir}/epa.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi - -erc : $(buildinfodir)/erc$(INFO_EXT) -$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi -erc.dvi: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi -erc.pdf: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi - -ert : $(buildinfodir)/ert$(INFO_EXT) -$(buildinfodir)/ert$(INFO_EXT): ${srcdir}/ert.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ert.texi -ert.dvi: ${srcdir}/ert.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi -ert.pdf: ${srcdir}/ert.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi - -eshell : $(buildinfodir)/eshell$(INFO_EXT) -$(buildinfodir)/eshell$(INFO_EXT): ${srcdir}/eshell.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eshell.texi -eshell.dvi: ${srcdir}/eshell.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi -eshell.pdf: ${srcdir}/eshell.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi - -eudc : $(buildinfodir)/eudc$(INFO_EXT) -$(buildinfodir)/eudc$(INFO_EXT): ${srcdir}/eudc.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eudc.texi -eudc.dvi: ${srcdir}/eudc.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi -eudc.pdf: ${srcdir}/eudc.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi - ## No gfdl dependency. efaq : $(buildinfodir)/efaq$(INFO_EXT) $(buildinfodir)/efaq$(INFO_EXT): ${srcdir}/faq.texi $(emacsdir)/emacsver.texi @@ -409,305 +107,6 @@ emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi -flymake : $(buildinfodir)/flymake$(INFO_EXT) -$(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/flymake.texi -flymake.dvi: ${srcdir}/flymake.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi -flymake.pdf: ${srcdir}/flymake.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi - -forms : $(buildinfodir)/forms$(INFO_EXT) -$(buildinfodir)/forms$(INFO_EXT): ${srcdir}/forms.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/forms.texi -forms.dvi: ${srcdir}/forms.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi -forms.pdf: ${srcdir}/forms.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi - -# gnus/message/emacs-mime/sieve/pgg are part of Gnus: -gnus : $(buildinfodir)/gnus$(INFO_EXT) -$(buildinfodir)/gnus$(INFO_EXT): ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi -gnus.dvi: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} - sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi - $(ENVADD) $(TEXI2DVI) gnustmp.texi - cp gnustmp.dvi $@ - rm gnustmp.* -gnus.pdf: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} - sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi - $(ENVADD) $(TEXI2PDF) gnustmp.texi - cp gnustmp.pdf $@ - rm gnustmp.* - -htmlfontify : $(buildinfodir)/htmlfontify$(INFO_EXT) -$(buildinfodir)/htmlfontify$(INFO_EXT): ${srcdir}/htmlfontify.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/htmlfontify.texi -htmlfontify.dvi: ${srcdir}/htmlfontify.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/htmlfontify.texi -htmlfontify.pdf: ${srcdir}/htmlfontify.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/htmlfontify.texi - -# NB this one needs --no-split even without a .info extension. -idlwave : $(buildinfodir)/idlwave$(INFO_EXT) -$(buildinfodir)/idlwave$(INFO_EXT): ${srcdir}/idlwave.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/idlwave.texi -idlwave.dvi: ${srcdir}/idlwave.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi -idlwave.pdf: ${srcdir}/idlwave.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi - -# NB this one needs --no-split even without a .info extension. -# Avoid name clash with overall "info" target. -info.info : $(buildinfodir)/info$(INFO_EXT) -$(buildinfodir)/info$(INFO_EXT): ${srcdir}/info.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/info.texi -info.dvi: ${srcdir}/info.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi -info.pdf: ${srcdir}/info.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi - -mairix-el : $(buildinfodir)/mairix-el$(INFO_EXT) -$(buildinfodir)/mairix-el$(INFO_EXT): ${srcdir}/mairix-el.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mairix-el.texi -mairix-el.dvi: ${srcdir}/mairix-el.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi -mairix-el.pdf: ${srcdir}/mairix-el.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi - -message : $(buildinfodir)/message$(INFO_EXT) -$(buildinfodir)/message$(INFO_EXT): ${srcdir}/message.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/message.texi -message.dvi: ${srcdir}/message.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi -message.pdf: ${srcdir}/message.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi - -mh-e : $(buildinfodir)/mh-e$(INFO_EXT) -$(buildinfodir)/mh-e$(INFO_EXT): ${srcdir}/mh-e.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mh-e.texi -mh-e.dvi: ${srcdir}/mh-e.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi -mh-e.pdf: ${srcdir}/mh-e.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi - -newsticker : $(buildinfodir)/newsticker$(INFO_EXT) -$(buildinfodir)/newsticker$(INFO_EXT): ${srcdir}/newsticker.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/newsticker.texi -newsticker.dvi: ${srcdir}/newsticker.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi -newsticker.pdf: ${srcdir}/newsticker.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi - -nxml-mode : $(buildinfodir)/nxml-mode$(INFO_EXT) -$(buildinfodir)/nxml-mode$(INFO_EXT): ${srcdir}/nxml-mode.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/nxml-mode.texi -nxml-mode.dvi: ${srcdir}/nxml-mode.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi -nxml-mode.pdf: ${srcdir}/nxml-mode.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi - -org : $(buildinfodir)/org$(INFO_EXT) -$(buildinfodir)/org$(INFO_EXT): ${srcdir}/org.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/org.texi -org.dvi: ${srcdir}/org.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi -org.pdf: ${srcdir}/org.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi - -pcl-cvs : $(buildinfodir)/pcl-cvs$(INFO_EXT) -$(buildinfodir)/pcl-cvs$(INFO_EXT): ${srcdir}/pcl-cvs.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pcl-cvs.texi -pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi -pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi - -pgg : $(buildinfodir)/pgg$(INFO_EXT) -$(buildinfodir)/pgg$(INFO_EXT): ${srcdir}/pgg.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pgg.texi -pgg.dvi: ${srcdir}/pgg.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi -pgg.pdf: ${srcdir}/pgg.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi - -rcirc : $(buildinfodir)/rcirc$(INFO_EXT) -$(buildinfodir)/rcirc$(INFO_EXT): ${srcdir}/rcirc.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/rcirc.texi -rcirc.dvi: ${srcdir}/rcirc.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi -rcirc.pdf: ${srcdir}/rcirc.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi - -reftex : $(buildinfodir)/reftex$(INFO_EXT) -$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi -reftex.dvi: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi -reftex.pdf: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi - -remember : $(buildinfodir)/remember$(INFO_EXT) -$(buildinfodir)/remember$(INFO_EXT): ${srcdir}/remember.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/remember.texi -remember.dvi: ${srcdir}/remember.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi -remember.pdf: ${srcdir}/remember.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi - -sasl : $(buildinfodir)/sasl$(INFO_EXT) -$(buildinfodir)/sasl$(INFO_EXT): ${srcdir}/sasl.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sasl.texi -sasl.dvi: ${srcdir}/sasl.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi -sasl.pdf: ${srcdir}/sasl.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi - -sc : $(buildinfodir)/sc$(INFO_EXT) -$(buildinfodir)/sc$(INFO_EXT): ${srcdir}/sc.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sc.texi -sc.dvi: ${srcdir}/sc.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi -sc.pdf: ${srcdir}/sc.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi - -semantic : $(buildinfodir)/semantic$(INFO_EXT) -$(buildinfodir)/semantic$(INFO_EXT): ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/semantic.texi -semantic.dvi: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi -semantic.pdf: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi - -ses : $(buildinfodir)/ses$(INFO_EXT) -$(buildinfodir)/ses$(INFO_EXT): ${srcdir}/ses.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ses.texi -ses.dvi: ${srcdir}/ses.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi -ses.pdf: ${srcdir}/ses.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi - -sieve : $(buildinfodir)/sieve$(INFO_EXT) -$(buildinfodir)/sieve$(INFO_EXT): ${srcdir}/sieve.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sieve.texi -sieve.dvi: ${srcdir}/sieve.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi -sieve.pdf: ${srcdir}/sieve.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi - -smtpmail : $(buildinfodir)/smtpmail$(INFO_EXT) -$(buildinfodir)/smtpmail$(INFO_EXT): ${srcdir}/smtpmail.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/smtpmail.texi -smtpmail.dvi: ${srcdir}/smtpmail.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi -smtpmail.pdf: ${srcdir}/smtpmail.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi - -speedbar : $(buildinfodir)/speedbar$(INFO_EXT) -$(buildinfodir)/speedbar$(INFO_EXT): ${srcdir}/speedbar.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/speedbar.texi -speedbar.dvi: ${srcdir}/speedbar.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi -speedbar.pdf: ${srcdir}/speedbar.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi - -srecode : $(buildinfodir)/srecode$(INFO_EXT) -$(buildinfodir)/srecode$(INFO_EXT): ${srcdir}/srecode.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/srecode.texi -srecode.dvi: ${srcdir}/srecode.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/srecode.texi -srecode.pdf: ${srcdir}/srecode.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/srecode.texi - -tramp : $(buildinfodir)/tramp$(INFO_EXT) -$(buildinfodir)/tramp$(INFO_EXT): ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi -tramp.dvi: ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi -tramp.pdf: ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi - -url : $(buildinfodir)/url$(INFO_EXT) -$(buildinfodir)/url$(INFO_EXT): ${srcdir}/url.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/url.texi -url.dvi: ${srcdir}/url.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi -url.pdf: ${srcdir}/url.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi - -vip : $(buildinfodir)/vip$(INFO_EXT) -$(buildinfodir)/vip$(INFO_EXT): ${srcdir}/vip.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vip.texi -vip.dvi: ${srcdir}/vip.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi -vip.pdf: ${srcdir}/vip.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi - -viper : $(buildinfodir)/viper$(INFO_EXT) -$(buildinfodir)/viper$(INFO_EXT): ${srcdir}/viper.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/viper.texi -viper.dvi: ${srcdir}/viper.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi -viper.pdf: ${srcdir}/viper.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi - -widget : $(buildinfodir)/widget$(INFO_EXT) -$(buildinfodir)/widget$(INFO_EXT): ${srcdir}/widget.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/widget.texi -widget.dvi: ${srcdir}/widget.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi -widget.pdf: ${srcdir}/widget.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi - -wisent : $(buildinfodir)/wisent$(INFO_EXT) -$(buildinfodir)/wisent$(INFO_EXT): ${srcdir}/wisent.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/wisent.texi -wisent.dvi: ${srcdir}/wisent.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/wisent.texi -wisent.pdf: ${srcdir}/wisent.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/wisent.texi - -woman : $(buildinfodir)/woman$(INFO_EXT) -$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi ${gfdl} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi -woman.dvi: ${srcdir}/woman.texi ${gfdl} - $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi -woman.pdf: ${srcdir}/woman.texi ${gfdl} - $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi - - .PHONY: mostlyclean clean distclean maintainer-clean mostlyclean: --- a/lisp/help.el +++ b/lisp/help.el @@ -284,6 +284,14 @@ (goto-address-mode 1) (goto-char (point-min))) +(defun debian-expand-file-name-dfsg (filename) + "Apply expand-file-name to FILENAME. +If expand-file-name does not find a file, append `.dfsg' and try again." + (let ((file (expand-file-name filename data-directory))) + (if (file-exists-p file) + file + (expand-file-name (concat file ".dfsg") data-directory)))) + (defun describe-distribution () "Display info on how to obtain the latest version of GNU Emacs." (interactive) @@ -297,7 +305,7 @@ (defun describe-gnu-project () "Display info on the GNU project." (interactive) - (view-help-file "THE-GNU-PROJECT")) + (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT"))) (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2") debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch0000664000000000000000000000357212306372105023037 0ustar From f5b94d0cc1084a2f47c67c851b2ca7a24ff0e5b6 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:22 -0500 Subject: Run debian-startup and set debian-emacs-flavor. Emacs runs debian-startup and sets debian-emacs-flavor. * Emacs runs debian-startup during the startup process unless site-run-file is false. * The global variable debian-emacs-flavor is bound to 'emacs24. Author: Rob Browning --- lisp/startup.el | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) --- a/lisp/startup.el +++ b/lisp/startup.el @@ -420,6 +420,10 @@ The regexp should not contain a starting \"\\`\" or a trailing \"\\'\"; those are added automatically by callers.") +(defconst debian-emacs-flavor 'emacs24 + "A symbol representing the particular debian flavor of emacs running. +Something like 'emacs20, 'xemacs20, etc.") + (defun normal-top-level-add-subdirs-to-load-path () "Add all subdirectories of `default-directory' to `load-path'. More precisely, this uses only the subdirectories whose names @@ -981,8 +985,21 @@ ;; be loaded from site-run-file and wants to test if -q was given ;; should check init-file-user instead, since that is already set. ;; See cus-edit.el for an example. - (if site-run-file - (load site-run-file t t)) + + ;; Original upstream startup + ;; (if site-run-file + ;; (load site-run-file t t)) + ;; + + ;; Debian startup + (if site-run-file + (progn + ;; Load all the debian package snippets. + ;; It's in here because we want -q to kill it too. + (if (load "debian-startup" t t nil) + (debian-startup debian-emacs-flavor)) + ;; Now the normal site file... + (load site-run-file t t))) ;; Sites should not disable this. Only individuals should disable ;; the startup screen. debian/patches/unity-shrinkage-columns.patch0000664000000000000000000000154212306371370016443 0ustar --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1303,13 +1303,14 @@ size_hints.height_inc = FRAME_LINE_HEIGHT (f); hint_flags |= GDK_HINT_BASE_SIZE; - base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f); - /* Use one row here so base_height does not become zero. + /* Use one row/col here so base_height does not become zero. Gtk+ and/or Unity on Ubuntu 12.04 can't handle it. */ + base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f); base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); check_frame_size (f, &min_rows, &min_cols); + if (min_cols > 0) --min_cols; /* We used one row in base_width = ... 1); */ if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */ size_hints.base_width = base_width; debian/emacsVER-bin-common.prerm0000664000000000000000000000053612306371370013746 0ustar #!/bin/sh set -e FLAVOR=@DEB_FLAVOR@ MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ ALTERNATIVES="@ALTERNATIVES@" # update-alternatives on things that collide with xemacs, other editors if [ "$1" != "upgrade" ] then for i in ${ALTERNATIVES} do update-alternatives --remove $i /usr/bin/$i.${FLAVOR} done fi #DEBHELPER# debian/compat0000664000000000000000000000000212306371370010370 0ustar 9 debian/copyright0000664000000000000000000001336712306401503011127 0ustar -*-text-*- This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source archive is emacs-24.3.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ Please see /usr/share/doc/emacs24-common/README.Debian.gz for a description of the Debian specific differences from the upstream version. As mentioned there, some files (including some of the Emacs documentation) have been removed from this package because their licenses do not appear to satisfy the requirements of the Debian Free Software Guidelines (DFSG). See http://www.debian.org/social_contract. In particular, some of the info pages are covered under the GNU Free Documentation License (GFDL), which Debian has decided does not satisfy the DFSG in cases where "Invariant Sections" are specified (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. Copyright: Emacs itself is licensed under the terms of the GNU General Public License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and doc/man/rcs-checkin.1 are licensed as follows: Copyright (C) 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/emacs.1 is licensed as follows: Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/etags.1 is licensed as follows: Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. etc/publicsuffix.txt is licensed as follows: The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. man/faq.texi is licensed as follows: Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner Copyright (C) 1992,1993 Steven Byrnes Copyright (C) 1990,1991,1992 Joseph Brian Wells This list of frequently asked questions about GNU Emacs with answers ("FAQ") may be translated into other languages, transformed into other formats (e.g. Texinfo, Info, WWW, WAIS), and updated with new information. The same conditions apply to any derivative of the FAQ as apply to the FAQ itself. Every copy of the FAQ must include this notice or an approved translation, information on who is currently maintaining the FAQ and how to contact them (including their e-mail address), and information on where the latest version of the FAQ is archived (including FTP information). The FAQ may be copied and redistributed under these conditions, except that the FAQ may not be embedded in a larger literary work unless that work itself allows free copying and redistribution. debian/emacsVER-bin-common.postinst0000664000000000000000000000073112306371370014501 0ustar #!/bin/sh set -e FLAVOR=@DEB_FLAVOR@ MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ ALTERNATIVES="@ALTERNATIVES@" BIN_PRIORITY=@BIN_PRIORITY@ # update-alternatives on things that collide with xemacs, other editors for i in ${ALTERNATIVES} do update-alternatives \ --install /usr/bin/$i $i /usr/bin/$i.${FLAVOR} ${BIN_PRIORITY} \ --slave /usr/share/man/man1/$i.1.gz $i.1.gz \ /usr/share/man/man1/$i.${FLAVOR}.1.gz done #DEBHELPER# debian/control0000664000000000000000000001044712306401503010573 0ustar Source: emacs24 Section: editors Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff5-dev | libtiff-dev, xaw3dg-dev, libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ Standards-Version: 3.7.2 Package: emacs24-lucid Architecture: any Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: emacs24, emacsen, editor, info-browser, mail-reader, news-reader Conflicts: emacs24, emacs24-nox Replaces: emacs24, emacs24-nox Description: GNU Emacs editor GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a Lucid user interface. Package: emacs24-lucid-dbg Section: debug Priority: extra Architecture: any Depends: emacs24-lucid-dbg (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for emacs24-lucid GNU Emacs is the extensible self-documenting text editor. This package contains the debugging symbols for the version of Emacs with a Lucid user interface. Package: emacs24-nox Architecture: any Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: emacs24, editor, emacsen, info-browser, mail-reader, news-reader Conflicts: emacs24, emacs24-lucid Replaces: emacs24, emacs24-lucid Description: GNU Emacs editor (without X support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs compiled without support for X. Package: emacs24-nox-dbg Section: debug Priority: extra Architecture: any Depends: emacs24-nox-dbg (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for emacs24-nox GNU Emacs is the extensible self-documenting text editor. This package contains the debugging symbols for a version of Emacs compiled without support for X. Package: emacs24 Architecture: any Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader Conflicts: emacs24-lucid, emacs24-nox Replaces: emacs24-lucid, emacs24-nox Description: GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a GTK+ user interface. Package: emacs24-dbg Section: debug Priority: extra Architecture: any Depends: emacs24-dbg (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for emacs24 GNU Emacs is the extensible self-documenting text editor. This package contains the debugging symbols for a version of Emacs with a GTK+ user interface. Package: emacs24-bin-common Architecture: any Depends: emacs24-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure that's shared by emacs24, emacs24-lucid, and emacs24-nox. Package: emacs24-common Architecture: all Depends: emacsen-common (>= 1.4.10), 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. This package contains the architecture independent infrastructure that's shared by emacs24, emacs24-lucid, and emacs24-nox. Package: emacs24-el Architecture: all Depends: emacs24-common (= ${source:Version}), ${misc:Depends} Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, saving space in the main package for small systems. debian/source/0000775000000000000000000000000012306401471010466 5ustar debian/source/format0000664000000000000000000000001412306371370011700 0ustar 3.0 (quilt) debian/patch-to-news0000775000000000000000000000072712306371370011617 0ustar #!/bin/bash set -e patch="$1" sed ' # delete everything after the first line starting with "--- " (the diff) /^--- [^ ]/,$d' < "$patch" \ | tac \ | sed ' # delete everything up to the first line containing only "---" (the diffstat) 1,/^---$/d' \ | tac \ | sed ' # delete everything before the first blank line (git summary line) 1,/^$/d' \ | sed ' # convert to our README.Debian NEWS format 1 s/^/* / 2,$ s/^/ /' echo " Patch: $(basename $patch)" debian/emacsVER.README.Debian0000664000000000000000000000014012306371370012672 0ustar Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/ as the primary documentation directory. debian/mangle-info0000775000000000000000000000046312306371370011317 0ustar #!/usr/bin/perl -w -i use English; use strict; $RS = undef; my $prefix = $ENV{"DEBIAN_INFO_PREFIX"}; my $x = <>; if(!($x =~ m/^(\s*START-INFO-DIR-ENTRY\s+\*\s*[^:]+:\s*)\(([^\)]+)\)/mo)) { die "Couldn't find START-INFO-DIR-ENTRY."; } print ${PREMATCH}; print "$1($prefix/$2)"; print ${POSTMATCH}; debian/emacsVER.postinst0000664000000000000000000000303512306371370012445 0ustar #!/bin/sh set -e FLAVOR=@DEB_FLAVOR@ update-alternatives \ --install /usr/bin/emacs emacs \ /usr/bin/${FLAVOR}-@X_SUPPORT@ @BIN_PRIORITY@ \ --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \ /usr/share/man/man1/emacs.${FLAVOR}.1.gz \ --slave /usr/share/icons/hicolor/scalable/apps/emacs.svg emacs.svg \ /usr/share/icons/hicolor/scalable/apps/${FLAVOR}.svg \ --slave /usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg \ emacs-document.svg \ /usr/share/icons/hicolor/scalable/mimetypes/${FLAVOR}-document.svg \ --slave /usr/share/icons/hicolor/16x16/apps/emacs.png emacs-16x16.png \ /usr/share/icons/hicolor/16x16/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/24x24/apps/emacs.png emacs-24x24.png \ /usr/share/icons/hicolor/24x24/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/32x32/apps/emacs.png emacs-32x32.png \ /usr/share/icons/hicolor/32x32/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/48x48/apps/emacs.png emacs-48x48.png \ /usr/share/icons/hicolor/48x48/apps/${FLAVOR}.png \ --slave /usr/share/icons/hicolor/128x128/apps/emacs.png emacs-128x128.png \ /usr/share/icons/hicolor/128x128/apps/${FLAVOR}.png update-alternatives \ --install /usr/bin/editor editor \ /usr/bin/${FLAVOR} 0 \ --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ /usr/share/man/man1/emacs.${FLAVOR}.1.gz # emacsen-common registration. /usr/lib/emacsen-common/emacs-install ${FLAVOR} #DEBHELPER# debian/emacsVER.README0000664000000000000000000000012612306371370011515 0ustar Please see /usr/share/doc/@PKG_NAME@-common/ as the primary documentation directory. debian/emacsVER.menu0000664000000000000000000000127312306371370011530 0ustar ?package(@PKG_NAME@):\ needs="X11"\ section="Applications/Editors"\ title="Emacs @MENU_VERSION@ (X11)"\ command="/usr/bin/@DEB_FLAVOR@"\ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\ icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm"\ hints="Text" ?package(@PKG_NAME@):\ needs="text"\ section="Applications/Editors"\ title="Emacs @MENU_VERSION@ (text)"\ command="/usr/bin/@DEB_FLAVOR@ -nw"\ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\ icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm"\ hints="Text" debian/control.in0000664000000000000000000001100312306371370011175 0ustar Source: @DEB_FLAVOR@ Section: editors Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff5-dev | libtiff-dev, xaw3dg-dev, libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ Standards-Version: 3.7.2 Package: @DEB_FLAVOR@-lucid Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox Description: GNU Emacs editor GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a Lucid user interface. Package: @DEB_FLAVOR@-lucid-dbg Section: debug Priority: extra Architecture: any Depends: @DEB_FLAVOR@-lucid-dbg (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for @DEB_FLAVOR@-lucid GNU Emacs is the extensible self-documenting text editor. This package contains the debugging symbols for the version of Emacs with a Lucid user interface. Package: @DEB_FLAVOR@-nox Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid Description: GNU Emacs editor (without X support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs compiled without support for X. Package: @DEB_FLAVOR@-nox-dbg Section: debug Priority: extra Architecture: any Depends: @DEB_FLAVOR@-nox-dbg (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for @DEB_FLAVOR@-nox GNU Emacs is the extensible self-documenting text editor. This package contains the debugging symbols for a version of Emacs compiled without support for X. Package: @DEB_FLAVOR@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox Description: GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a GTK+ user interface. Package: @DEB_FLAVOR@-dbg Section: debug Priority: extra Architecture: any Depends: @DEB_FLAVOR@-dbg (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for @DEB_FLAVOR@ GNU Emacs is the extensible self-documenting text editor. This package contains the debugging symbols for a version of Emacs with a GTK+ user interface. Package: @DEB_FLAVOR@-bin-common Architecture: any Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox. Package: @DEB_FLAVOR@-common Architecture: all Depends: emacsen-common (>= 1.4.10), 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. This package contains the architecture independent infrastructure that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox. Package: @DEB_FLAVOR@-el Architecture: all Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${misc:Depends} Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, saving space in the main package for small systems. debian/.git-dpm0000664000000000000000000000043012306371466010537 0ustar # see git-dpm(1) from git-dpm package 5f08d4eba0c5bb51294ee89d4285f3cc6dde925f 5f08d4eba0c5bb51294ee89d4285f3cc6dde925f 24c1fe67725d87a843919696fdc1ff49c99e7fd4 24c1fe67725d87a843919696fdc1ff49c99e7fd4 emacs24_24.3+1.orig.tar.bz2 421a2aef37aedf8ca24bb57cd100d173022e79a4 25725234 debian/README.add-on-package-maintainers0000664000000000000000000000021112306371370015106 0ustar Please see /usr/share/doc/emacsen-common/debian-emacs-policy.gz for information on how to properly structure your emacs add-on packages. debian/autofiles-diff-header0000664000000000000000000000016212306371370013243 0ustar * The autoconf related files have been updated. Patch: autofiles.dpatch Author: N/A (automatically generated) debian/emacsVER-common.README0000664000000000000000000000266612306371370013016 0ustar This file details the Debian specific changes to Emacs. The following tags may be used in the sections below: Patch, Status, Author, Added-by, Provided-by, and Date. When known, Author is used to indicate the person believed to have written the relevant code. Provided-by may be used to indicate the person who submitted the code to Debian, and Added-by indicates the person who actually added the code to the Debian package. * The Debian copy of the upstream source contains no .elc files. The .elc files have been removed because we always regenerate them and because Emacs modifies them in the source tree during the build process, even when using a VPATH build. This means that a "make clean" can't easily return the tree to the upstream state, resulting in a giant Debian binary diff. There are other solutions if this turns out to be a problem. If nothing else, we can keep the current infrastructure and just add the .elc files to protected_files in debian/rules. Removing the .elc files doesn't affect whether or not our source archive would match the upstream md5sum because we have to repackage it anyway to add leim support. * Those who prefer the old-style scrollbars can edit debian/rules If you prefer the old-style, non-toolkit scrollbars, just edit debian/rules to add --without-toolkit-scrollbars where indicated and rebuild. @@PATCH_LIST_HERE@@ Local Variables: mode: outline outline-regexp: " *\\*+" End: debian/emacsVER-common.postinst0000664000000000000000000000150012306371370013726 0ustar #!/bin/sh set -e MAJOR=@MAJOR_VERSION@ MINOR=@MINOR_VERSION@ FULL=@FULL_VERSION@ # Create the site-lisp dir for this flavor if we're allowed parentdir=/usr/local/share/emacs newdir=site-lisp if [ -d ${parentdir} ] then if mkdir ${parentdir}/${newdir} 2>/dev/null then chown root:staff ${parentdir}/${newdir} chmod 2775 ${parentdir}/${newdir} fi fi parentdir=/usr/local/share/emacs newdir=${FULL} if [ -d ${parentdir} ] then if mkdir ${parentdir}/${newdir} 2>/dev/null then chown root:staff ${parentdir}/${newdir} chmod 2775 ${parentdir}/${newdir} fi fi parentdir=/usr/local/share/emacs/${FULL} newdir=site-lisp if [ -d ${parentdir} ] then if mkdir ${parentdir}/${newdir} 2>/dev/null then chown root:staff ${parentdir}/${newdir} chmod 2775 ${parentdir}/${newdir} fi fi #DEBHELPER# debian/emacsVER-bin-common.lintian-overrides0000664000000000000000000000106712306371370016257 0ustar @PKG_NAME@ binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail @PKG_NAME@ binary: binary-without-manpage usr/bin/b2m.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/ctags.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/ebrowse.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/emacsclient.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/etags.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/grep-changelog.@DEB_FLAVOR@ @PKG_NAME@ binary: binary-without-manpage usr/bin/rcs-checkin.@DEB_FLAVOR@ debian/copyright.in0000664000000000000000000001342412306371370011536 0ustar -*-text-*- This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source archive is emacs-@UPSTREAM_VERSION@.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a description of the Debian specific differences from the upstream version. As mentioned there, some files (including some of the Emacs documentation) have been removed from this package because their licenses do not appear to satisfy the requirements of the Debian Free Software Guidelines (DFSG). See http://www.debian.org/social_contract. In particular, some of the info pages are covered under the GNU Free Documentation License (GFDL), which Debian has decided does not satisfy the DFSG in cases where "Invariant Sections" are specified (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. Copyright: Emacs itself is licensed under the terms of the GNU General Public License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and doc/man/rcs-checkin.1 are licensed as follows: Copyright (C) 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/emacs.1 is licensed as follows: Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. doc/man/etags.1 is licensed as follows: Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this document into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. etc/publicsuffix.txt is licensed as follows: The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. man/faq.texi is licensed as follows: Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner Copyright (C) 1992,1993 Steven Byrnes Copyright (C) 1990,1991,1992 Joseph Brian Wells This list of frequently asked questions about GNU Emacs with answers ("FAQ") may be translated into other languages, transformed into other formats (e.g. Texinfo, Info, WWW, WAIS), and updated with new information. The same conditions apply to any derivative of the FAQ as apply to the FAQ itself. Every copy of the FAQ must include this notice or an approved translation, information on who is currently maintaining the FAQ and how to contact them (including their e-mail address), and information on where the latest version of the FAQ is archived (including FTP information). The FAQ may be copied and redistributed under these conditions, except that the FAQ may not be embedded in a larger literary work unless that work itself allows free copying and redistribution. debian/emacsVER.lintian-overrides0000664000000000000000000000034412306371370014220 0ustar @PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm @PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm debian/upstream-version0000775000000000000000000000066112306371370012446 0ustar #!/usr/bin/perl -w use strict; use English; open(my $config_file, '<', 'configure.ac') or die "cannot open configure.ac: $!"; my $version = ''; my $found_init = 0; while (<$config_file>) { if(/^AC_INIT\(emacs,\s*(\S+)\s*\)$/o) { $found_init and die 'found duplicate AC_INIT() in configure.ac'; $version = $1; $found_init = 1; } } $found_init or die 'no AC_INIT() found in configure.ac'; print "$version\n";