--- emacs-snapshot-20080228.orig/debian/NEWS +++ emacs-snapshot-20080228/debian/NEWS @@ -0,0 +1,68 @@ +emacs-snapshot (1:20071105-1) unstable; urgency=low + + * The Gnus version bundled with Emacs is now the development branch, + called No Gnus. You may wish to back up your Gnus files before + upgrading. + + -- Romain Francoise Fri, 02 Nov 2007 18:32:44 +0100 + +emacs-snapshot (1:20070902-1) unstable; urgency=low + + * Emacs now includes multi-tty support. + + * The emacs-snapshot package is now built with GTK+ support, following + upstream where GTK+ is now the default toolkit. The Lucid version + isn't provided anymore. + + -- Romain Francoise Sun, 02 Sep 2007 21:00:20 +0200 + +emacs-snapshot (1:20061111-1) unstable; urgency=low + + * The `emacs' alternative is now registered only once for all + emacs-snapshot subflavors (X, GTK, nox). Note that after upgrading + you might have to reselect the `emacs' and `editor' alternatives + manually, due to a bug in version 20061105-1. + + * Icons are now available in /usr/share/icons/emacs-snapshot to avoid + problems with version-dependent directories. + + -- Romain Francoise Sat, 11 Nov 2006 14:12:56 +0100 + +emacs-snapshot (1:20060120-2) unstable; urgency=low + + * It is now possible to install the -x, -gtk and -nox binary packages + concurrently. The new alternative `emacs-snapshot' determines which + package owns the /usr/bin/emacs-snapshot command. + + -- Romain Francoise Sat, 28 Jan 2006 10:37:05 +0100 + +emacs-snapshot (20050805100000-1) unstable; urgency=low + + * This is the first official release of emacs-snapshot in Debian. These + packages are based on the initial packaging work of Jérôme Marant and + Rob Browning (assisted by numerous contributors) and are maintained by + Romain Francoise . + + Note: emacs-snapshot contains a version of the GNU Emacs editor built + from CVS HEAD. As such, it can contain bugs and issues that make it + unsuitable for general use. Experience shows that grave bugs are, + however, quite rare and it should be stable enough for everyday use. + + This version of Emacs adds support for GTK+ widgets. The default + version (emacs-snapshot) still uses Lucid, a new binary package + (emacs-snapshot-gtk) is available if you want GTK+ support. + + Several major packages have been updated or added in Emacs 22. In + particular, Gnus is now at version 5.11. If you had been using the + version of Gnus shipped in Emacs 21, starting Gnus 5.11 may convert + files automatically and generally alter your data. Make sure you have + good backups. + + The complete list of patches applied to the upstream source is + available from /usr/share/doc/emacs-snapshot-common/README.Debian. + + -- Romain Francoise Fri, 5 Aug 2005 14:25:36 +0200 + +Local Variables: +coding: utf-8 +End: --- emacs-snapshot-20080228.orig/debian/docs +++ emacs-snapshot-20080228/debian/docs @@ -0,0 +1,4 @@ +BUGS +README +etc/AUTHORS +etc/CONTRIBUTE --- emacs-snapshot-20080228.orig/debian/emacs.preinst +++ emacs-snapshot-20080228/debian/emacs.preinst @@ -0,0 +1,28 @@ +#!/bin/sh -e + +# Starting with 20061105-1, the emacs and editor alternatives are +# registered only once. We need to clean up any previous registrations +# by subflavor packages. +if [ "$1" = "upgrade" ] && \ + dpkg --compare-versions "$2" 'lt' "1:20061105-1"; then + update-alternatives --remove emacs /usr/bin/@BIN_NAME@-@X_SUPPORT@ +fi + +# If lsof is installed, look for running Emacsen. If any are found, +# warn the user that changing Emacs's files from under it isn't safe... +# We don't bother trying to find processes if lsof isn't installed; +# using pgrep or something similar would turn up false positives. +F=/usr/bin/@BIN_NAME@-@X_SUPPORT@ +if [ -f $F ] && [ -x /usr/bin/lsof ]; then + PIDS=`lsof -F p $F 2>/dev/null | wc -l || true` + if [ $PIDS -ne 0 ]; then + [ $PIDS -ge 2 ] && S="es" + printf "%d %s process%s found\n" $PIDS `basename $F` "$S" + echo "NOTE: closing all running Emacsen before upgrading" \ + "is strongly recommended!" + fi +fi + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20080228.orig/debian/emacs-common.prerm +++ emacs-snapshot-20080228/debian/emacs-common.prerm @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +BIN_NAME=@BIN_NAME@ +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFO_SUBDIR=@INFO_EMACSDIR@ +INFOFILES="@INFO_FILES@" + +for file in ${INFOFILES} +do + install-info --quiet --remove-exactly ${INFO_SUBDIR}/${file} || true +done + +# emacsen-common/emacs-remove used to be here. + +(rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null && \ + rmdir /usr/local/share/emacs/${FULL} 2>/dev/null) || true + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20080228.orig/debian/control +++ emacs-snapshot-20080228/debian/control @@ -0,0 +1,72 @@ +Source: emacs-snapshot +Section: editors +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Romain Francoise +Build-Depends: libncurses5-dev, texinfo, liblockfile-dev, libgif-dev, libtiff-dev, libpng12-dev, libjpeg62-dev, libxpm-dev, libgtk2.0-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 5.0.0), libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], librsvg2-dev, lsb-release, libxft-dev, libdbus-1-dev +Standards-Version: 3.7.3 +Homepage: http://www.gnu.org/software/emacs/ +Vcs-Browser: http://git.debian.org/?p=users/rfrancoise/emacs-snapshot.git +Vcs-Git: git://git.debian.org/git/users/rfrancoise/emacs-snapshot.git + +Package: emacs-snapshot-common +Section: editors +Priority: optional +Architecture: all +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0) +Suggests: emacs-snapshot-el +Conflicts: emacs-snapshot-el (<< ${source:Version}), w3-el, dictionaries-common (<< 0.60.0), emacs-snapshot (<< 1:20060120-2), emacs-snapshot-gtk (<< 1:20060120-2), emacs-snapshot-nox (<< 1:20060120-2) +Description: The GNU Emacs editor's common infrastructure + GNU Emacs is the extensible self-documenting text editor. + This package contains the infrastructure common between emacs-snapshot + and emacs-snapshot-nox. + +Package: emacs-snapshot-bin-common +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-common (= ${source:Version}), ${shlibs:Depends} +Conflicts: emacs-snapshot (<< 1:20060120-2), emacs-snapshot-gtk (<< 1:20060120-2), emacs-snapshot-nox (<< 1:20060120-2) +Description: The 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 emacs-snapshot and emacs-snapshot-nox. + +Package: emacs-snapshot +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-bin-common (= ${binary:Version}), ${shlibs:Depends} +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el, emacs-snapshot-gtk (<= 1:20070824-1) +Description: The GNU Emacs editor (development snapshot) + GNU Emacs is the extensible self-documenting text editor. + +Package: emacs-snapshot-gtk +Section: editors +Priority: extra +Architecture: all +Depends: emacs-snapshot +Description: The GNU Emacs editor (transitional package) + Empty package to facilitate upgrades, can be safely removed. + +Package: emacs-snapshot-nox +Section: editors +Priority: optional +Architecture: any +Depends: emacs-snapshot-bin-common (= ${binary:Version}), ${shlibs:Depends} +Provides: emacs-snapshot, emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The 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: emacs-snapshot-el +Section: editors +Priority: optional +Architecture: all +Depends: emacs-snapshot-common (= ${source:Version}) +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. --- emacs-snapshot-20080228.orig/debian/emacs-bin-common.postinst +++ emacs-snapshot-20080228/debian/emacs-bin-common.postinst @@ -0,0 +1,30 @@ +#!/bin/sh -e + +BIN_NAME=@BIN_NAME@ +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 ctags etags emacsclient +do + update-alternatives \ + --install /usr/bin/$i $i /usr/bin/$i.${BIN_NAME} ${BIN_PRIORITY} \ + --slave /usr/share/man/man1/$i.1.gz $i.1.gz \ + /usr/share/man/man1/$i.1${BIN_NAME}.gz +done + +for i in ${ALTERNATIVES} +do + test $i = ctags && continue + test $i = etags && continue + test $i = emacsclient && continue + update-alternatives --install /usr/bin/$i $i /usr/bin/$i.${BIN_NAME} \ + ${BIN_PRIORITY} +done + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20080228.orig/debian/bug.presubj.in +++ emacs-snapshot-20080228/debian/bug.presubj.in @@ -0,0 +1,6 @@ +Please use "@BIN_NAME@ -q" to verify that the bug you want to report +isn't caused by a configuration error. + +If you still see the bug, please try again with "@BIN_NAME@ -Q" +(capital q), this switch disables the various add-on Emacs packages +you have installed (which could be causing the bug). --- emacs-snapshot-20080228.orig/debian/emacs.desktop +++ emacs-snapshot-20080228/debian/emacs.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=@MENU_TITLE@ (@SUB_FLAVOR@) +GenericName=Emacs +Comment=GNU @MENU_TITLE@ Text Editor +Exec=/usr/bin/@BIN_NAME@-@X_SUPPORT@ +TryExec=@BIN_NAME@ +Terminal=false +Type=Application +Icon=/usr/share/icons/@BIN_NAME@/emacs.xpm +Categories=Development;Utility;TextEditor; +MimeType=text/plain --- emacs-snapshot-20080228.orig/debian/emacs.overrides.lintian +++ emacs-snapshot-20080228/debian/emacs.overrides.lintian @@ -0,0 +1,2 @@ +@PKG_NAME@: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm +@PKG_NAME@: binary-without-manpage usr/bin/@PKG_NAME@-x --- emacs-snapshot-20080228.orig/debian/emacs-common.overrides.lintian +++ emacs-snapshot-20080228/debian/emacs-common.overrides.lintian @@ -0,0 +1,4 @@ +@PKG_NAME@: extra-license-file usr/share/emacs/@FULL_VERSION@/etc/copying.paper +@PKG_NAME@: script-not-executable ./usr/share/emacs/@FULL_VERSION@/etc/ulimit.hack +@PKG_NAME@: wrong-name-for-upstream-changelog usr/share/doc/@PKG_NAME@/changelogs +@PKG_NAME@: menu-command-not-in-package /usr/share/menu/@PKG_NAME@:7 /usr/bin/@BIN_NAME@ --- emacs-snapshot-20080228.orig/debian/README.in +++ emacs-snapshot-20080228/debian/README.in @@ -0,0 +1,9 @@ +emacs-snapshot for Debian -*- outline -*- +------------------------- + +* Notes about emacs-snapshot + +These packages are based on the initial packaging work of Jérôme Marant +and Rob Browning (assisted by numerous contributors) and are maintained +by Romain Francoise . + --- emacs-snapshot-20080228.orig/debian/rules +++ emacs-snapshot-20080228/debian/rules @@ -0,0 +1,685 @@ +#!/usr/bin/make -f + +# Copyright 1994, 1995 Ian Jackson. +# Copyright 1998-2003 Rob Browning . +# Copyright 2004, 2005 Jérôme Marant . +# Copyright 2005, 2006, 2007, 2008 Romain Francoise . +# Copyright 2007 Michael Olson . + +# Originally copied from the GNU Hello Debian rules file (1.3). +# modified for emacs by Mark Eichin +# modified for emacs20 by Rob Browning +# modified for emacs21 by Rob Browning +# modified for emacs-snapshot by Romain Francoise +# modified for emacs22 by Michael Olson + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +SHELL = /bin/bash + +include /usr/share/quilt/quilt.make + +# XXX: we use DEB_QUILT_CMD below, it's originally a cdbs internal +# variable since Ubuntu's emacs22 uses cdbs's quilt patchsys. +DEB_QUILT_CMD := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +DEB_TRASH := + +# 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. + +# At the moment, we try to make it so that a "debian/rules clean" will +# get you back to the same state you were in before "debian/rules +# build". With the original upstream source that's somewhat tricky +# because they ship the .elc files, but we need to re-build them when +# we patch the corresponding .el files. This is further complicated +# by the fact that any of these .el files may have macros, and if +# those are changed, then any other .el files that use those macros +# must also be recompiled. Over time (over the years), we've tried +# various ways to handle this problem, originally by trying to keep +# track of which files need to be recompiled and only recompiling +# those, then later by just re-building all the .elc files with "make +# bootstrap". In either case, if you don't want to have diff bloat, +# you have to do something to keep track of the original .elc files so +# you can restore them during make clean. + +# All of this was a lot of work, and was using quite a bit of +# unnecessary storage both in the .orig.tar.gz and during the package +# build. So in order to avoid this, and to dramatically simplify +# things, we now just remove the .elc files from the upstream +# distribution whenever we create the debian .orig.tar.gz file for a +# given upstream release. Since were always clobbering all of the +# .elc files during the package build anyway, this shouldn't be any +# great loss, and it also means that "debian/rules clean" is now a +# simple matter of little more than a "make distclean" followed by a +# purge of all the remaining .elc files. + +# NOTE -- emacs doesn't respect .elc files in VPATH build. They're +# modified in srcdir, not builddir. We don't worry about this because +# it shouldn't affect our builds ATM, but if we ever have more than +# one emacs configuration which could produce differing .elc files, +# we'll need to be careful -- probably have to build completely +# separate packages from completely separate source trees. + +###### Flavour-dependent variables ### + +# Generic title of menu entries +menu_title = Emacs Snapshot +flav_desc = development snapshot + +# Alternative priority +bin_priority = 23 + +# Info files subdirectory +info_emacsdir = emacs-snapshot + +info_title = Emacs Snapshot + +###################################### + +# The name of the Debian source package +src_name := $(shell dpkg-parsechangelog | egrep '^Source:') +src_name := $(shell echo ${src_name} | perl -pe 's/Source:\s+//o') + +# The binary package prefix is currently equal to the source name +bin_name := ${src_name} + +# The version from the changelog (i.e. 20.5-1) +debian_ver := $(shell dpkg-parsechangelog | egrep '^Version:') +debian_ver := $(shell 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 echo ${debian_ver} | perl -pe 's/.*-//o') + +# This is the official upstream version defined by the emacs-version +# constant in lisp/version.el +nominal_ver := $(shell egrep 'defconst[[:space:]]*emacs-version' lisp/version.el) +nominal_ver := $(shell echo '${nominal_ver}' | sed -e 's;^[^"]*"\([^"]*\)".*$$;\1;') + +# 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 we do this by hand. +runtime_ver := $(shell echo ${nominal_ver} | perl -pe 's/[a-z]+$$//o') + +major_ver := $(shell echo ${runtime_ver} | perl -pe 's/\..*$$//o') +minor_ver := $(shell echo ${runtime_ver} | perl -pe 's/^[^.]*\.//o') + +# version for the debian source, i.e. if the upstream is 21.3, this +# 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... +# Always everything before the last '-' +debsrc_ver := $(shell echo ${debian_ver} | perl -pe 's/-[^-]+$$//o') + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# We need extra pure space for Debian menu entries. +CFLAGS := -DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +LDFLAGS := -g -Wl,--as-needed + +INSTALL = install + +confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + +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 := $(shell grep '^$$(infodir)/' doc/misc/Makefile.in | \ + sed -e "s%\$$(infodir)/\([^:]*\).*$$%\1%" | sort) emacs eintr elisp + +# Build directories +EMACS_COMMON = $(CURDIR)/debian/${bin_name}-common +EMACS_BIN_COMMON = $(CURDIR)/debian/${bin_name}-bin-common +EMACS = $(CURDIR)/debian/${bin_name} +EMACS_NOX = $(CURDIR)/debian/${bin_name}-nox +EMACS_EL = $(CURDIR)/debian/${bin_name}-el + +local_lpath := /etc/${bin_name}:/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 + +# This shouldn't be needed as of 20.3 +local_lpath := ${local_lpath}:/usr/share/emacs/${runtime_ver}/leim + +# Installation local_lpath +local_lpath_install := $(EMACS_COMMON)/$(subst :,:$(EMACS_COMMON)/,${local_lpath}) + +# These files must always exist, i.e. can't ever be cleaned. +PERSISTENT_AUTOGEN_FILES := debian/control debian/copyright + +NONPERSISTENT_AUTOGEN_FILES := \ + debian/README.Debian \ + debian/README.binpkg \ + debian/bug.presubj \ + debian/bug.script \ + debian/bug.control \ + debian/emacsclient-${bin_name}.desktop \ + debian/${bin_name}.menu \ + debian/${bin_name}.preinst \ + debian/${bin_name}.postinst \ + debian/${bin_name}.prerm \ + debian/${bin_name}.overrides.lintian \ + debian/${bin_name}.desktop \ + debian/${bin_name}-nox.preinst \ + debian/${bin_name}-nox.postinst \ + debian/${bin_name}-nox.prerm \ + debian/${bin_name}-nox.overrides.lintian \ + debian/${bin_name}-el.overrides.linda \ + debian/${bin_name}-common.postinst \ + debian/${bin_name}-common.prerm \ + debian/${bin_name}-common.overrides.lintian \ + debian/${bin_name}-common.overrides.linda \ + debian/${bin_name}-common.menu \ + debian/${bin_name}-bin-common.postinst \ + debian/${bin_name}-bin-common.prerm \ + debian/${bin_name}-bin-common.overrides.lintian \ + debian/${bin_name}-bin-common.overrides.linda + +DEBPKGFILES := ${PERSISTENT_AUTOGEN_FILES} ${NONPERSISTENT_AUTOGEN_FILES} + +movemail_bin := usr/lib/emacs/${runtime_ver}/${target}/movemail + +define checkdir + test -f debian/emacs.postinst + @if ! test -f src/emacs.c; \ + then \ + echo; \ + echo -n "The upstream source does not appear to be available."; \ + echo " Please put the contents"; \ + echo -n "of ${src_name}_${debsrc_ver}.orig.tar.gz into the"; \ + echo " current directory."; \ + echo; \ + false; \ + fi +endef + +define expand_file_subst_vars + sed -e "s%@SRC_NAME@%${src_name}%g" \ + -e "s%@BIN_NAME@%${bin_name}%g" \ + -e "s%@PKG_NAME@%${pkg_name}%g" \ + -e "s%@FULL_VERSION@%${runtime_ver}%g" \ + -e "s%@MAJOR_VERSION@%${major_ver}%g" \ + -e "s%@MINOR_VERSION@%${minor_ver}%g" \ + -e "s%@PACKAGE_VERSION@%${debian_ver}%g" \ + -e "s%@DEBIAN_REV@%${deb_rev}%g" \ + -e "s%@NOMINAL_VERSION@%${nominal_ver}%g" \ + -e "s%@X_SUPPORT@%${xsupport}%g" \ + -e "s%@BIN_PRIORITY@%${bin_priority}%g" \ + -e "s%@INFO_EMACSDIR@%${info_emacsdir}%g" \ + -e "s%@INFO_FILES@%${main_dir_info_files}%g" \ + -e "s%@INFO_TITLE@%${info_title}%g" \ + -e "s%@MENU_TITLE@%${menu_title}%g" \ + -e "s%@TARGET@%${target}%g" \ + -e "s%@FLAVOUR_DESC@% (${flav_desc})%g" \ + -e "s%@SUB_FLAVOR@%${sub_flavor}%g" \ + > $@ < $< +endef + +check-vars: + @echo "current directory: $(CURDIR)" + @echo "debian_ver: ${debian_ver}" + @echo "debsrc_ver: ${debsrc_ver}" + @echo "debian_rev: ${debian_rev}" + @echo "nominal_ver: ${nominal_ver}" + @echo "runtime_ver: ${runtime_ver}" + @echo "major_ver: ${major_ver}" + @echo "minor_ver: ${minor_ver}" +.PHONY: check-vars + +define patch_info + { for p in $$($(DEB_QUILT_CMD) series | grep "^$(1)-"); do \ + $(DEB_QUILT_CMD) header $$p; \ + done } \ + | grep -v '^#' | cat -s +endef + +# we use PHONY because deleting patches won't cause rebuild otherwise. +debian/README.Debian: debian/README.in debian/patches/*.diff + cp debian/README.in debian/README.Debian + @echo "* Additional features" >> debian/README.Debian + @echo >> debian/README.Debian + $(call patch_info,feature) >> debian/README.Debian + @echo "* Bugfixes" >> debian/README.Debian + @echo >> debian/README.Debian + $(call patch_info,fix) >> debian/README.Debian + @echo "* Changes specific to Debian-based systems" \ + >> debian/README.Debian + @echo >> debian/README.Debian + $(call patch_info,debian) >> debian/README.Debian +.PHONY: debian/README.Debian + +debian/%: debian/%.in debian/changelog + ${expand_file_subst_vars} + +debian/${bin_name}.%: xsupport := "gtk" +debian/${bin_name}.%: pkg_name := ${bin_name} +debian/${bin_name}.%: sub_flavor := "GTK" + +debian/${bin_name}-nox.%: xsupport := "nox" +debian/${bin_name}-nox.%: pkg_name := ${bin_name}-nox + +debian/${bin_name}-common.%: pkg_name := ${bin_name}-common + +debian/${bin_name}-bin-common.%: pkg_name := ${bin_name}-bin-common + +debian/%.menu: debian/%.menu.in + ${expand_file_subst_vars} + +debian/${bin_name}.%: debian/emacs.% + ${expand_file_subst_vars} + +debian/${bin_name}-nox.%: debian/emacs.% + ${expand_file_subst_vars} + +debian/${bin_name}-el.%: debian/emacs-el.% + ${expand_file_subst_vars} + +debian/${bin_name}-common.%: debian/emacs-common.% + ${expand_file_subst_vars} + +debian/${bin_name}-bin-common.%: debian/emacs-bin-common.% + ${expand_file_subst_vars} + +debian/emacsclient-${bin_name}.%: debian/emacsclient.% + ${expand_file_subst_vars} + +define build_cmd + ${MAKE} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +endef + +define check_pure_space + src/emacs -Q -batch --eval "(print pure-space-overflow)" 2>/dev/null \ + | grep -qx nil +endef + +emacs_inst = (${MAKE} install \ + INSTALL_STRIP="-s" \ + prefix=${1}/usr \ + sharedstatedir=${1}/var/lib \ + localstatedir=${1}/var \ + libexecdir=${1}/usr/lib \ + infodir=${1}/usr/share/info/${info_emacsdir} \ + mandir=${1}/usr/share/man \ + manext=.1${bin_name} \ + locallisppath=${local_lpath_install}) + +define emacs_build + # Build emacs + CFLAGS="${CFLAGS}" ./configure ${1} + ${build_cmd} + # Check for pure space overflow + ${check_pure_space} + # save binary from deletion + mv src/emacs src/${2} +endef + +define inst_readme + # Install README.Debian + $(INSTALL) -D -m 0644 debian/README.binpkg \ + ${1}/usr/share/doc/${2}/README.Debian +endef + +define inst_desktop + # Install desktop entry + $(INSTALL) -D -m 0644 debian/${2}.desktop \ + ${1}/usr/share/applications/${2}.desktop +endef + +define inst_bug_files + # Install bug script and control file + $(INSTALL) -D -m 0755 debian/bug.script \ + ${1}/usr/share/bug/${2}/script + $(INSTALL) -D -m 0644 debian/bug.control \ + ${1}/usr/share/bug/${2}/control +endef + +define inst_bug_notice + # Install bug notice + $(INSTALL) -D -m 0644 debian/bug.presubj \ + ${1}/usr/share/bug/${2}/presubj +endef + +define inst_overrides + # Install overrides + $(INSTALL) -D -m 0644 debian/${3}.overrides.${1} \ + ${2}/usr/share/${1}/overrides/${3} +endef + +define inst_binary + $(INSTALL) -d ${2}/usr/bin + cp src/${1} ${2}/usr/bin/${3} +endef + +define inst_manpage + $(INSTALL) -d ${1}/usr/share/man/man1 + dh_link -p${4} usr/share/man/man1/emacs.1${2}.gz \ + usr/share/man/man1/${3}.1.gz +endef + +# Common confflags +confflags += --prefix=/usr +confflags += --sharedstatedir=/var/lib +confflags += --libexecdir=/usr/lib +confflags += --localstatedir=/var +confflags += --infodir=/usr/share/info +confflags += --mandir=/usr/share/man +confflags += --with-pop=yes +confflags += --enable-locallisppath=${local_lpath} + +# Emacs confflags +emacs_confflags := ${confflags} +emacs_confflags += --with-x=yes +emacs_confflags += --with-x-toolkit=gtk +emacs_confflags += --enable-font-backend + +# Emacs-nox confflags +emacs_nox_confflags := ${confflags} +emacs_nox_confflags += --with-x=no +emacs_nox_confflags += --without-dbus --without-sound + +distrib_id := $(shell lsb_release -s -i) +distrib_name := $(shell lsb_release -s -c) + +check-distribution: + @if [ ! "${distrib_id}" = "Debian" ]; then \ + echo "Building on ${distrib_id} ${distrib_name}" ; \ + echo "Disabling Debian-specific patches." ; \ + sed -i "/^debian-emacs-bugmail/d" \ + debian/patches/series ; \ + fi + +build: check-distribution patch build-stamp + +build-stamp: bootstrap emacs emacs-nox + dh_testdir + touch $@ + +bootstrap: bootstrap-stamp +bootstrap-stamp: + dh_testdir + + # Emacs must be bootstrapped at least once in order to + # generate .elc files + CFLAGS="${CFLAGS}" ./configure ${emacs_confflags} + ${build_cmd} bootstrap + ${build_cmd} distclean + + touch $@ + +emacs: bootstrap emacs-stamp +emacs-stamp: + dh_testdir + + $(call emacs_build,${emacs_confflags},gtk-emacs) + ${build_cmd} distclean + + touch $@ + +emacs-nox: bootstrap emacs-nox-stamp +emacs-nox-stamp: + dh_testdir + + $(call emacs_build,${emacs_nox_confflags},nox-emacs) + + touch $@ + +debian-clean: + dh_testdir + dh_testroot + + rm -f ${NONPERSISTENT_AUTOGEN_FILES} + rm -f ${DEB_TRASH} + + dh_clean + +clean: unpatch debian-clean + + rm -f *-stamp + + # Force configuration in order to prevent any problem + # that may have been happening during the previous + # build + CFLAGS="${CFLAGS}" ./configure ${emacs_confflags} + [ ! -f Makefile ] || $(MAKE) maintainer-clean + + rm -f src/{x,nox}-emacs + + # Remove byte compiled files + find -name "*.elc" | xargs --no-run-if-empty rm + + # Remove info files + for f in ${main_dir_info_files} ; do \ + rm -f info/$$f* ; \ + done + + # Remove backup files + find -name '*~' | xargs --no-run-if-empty rm -f + +install: build $(DEBPKGFILES) + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + ################################################## + # emacs-common (preparation) + + # Install everything in emacs-common. Then any other + # package is based on it. + $(call emacs_inst,$(EMACS_COMMON)) + + rm -f $(EMACS_COMMON)/usr/bin/{emacs,emacs-*} + + # lisp path directories + $(INSTALL) -d $(EMACS_COMMON)/etc/${bin_name}/site-start.d + $(INSTALL) -d $(EMACS_COMMON)/usr/share/${bin_name} + + # We need scratch space in /var to register subflavors + $(INSTALL) -d $(EMACS_COMMON)/var/lib/${bin_name}/installed-subflavors + + # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs + # to be in share/emacs21 so that as we upgrade from 21.1 to 21.2, etc., + # add-on package bits don't get left behind. + mv $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/site-lisp \ + $(EMACS_COMMON)/usr/share/${bin_name} + dh_link -p${bin_name}-common usr/share/${bin_name}/site-lisp \ + usr/share/emacs/${runtime_ver}/site-lisp + + # This is a duplicate of the file in /site-lisp + rm $(EMACS_COMMON)/usr/share/emacs/site-lisp/subdirs.el + + # Install icon, and create symlink in the icons directory + cp debian/emacs.xpm \ + $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/etc/emacs.xpm + dh_link -p${bin_name}-common \ + usr/share/emacs/${runtime_ver}/etc/emacs.xpm \ + usr/share/emacs/${runtime_ver}/etc/images/icons/emacs.xpm + + # Symlink icons directory in /usr/share/icons + dh_link -p${bin_name}-common \ + usr/share/emacs/${nominal_ver}/etc/images/icons \ + usr/share/icons/${bin_name} + + chown root.mail $(EMACS_COMMON)/${movemail_bin} + chmod g+s $(EMACS_COMMON)/${movemail_bin} + + # Mangle info files + chmod 755 debian/mangle-info + for f in ${main_dir_info_files} ; do \ + DEBIAN_INFO_PREFIX=${info_emacsdir} \ + debian/mangle-info \ + $(EMACS_COMMON)/usr/share/info/${info_emacsdir}/$$f ; \ + done + + # Install changelogs -- remove this for stable Emacs releases + $(INSTALL) -D -p -m 0644 ChangeLog $(EMACS_COMMON)/usr/share/doc/${bin_name}-common/changelogs/changelog + for d in src lisp{,/gnus,/url,/mh-e} man lwlib lib-src leim ; do \ + $(INSTALL) -p -m 0644 $$d/ChangeLog \ + $(EMACS_COMMON)/usr/share/doc/${bin_name}-common/changelogs/`echo $$d|sed 's@/@.@'`.changelog ; \ + done + dh_link -p${bin_name}-common \ + usr/share/doc/${bin_name}-common/changelogs/changelog.gz \ + usr/share/doc/${bin_name}-common/changelog.gz + + # Symlink /usr/share/doc/emacs-common/NEWS to the Emacs NEWS file + dh_link -p${bin_name}-common \ + usr/share/emacs/${nominal_ver}/etc/NEWS \ + usr/share/doc/${bin_name}-common/NEWS + + # Get rid of unwanted dir file. + rm $(EMACS_COMMON)/usr/share/info/${info_emacsdir}/dir + rm $(EMACS_COMMON)/usr/share/info/${info_emacsdir}/dir.old* + + # make sure /usr/local dir doesn't exist + rm -rf $(EMACS_COMMON)/usr/local + + # Remove /var/games/emacs, too. + rm -rf $(EMACS_COMMON)/var/games/emacs + + $(call inst_overrides,lintian,$(EMACS_COMMON),${bin_name}-common) + $(call inst_overrides,linda,$(EMACS_COMMON),${bin_name}-common) + $(call inst_bug_files,$(EMACS_COMMON),${bin_name}-common) + + # Remove extra license files + rm -f $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/{etc,lisp}/COPYING + + ################################################## + # emacs-bin-common (preparation) + + # Move common binary to emacs-bin-common + $(INSTALL) -d $(EMACS_BIN_COMMON)/usr + mv $(EMACS_COMMON)/usr/bin $(EMACS_BIN_COMMON)/usr + mv $(EMACS_COMMON)/usr/lib $(EMACS_BIN_COMMON)/usr + + # Set alternatives + (alternatives=`ls $(EMACS_BIN_COMMON)/usr/bin | xargs` && \ + for f in debian/${bin_name}-bin-common.* ; do \ + sed -e "s%@ALTERNATIVES@%$$alternatives%g" \ + $$f > $$f.new ; \ + mv $$f.new $$f ; \ + done) + + for f in `ls $(EMACS_BIN_COMMON)/usr/bin`; \ + do \ + mv $(EMACS_BIN_COMMON)/usr/bin/$$f \ + $(EMACS_BIN_COMMON)/usr/bin/$$f.${bin_name} ; \ + done + + # Move man pages + $(INSTALL) -d $(EMACS_BIN_COMMON)/usr/share + mv $(EMACS_COMMON)/usr/share/man $(EMACS_BIN_COMMON)/usr/share + + # Fix manpages + perl -pi -e "s|man1/etags\\.1|man1/etags\\.1${bin_name}|" \ + $(EMACS_BIN_COMMON)/usr/share/man/man1/ctags.1${bin_name} + dh_link -p${bin_name}-bin-common usr/share/man/man1/emacs.1${bin_name}.gz \ + usr/share/man/man1/${bin_name}.1.gz + + $(call inst_desktop,$(EMACS_BIN_COMMON),emacsclient-${bin_name}) + $(call inst_readme,$(EMACS_BIN_COMMON),${bin_name}-bin-common) + $(call inst_overrides,lintian,$(EMACS_BIN_COMMON),${bin_name}-bin-common) + $(call inst_overrides,linda,$(EMACS_BIN_COMMON),${bin_name}-bin-common) + $(call inst_bug_files,$(EMACS_BIN_COMMON),${bin_name}-bin-common) + + ################################################## + # emacs (preparation) + + $(call inst_binary,gtk-emacs,$(EMACS),${bin_name}-gtk) + $(call inst_manpage,$(EMACS),${bin_name},${bin_name}-gtk,${bin_name}) + $(call inst_readme,$(EMACS),${bin_name}) + $(call inst_desktop,$(EMACS),${bin_name}) + $(call inst_overrides,lintian,$(EMACS),${bin_name}) + $(call inst_bug_files,$(EMACS),${bin_name}) + $(call inst_bug_notice,$(EMACS),${bin_name}) + + # Create a compatibility symlink emacs-x -> emacs-gtk. + dh_link -p${bin_name} usr/bin/${bin_name}-gtk usr/bin/${bin_name}-x + + ################################################## + # emacs-nox (preparation) + + $(call inst_binary,nox-emacs,$(EMACS_NOX),${bin_name}-nox) + $(call inst_manpage,$(EMACS_NOX),${bin_name},${bin_name}-nox,${bin_name}-nox) + $(call inst_readme,$(EMACS_NOX),${bin_name}-nox) + $(call inst_overrides,lintian,$(EMACS_NOX),${bin_name}-nox) + $(call inst_bug_files,$(EMACS_NOX),${bin_name}-nox) + $(call inst_bug_notice,$(EMACS_NOX),${bin_name}-nox) + + ################################################## + # emacs-el (preparation) + + (cd $(EMACS_COMMON) && \ + find -name "*.el.gz" | \ + tar cpf - --files-from -) | \ + (cd $(EMACS_EL) && tar xpf -) + + $(call inst_readme,$(EMACS_EL),${bin_name}-el) + $(call inst_overrides,linda,$(EMACS_EL),${bin_name}-el) + $(call inst_bug_files,$(EMACS_EL),${bin_name}-el) + + ################################################## + # Final emacs-common clean ups + + # We install the DOC file in emacs-common. It used to be in + # the binary packages but it turns out that it's identical + # for all packages on all archs, and prevents installation + # of concurrent subflavors. (But let's just keep one.) + rm -f $(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/etc/DOC-${runtime_ver}.2 + find $(EMACS_COMMON) -name "*.el.gz" -exec rm -f {} \; + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i + dh_installmenu -i + dh_link -i + dh_strip -i + dh_compress -XREADME.Debian -i + dh_fixperms -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i -- -Z bzip2 + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installinfo -a + dh_installman -a + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_desktop -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a -X${movemail_bin} + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a -- -Z bzip2 + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- emacs-snapshot-20080228.orig/debian/emacs-common.postinst +++ emacs-snapshot-20080228/debian/emacs-common.postinst @@ -0,0 +1,96 @@ +#!/bin/sh -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFOFILES="@INFO_FILES@" +INFO_SUBDIR=@INFO_EMACSDIR@ +INFO_TITLE="@INFO_TITLE@" + +for file in ${INFOFILES} +do + install-info --quiet --section "${INFO_TITLE}" "${INFO_TITLE}" \ + /usr/share/info/${INFO_SUBDIR}/${file}.gz || true +done + +# Remove stale entry for emacs-xtra (emacs-snapshot only, #404694) +if grep -q emacs-snapshot/emacs-xtra /usr/share/info/dir; then + install-info --quiet --remove-exactly emacs-snapshot/emacs-xtra +fi + +# Create the site-lisp dir for this flavor if we're allowed + +#### Begin Bug fix hack for old emacs20 package brain damage. +# +# We have to handle /usr/local/share and /usr/local/share/emacs here +# because emacs20 used to contain /usr/local/share :< . Normally +# these dirs should have been handled exclusively by emacsen-common. + +parentdir=/usr/local +newdir=share + +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 +newdir=emacs + +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=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 + +#### End Bug fix hack for old emacs20 package brain damage. + + +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 + +# emacsen-common/emacs-install used to be here. + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20080228.orig/debian/emacs-bin-common.prerm +++ emacs-snapshot-20080228/debian/emacs-bin-common.prerm @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +BIN_NAME=@BIN_NAME@ +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.${BIN_NAME} + done +fi + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20080228.orig/debian/emacs.prerm +++ emacs-snapshot-20080228/debian/emacs.prerm @@ -0,0 +1,41 @@ +#!/bin/sh + +set -e + +# Unregister ourselves as a subflavor of this flavor +rm -f /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-@X_SUPPORT@ + +# If we're the last installed subflavor, call `emacs-remove' and +# unregister various alternatives. +F=`ls /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-* 2>/dev/null || true` +if [ -n "$F" ]; then + echo "@BIN_NAME@ subflavors still installed, not uninstalling flavor..." +else + INSTLOG=`mktemp /tmp/@BIN_NAME@.XXXXXX` + echo -n "Cleaning up add-on packages..." + if /usr/lib/emacsen-common/emacs-remove @BIN_NAME@ >$INSTLOG 2>&1; then + echo " done." + [ -z "$EMACS_DEBUG" ] && rm -f $INSTLOG + else + echo " failed." + echo + echo "!! emacs-remove @BIN_NAME@ failed!" + echo "!! Please file a bug report against @BIN_NAME@" + echo "!! and attach the file $INSTLOG" + exit 1 + fi + + if [ "$1" != "upgrade" ]; then + update-alternatives --remove emacs /usr/bin/@BIN_NAME@ + update-alternatives --remove editor /usr/bin/@BIN_NAME@ + fi +fi + +# Remove our subflavor alternative, unless we're upgrading. +if [ "$1" != "upgrade" ]; then + update-alternatives --remove @BIN_NAME@ /usr/bin/@BIN_NAME@-@X_SUPPORT@ +fi + +#DEBHELPER# + +exit 0 --- emacs-snapshot-20080228.orig/debian/emacs-bin-common.overrides.lintian +++ emacs-snapshot-20080228/debian/emacs-bin-common.overrides.lintian @@ -0,0 +1,7 @@ +@PKG_NAME@: setgid-binary usr/lib/emacs/@FULL_VERSION@/@TARGET@/movemail 2755 root/mail +@PKG_NAME@: manpage-section-mismatch usr/share/man/man1/emacs.1@SRC_NAME@.gz:23 1@SRC_NAME@ != 1 +@PKG_NAME@: manpage-section-mismatch usr/share/man/man1/emacsclient.1@SRC_NAME@.gz:1 1@SRC_NAME@ != 1 +@PKG_NAME@: manpage-section-mismatch usr/share/man/man1/etags.1@SRC_NAME@.gz:4 1@SRC_NAME@ != 1 +@PKG_NAME@: binary-without-manpage usr/bin/ctags.@SRC_NAME@ +@PKG_NAME@: binary-without-manpage usr/bin/emacsclient.@SRC_NAME@ +@PKG_NAME@: binary-without-manpage usr/bin/etags.@SRC_NAME@ --- emacs-snapshot-20080228.orig/debian/emacs.xpm +++ emacs-snapshot-20080228/debian/emacs.xpm @@ -0,0 +1,222 @@ +/* XPM */ +static char * gnu_bits[] = { +"32 32 187 2", +" c None", +". c #696584", +"+ c #645F7C", +"@ c #5F5B76", +"# c #635F7C", +"$ c #5F5A76", +"% c #635E7B", +"& c #DCDBE1", +"* c #CFCED7", +"= c #B8B5C7", +"- c #ADA9C1", +"; c #A6A3B9", +"> c #9995A9", +", c #78748C", +"' c #676280", +") c #878398", +"! c #C2C0CD", +"~ c #9591AE", +"{ c #9B97B3", +"] c #BDBACC", +"^ c #9C98B3", +"/ c #A9A6B9", +"( c #67627D", +"_ c #625D7A", +": c #5E5A75", +"< c #8D89A0", +"[ c #A9A5BC", +"} c #938FAB", +"| c #B4B2C5", +"1 c #F8F8FA", +"2 c #E4E3EA", +"3 c #BCB9CB", +"4 c #9390A5", +"5 c #8B87A1", +"6 c #918DA9", +"7 c #BAB7C9", +"8 c #FFFFFF", +"9 c #F1F1F4", +"0 c #B4B1C4", +"a c #9D99AF", +"b c #5D5974", +"c c #8E8AA5", +"d c #A3A0B6", +"e c #F8F8F9", +"f c #9F9CB3", +"g c #8C88A3", +"h c #938FA9", +"i c #C6C4D1", +"j c #B7B4C5", +"k c #9D99B1", +"l c #5C5873", +"m c #8985A0", +"n c #B5B3C4", +"o c #F0F0F3", +"p c #A6A3B7", +"q c #9B98AE", +"r c #5C5872", +"s c #88849D", +"t c #A6A3B6", +"u c #F8F7F9", +"v c #C3C1CE", +"w c #9996AB", +"x c #5B5772", +"y c #85819A", +"z c #9491A7", +"A c #E0DFE6", +"B c #C2C0CC", +"C c #8C88A0", +"D c #9894A9", +"E c #5A5671", +"F c #838097", +"G c #B2B0BE", +"H c #F7F7F8", +"I c #D8D7DE", +"J c #928FA4", +"K c #9491A5", +"L c #5A5670", +"M c #817D95", +"N c #A9A6B6", +"O c #A8A5B6", +"P c #928FA3", +"Q c #59556F", +"R c #7E7B91", +"S c #BEBDC8", +"T c #AEACBA", +"U c #908DA0", +"V c #5B5771", +"W c #58546D", +"X c #65617A", +"Y c #E0DFE4", +"Z c #8E8B9E", +"` c #7A778D", +" . c #5A566F", +".. c #57536C", +"+. c #58546F", +"@. c #A19EAE", +"#. c #EAEAED", +"$. c #F5F4F6", +"%. c #A19FAE", +"&. c #625F78", +"*. c #77748A", +"=. c #59556E", +"-. c #56526B", +";. c #807D90", +">. c #D5D4DA", +",. c #9693A3", +"'. c #767387", +"). c #55516A", +"!. c #534F68", +"~. c #9491A1", +"{. c #F4F4F6", +"]. c #9E9CAA", +"^. c #5D5971", +"/. c #737084", +"(. c #545068", +"_. c #504D64", +":. c #F4F4F5", +"<. c #DEDDE2", +"[. c #5A576D", +"}. c #716F81", +"|. c #56526A", +"1. c #524F67", +"2. c #4D4A61", +"3. c #9A99A6", +"4. c #848292", +"5. c #6F6C7F", +"6. c #545169", +"7. c #514E65", +"8. c #4A475D", +"9. c #6B697B", +"0. c #D2D1D6", +"a. c #F4F3F5", +"b. c #9998A4", +"c. c #6C6A7B", +"d. c #535067", +"e. c #504C64", +"f. c #474459", +"g. c #747282", +"h. c #D1D0D5", +"i. c #E8E8EA", +"j. c #8C8A97", +"k. c #676576", +"l. c #4E4B62", +"m. c #444156", +"n. c #727080", +"o. c #E8E7EA", +"p. c #8A8996", +"q. c #656374", +"r. c #524F66", +"s. c #423F53", +"t. c #B8B7BE", +"u. c #D0CFD4", +"v. c #4E4B5E", +"w. c #636171", +"x. c #4C485E", +"y. c #434054", +"z. c #3F3C4F", +"A. c #575465", +"B. c #CFCED3", +"C. c #646272", +"D. c #504C62", +"E. c #49465B", +"F. c #4B475D", +"G. c #3D3A4C", +"H. c #494657", +"I. c #7A7884", +"J. c #B7B6BC", +"K. c #DADADD", +"L. c #4F4B61", +"M. c #464257", +"N. c #49455B", +"O. c #3A3748", +"P. c #5E5C6A", +"Q. c #908E98", +"R. c #C1C0C6", +"S. c #F3F2F4", +"T. c #777581", +"U. c #464357", +"V. c #474458", +"W. c #434053", +"X. c #3C3A4A", +"Y. c #373544", +"Z. c #444155", +"`. c #454256", +" + c #403D4F", +".+ c #423F52", +"++ c #444154", +" ", +" . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + . ", +" # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ # ", +" % $ & * = - - - - - - - - - - - - - - - - - - ; > , $ % ", +" ' $ ) ! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ { ] ] ^ ~ ~ ~ ~ ~ ~ ~ ~ / ( $ ' ", +" _ : < [ } } } } } } } } } } } } | 1 2 3 } } } } } } } 4 : _ ", +" : : 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 8 8 9 0 6 6 6 6 6 a : : ", +" b b c c c c c c c c c c c c c c d e 8 8 8 e c c c c c f b b ", +" b b g g g g g g g g g g g g h i e 8 8 8 8 j g g g g g k b b ", +" l l m m m m m m m m m m m n o 8 8 8 8 o p m m m m m m q l l ", +" r r s s s s s s s s s t o 8 8 8 8 u v s s s s s s s s w r r ", +" x x y y y y y y y z A 8 8 8 8 8 B C y y y y y y y y y D x x ", +" E E F F F F F F G H 8 8 8 8 I J F F F F F F F F F F F K l E ", +" L L M M M M M N 8 8 8 8 H O M M M M M M M M M M M M M P r L ", +" Q Q R R R R R S 8 8 8 8 T R R R R R R R R R R R R R R U V Q ", +" W W x x x x x X Y 8 8 8 Z x x x x x x x x x x x x x x ` .W ", +" ....+.+.+.+.+.+.+.@.#.8 $.%.&.+.+.+.+.+.+.+.+.+.+.+.+.*.=... ", +" -.-.-.-.-.-.-.-.;.>.8 8 8 8 8 ,.-.-.-.-.-.-.-.-.-.-.-.'.W -. ", +" ).).!.!.!.!.!.~.8 8 8 8 {.].^.!.!.!.!.!.!.!.!.!.!.!.!./...). ", +" (.(._._._._._.:.8 8 8 <.[._._._._._._._._._._._._._._.}.|.(. ", +" 1.1.2.2.2.2.2.3.8 8 8 4.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.5.6.1. ", +" 7.7.8.8.8.8.8.8.9.0.8 a.b.8.8.8.8.8.8.8.8.8.8.8.8.8.8.c.d.7. ", +" e.e.f.f.f.f.f.f.f.f.g.h.8 i.j.f.f.f.f.f.f.f.f.f.f.f.f.k.(.e. ", +" l.l.m.m.m.m.m.m.m.m.m.m.n.o.8 o.p.m.m.m.m.m.m.m.m.m.m.q.r.l. ", +" 2.2.s.s.s.s.s.s.s.s.s.s.s.s.t.8 8 u.v.s.s.s.s.s.s.s.s.w.7.2. ", +" x.x.y.z.z.z.z.z.z.z.z.z.z.z.A.8 8 8 B.z.z.z.z.z.z.z.z.C.D.x. ", +" E.F.f.G.G.G.G.G.G.G.G.H.I.J.8 8 8 8 K.G.G.G.G.G.G.G.G.k.L.E. ", +" M.N.N.y.O.O.O.O.O.O.O.O.P.Q.R.S.R.T.O.O.O.O.O.O.O.O.y.N.N.M. ", +" U.V.V.W.X.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.X.W.V.V.U. ", +" Z.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.Z. ", +" +.+++++++++++++++++++++++++++++++++++++++++.+ + ", +" "}; --- emacs-snapshot-20080228.orig/debian/changelog +++ emacs-snapshot-20080228/debian/changelog @@ -0,0 +1,1670 @@ +emacs-snapshot (1:20080228-1ubuntu1) hardy; urgency=low + + * Fix "Invalid face slant: roman" when using XFT fonts (LP: #197366) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Michael B. Trausch Wed, 12 Mar 2008 10:01:22 -0400 + +emacs-snapshot (1:20080228-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: + + Build emacs-nox without sound support. + + Use bzip2 compression to save bandwidth. + + * debian/patches/tmp-fixes.diff: Revert a bunch of commits which break + reverse video in the modeline. + + -- Romain Francoise Thu, 28 Feb 2008 20:55:55 +0100 + +emacs-snapshot (1:20080215-1) unstable; urgency=low + + * New snapshot. + * debian/rules: Add --without-dbus to emacs-nox confflags. + + -- Romain Francoise Fri, 15 Feb 2008 19:02:30 +0100 + +emacs-snapshot (1:20080209-1) unstable; urgency=low + + * The "Manuscript Replica" release. + + * New snapshot: + + The Emacs character set is now a superset of Unicode. + + Emacs has a new font backend with support for Xft/Freetype. + + D-Bus support is now enabled. + + * debian/rules: Add --enable-font-backend to emacs confflags. + * debian/control.in: + + Replace libungif4-dev with libgif-dev in build-depends. + + Add libxft-dev and libdbus-1-dev to build-depends. + * debian/control: Regenerate. + + -- Romain Francoise Sat, 09 Feb 2008 14:29:22 +0100 + +emacs-snapshot (1:20080126-1) unstable; urgency=low + + * New snapshot. + * debian/control: Set Standards-Version to 3.7.3, no changes needed. + + -- Romain Francoise Sat, 26 Jan 2008 21:47:13 +0100 + +emacs-snapshot (1:20080120-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 20 Jan 2008 13:49:44 +0100 + +emacs-snapshot (1:20080106-1) unstable; urgency=low + + * New snapshot. + * debian/emacs.prerm: Remove alternatives in reverse creation order + (LP: #162932). + * debian/patches/debian-inst.diff: New patch, disables installation of + the upstream desktop file, etc. + + -- Romain Francoise Sun, 06 Jan 2008 13:24:07 +0100 + +emacs-snapshot (1:20080101-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Tue, 01 Jan 2008 20:12:06 +0100 + +emacs-snapshot (1:20071215-1) unstable; urgency=low + + * The "Pocketful of mumbles" release. + + * New snapshot. + + * debian/control.in: Add build-depends on lsb-release. + * debian/control: Regenerate. + + * debian/patches/debian-emacs-bugmail.diff, + debian/patches/debian-emacs-bugver.diff: New patches split off from + debian-emacs-bug.diff. + * debian/patches/series: Update accordingly. + * debian/rules: Disable debian-emacs-bugmail.diff if not building on + Debian (based on lsb_release output). + + -- Romain Francoise Sat, 15 Dec 2007 14:07:15 +0100 + +emacs-snapshot (1:20071209-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 09 Dec 2007 19:12:17 +0100 + +emacs-snapshot (1:20071202-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 02 Dec 2007 12:00:08 +0100 + +emacs-snapshot (1:20071124-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sat, 24 Nov 2007 14:24:24 +0100 + +emacs-snapshot (1:20071119-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Mon, 19 Nov 2007 21:50:40 +0100 + +emacs-snapshot (1:20071111-1) unstable; urgency=low + + * New snapshot. + * debian/control{,.in}: Add Homepage, Vcs-Browser and Vcs-Git fields. + * debian/rules: Cleanup old lsb_release calls. + * debian/emacs{,-bin-common}.overrides.lintian: Cleanups. + + -- Romain Francoise Sun, 11 Nov 2007 16:56:09 +0100 + +emacs-snapshot (1:20071105-1) unstable; urgency=low + + * New snapshot. + * debian/NEWS: Add note about Gnus upgrade. + + -- Romain Francoise Mon, 05 Nov 2007 19:02:00 +0100 + +emacs-snapshot (1:20071027-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sat, 27 Oct 2007 23:36:01 +0200 + +emacs-snapshot (1:20071021-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 21 Oct 2007 00:06:44 +0200 + +emacs-snapshot (1:20071014-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 14 Oct 2007 17:41:48 +0200 + +emacs-snapshot (1:20071009-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Tue, 09 Oct 2007 19:09:02 +0200 + +emacs-snapshot (1:20071007-1) unstable; urgency=low + + * New snapshot. + + * debian/{emacs,emacsclient}.desktop: Switch main category from + 'Application' to 'Development'. + + * debian/patches/tmp-fixes.diff: Dropped. + + -- Romain Francoise Sun, 07 Oct 2007 14:13:21 +0200 + +emacs-snapshot (1:20070930-1) unstable; urgency=low + + * New snapshot. + + * debian/emacs-common.menu.in: Update for new menu policy. + * debian/emacs.menu.in: Ditto. + + * debian/patches/tmp-fixes.diff: Revert commit c62b98ee038, it breaks + `file-name-shadow-mode'. + + -- Romain Francoise Sun, 30 Sep 2007 13:15:08 +0200 + +emacs-snapshot (1:20070922-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sat, 22 Sep 2007 15:49:58 +0200 + +emacs-snapshot (1:20070915-2) unstable; urgency=low + + * debian/rules: + + Delete check-distribution target. + + Fix generation of the list of info files. + * debian/control.in: Don't build-depend on lsb-release. + * debian/control: Regenerate. + + -- Romain Francoise Sat, 15 Sep 2007 14:30:36 +0200 + +emacs-snapshot (1:20070915-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: Add missing build-depends on libxpm-dev. + * debian/control: Regenerate. + + * debian/docs: Adjust for new location of AUTHORS and CONTRIBUTE. + + * debian/patches/tmp-fixes.diff: Dropped. + + -- Romain Francoise Sat, 15 Sep 2007 12:37:30 +0200 + +emacs-snapshot (1:20070909-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/feature-dbp-horizontal-split.diff: Dropped, this + feature is now present upstream. + * debian/patches/tmp-fixes.diff: New patch, reverts bogus upstream + changes. + + -- Romain Francoise Sun, 09 Sep 2007 13:36:37 +0200 + +emacs-snapshot (1:20070903-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: Create a compatibility symlink emacs-x -> emacs-gtk in + emacs. + + -- Romain Francoise Mon, 03 Sep 2007 18:55:22 +0200 + +emacs-snapshot (1:20070902-1) unstable; urgency=low + + * The "Lose me on the way" release. + + * New snapshot, with multi-tty support. + + * debian/control.in: + + Don't build-depend on libxaw7-dev and xaw3dg-dev. + + Make emacs-gtk a dummy package that depends on emacs. + + emacs conflicts with emacs-gtk (<= 1:20070824-1). + * debian/control: Regenerate. + * debian/rules: Build emacs with GTK+ support. Don't build and install a + separate GTK+ version. + * debian/NEWS: Document switch to GTK+ by default. + * debian/README.in: Remove Emacs 22 upgrade notes. + + -- Romain Francoise Sun, 02 Sep 2007 21:00:07 +0200 + +emacs-snapshot (1:20070824-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Fri, 24 Aug 2007 18:41:07 +0200 + +emacs-snapshot (1:20070822-1) unstable; urgency=low + + * New snapshot from the trunk. Resync all patches and drop fix-vc-bfn.diff. + + * debian/control.in: Add Build-Depends on librsvg2-dev for SVG support. + * debian/control: Regenerate. + + -- Romain Francoise Wed, 22 Aug 2007 20:11:48 +0200 + +emacs-snapshot (1:20070813-2) unstable; urgency=low + + * debian/patches/feature-dbp-horizontal-split.diff: Make it work again + after upstream changes, thanks to Toby Allsopp for the report. + + -- Romain Francoise Wed, 15 Aug 2007 10:59:49 +0200 + +emacs-snapshot (1:20070813-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + * debian/patches/feature-dbp-horizontal-split.diff: Resync. + + * debian/control.in: Don't use ${Source-Version}. + * debian/control: Regenerate. + + -- Romain Francoise Mon, 13 Aug 2007 20:10:21 +0200 + +emacs-snapshot (1:20070805-1) unstable; urgency=low + + * The "Golden egg lipstick and feathers" release. + + [ Romain Francoise ] + * New snapshot (from the EMACS_22_BASE branch). + + * Convert to quilt for patch management: + + debian/control: Build-Depend on quilt (>= 0.42) instead of dpatch. + + debian/rules: Include /usr/share/quilt/quilt.make. + + Migrate all patches and rename them to follow Ubuntu's emacs22 + debian/fix/feature naming scheme. + + [ Michael Olson ] + * debian/rules: + + Don't ignore errors in clean target. + + New function patch_info to extract information from the headers + of patches that begin with a certain prefix. + + Split patch output in README.Debian into several sections, in + order make it easier to categorize by the type of patch. We use + the name of the patch to determine what kind it is. + + Lines with '#' in the headers of patches are stripped out. + + Multiple consecutive blank lines are trimmed to only one. + + -- Romain Francoise Sun, 05 Aug 2007 00:06:01 +0200 + +emacs-snapshot (1:20070701-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Sun, 01 Jul 2007 18:41:19 +0200 + +emacs-snapshot (1:20070617-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Sun, 17 Jun 2007 16:54:30 +0200 + +emacs-snapshot (1:20070608-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Fri, 08 Jun 2007 21:27:42 +0200 + +emacs-snapshot (1:20070529-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + * debian/rules: Don't ship /var/games/emacs in emacs-common, as we don't + install update-game-score setgid, it has no useful purpose. + + -- Romain Francoise Tue, 29 May 2007 19:39:25 +0200 + +emacs-snapshot (1:20070521-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Mon, 21 May 2007 13:05:40 +0200 + +emacs-snapshot (1:20070508-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Tue, 8 May 2007 13:33:22 +0200 + +emacs-snapshot (1:20070501-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Tue, 1 May 2007 12:29:02 +0200 + +emacs-snapshot (1:20070424-1) unstable; urgency=low + + * New snapshot (from the EMACS_22_BASE branch). + + -- Romain Francoise Tue, 24 Apr 2007 21:04:15 +0200 + +emacs-snapshot (1:20070417-1) unstable; urgency=low + + * The "We meet at the lights" release. + + * New snapshot (22.0.98 pretest). + + * debian/patches/debian-emacs-manpage.dpatch: Resync. + + * debian/copyright.in: Update copyright years (patch by Sven Joachim). + * debian/copyright: Regenerate. + + * debian/rules: Preserve timestamps of upstream changelogs (patch by + Sven Joachim). + + -- Romain Francoise Tue, 17 Apr 2007 19:24:14 +0200 + +emacs-snapshot (1:20070406-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Fri, 6 Apr 2007 12:30:44 +0200 + +emacs-snapshot (1:20070401-1) unstable; urgency=low + + * The "I wanna get what's mine" release. + + * New snapshot, includes ERC 5.2. + + * debian/control.in: Restore maintainer. + * debian/control: Regenerate. + + * debian/patches/debian-emacs-bug.dpatch: Don't send reports to p.d.o. + + -- Romain Francoise Sun, 1 Apr 2007 18:50:41 +0200 + +emacs-snapshot (1:20070302-1) unstable; urgency=low + + * The "Violins and happy endings" release. + + * New snapshot, fixes a memory corruption bug where Qt would suddenly + change when using certain byte-compiler options (closes: #411956). + Also, the upstream version is now 22.0.95. + + * debian/control.in: Set maintainer to Debian QA Group. + * debian/control: Regenerate. + + * debian/README.in: Delete mention to #emacs-snapshot. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 2 Mar 2007 18:07:09 +0100 + +emacs-snapshot (1:20070223-1) unstable; urgency=low + + * New snapshot, fixes a small documentation bug in PCL-CVS's manual + (closes: #411306). + + * debian/patches/tmp-fixes.dpatch: New patch, reverts a change to + process.c which breaks IDN, and maybe other things. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 2 Mar 2007 17:51:32 +0100 + +emacs-snapshot (1:20070217-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sat, 17 Feb 2007 11:09:33 +0100 + +emacs-snapshot (1:20070208-1) unstable; urgency=low + + * The "Being bad ain't that bad" release. + + * New snapshot, restores HPPA support (closes: #408884). + + * debian/control.in: Build-Depend on lsb-release. + * debian/control: Regenerate. + + * debian/rules: Check whether we're being built on Debian, if not + disable Debian branding patches. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Thu, 8 Feb 2007 19:45:31 +0100 + +emacs-snapshot (1:20070128-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: Add -Q to check_pure_space command (closes: #408689). + + * debian/patches/tmp-fixes.dpatch: New patch, reverts a change to the + byte-compiler which slows down compilation of large files. + * debian/patches/00list: Update. + + -- Romain Francoise Sun, 28 Jan 2007 19:31:23 +0100 + +emacs-snapshot (1:20070122-1) unstable; urgency=low + + * New snapshot, fixes obsolete addresses in emacs.1 (closes: #407095). + + * debian/patches/debian-emacs-manpage.dpatch: Resync. + + * debian/control.in: Don't use ${shlibs:Depends} in emacs-common depends + line. + * debian/control: Regenerate. + + -- Romain Francoise Mon, 22 Jan 2007 19:59:10 +0100 + +emacs-snapshot (1:20070114-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 14 Jan 2007 17:29:24 +0100 + +emacs-snapshot (1:20070106-1) unstable; urgency=low + + * The "With a fistful of faith" release. + + * New snapshot, fixes over-enthusiastic encoding auto-detection in files + containing a HTML meta tag (closes: #404236). + + * debian/emacs.postinst: Hide byte-compilation messages, most of the + time they're just useless noise. In case of byte-compilation failure, + display a visible error message asking for a bug report. + * debian/emacs.prerm: Ditto for removal messages. + + * debian/control.in: Drop build-dependency on autotools-dev and + autoconf (closes: #405395). + * debian/control: Regenerate. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Sat, 6 Jan 2007 13:37:29 +0100 + +emacs-snapshot (1:20070101-1) unstable; urgency=low + + * The "Wheat Field with Crows" release. + + * New snapshot. + + * debian/emacs-common.prerm: Fix typo in substitution variable which + caused the list of Info files to unregister to be empty, thanks to + Sven Joachim for noticing (closes: #404958). + * debian/emacs-common.postinst: Forcibly unregister emacs-xtra if it's + still present in the Info directory (closes: #404694). + * debian/emacs.postinst: Fix another failed substitution (in a comment). + + * debian/patches/tmp-fixes.dpatch: New patch, reverts a change in + cfengine.el that breaks font-locking (closes: #404244). + * debian/patches/00list: Update. + + -- Romain Francoise Mon, 1 Jan 2007 18:31:03 +0100 + +emacs-snapshot (1:20061221-1) unstable; urgency=low + + * New snapshot, fixes an annoying bug in file completion which crept in + the previous snapshot (not filed in the BTS). + + -- Romain Francoise Thu, 21 Dec 2006 19:15:04 +0100 + +emacs-snapshot (1:20061218-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Mon, 18 Dec 2006 20:04:29 +0100 + +emacs-snapshot (1:20061209-1) unstable; urgency=low + + * The "Comme on a pas le choix, il nous reste le coeur" release. + + * New snapshot. + + * debian/rules: Cleanup README.Debian generation. + * debian/bug.presubj.in: Also suggest using `emacs -Q' to identify + problems in add-on Emacs packages. + * debian/mangle-info: Suffix name with DEBIAN_INFO_PREFIX to make + browsing easier in Info (closes: #402043). + + -- Romain Francoise Sat, 9 Dec 2006 18:00:26 +0100 + +emacs-snapshot (1:20061201-1) unstable; urgency=low + + * New snapshot, fixes missing BLOCK_INPUT in `set_window_buffer' which + causes Emacs to hang in some situations (closes: #400255). + + -- Romain Francoise Fri, 1 Dec 2006 19:27:15 +0100 + +emacs-snapshot (1:20061123-1) unstable; urgency=low + + * The "Everything I say to you is code for something else" release. + + * New snapshot: + + Version number bumped to 22.0.91. + + ERC has been updated to version 5.2-pre. + + Fixes `mark-memory' build failure on ia64 (closes: #400060). + + * debian/emacsclient.desktop: New file, provides a desktop entry for our + emacsclient; this allows users to select emacsclient in GNOME/KDE + file associations. If the server isn't started, a new Emacs is spawned + (and in the near future, emacsclient will be able to start Emacs + properly itself). + + * debian/rules: + + Generate the emacsclient desktop file, and install it in + emacs-bin-common. + + Get rid of 'dir.old.gz' file in /usr/share/info. + + * Major cleanup of packaging scripts. + + -- Romain Francoise Thu, 23 Nov 2006 20:21:23 +0100 + +emacs-snapshot (1:20061117-1) unstable; urgency=low + + * New snapshot, fixes wrong error matcher initialization in cperl-mode + (closes: #397824). + + * debian/patches/debian-default-mta-parameters.dpatch: Dropped + (closes: #397756). + * debian/patches/00list: Update. + + * debian/emacs.preinst: Check if Emacs is running before upgrading and + if so, warn the user that this is unsafe. + + -- Romain Francoise Fri, 17 Nov 2006 22:15:05 +0100 + +emacs-snapshot (1:20061111-1) unstable; urgency=low + + * The "Is the bond now broken, does nothing remain?" release. + + * New snapshot: + + Includes Org-mode version 4.54. + + Fixes encoding/decoding issues with X cut buffers (closes: #397447). + + * debian/rules: + + Call dh_desktop in binary-arch. + + Symlink emacs.xpm in etc/icons. + + Create symlink to the icons directory in /usr/share/icons. + * debian/emacs.desktop: Use /usr/share/icons for the Emacs icon; using + the etc directory could cause problems since it varies depending on + the Emacs version and people might wish to create a (permanent) + launcher from the menu item. + * debian/emacs.prerm: Don't touch the `emacs' and `editor' alternatives + on upgrades. + * debian/NEWS: Mention new icons directory and new emacs alternative + handling. + + -- Romain Francoise Sat, 11 Nov 2006 14:14:02 +0100 + +emacs-snapshot (1:20061105-1) unstable; urgency=low + + * The "My Descent into Madness" release. + + * New snapshot, still taken from HEAD. + + * debian/emacs.postinst: Install the `emacs' and `editor' alternatives + only once per flavor (closes: #394960). + * debian/emacs.prerm: Remove the `emacs' and `editor' alternatives only + once per flavor. Cleanups. + * debian/emacs.preinst: Handle alternatives upgrade from previous + emacs-snapshot versions. + + -- Romain Francoise Sun, 5 Nov 2006 11:27:33 +0100 + +emacs-snapshot (1:20061027-1) unstable; urgency=low + + * New snapshot, still taken from HEAD but corresponding to the first + Emacs 22 pretest release: Emacs 22.0.90. + + * debian/patches/debian-rpath.dpatch: Resync. + + -- Romain Francoise Fri, 27 Oct 2006 20:24:33 +0200 + +emacs-snapshot (1:20061022-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 22 Oct 2006 18:57:28 +0200 + +emacs-snapshot (1:20061015-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 15 Oct 2006 19:10:18 +0200 + +emacs-snapshot (1:20061009-1) unstable; urgency=low + + * The "No explosions, no crashes, no fights" release. + + * New snapshot, fixes mouse-3 clicks in org-mode (closes: #389914). + + -- Romain Francoise Mon, 9 Oct 2006 20:01:03 +0200 + +emacs-snapshot (1:20061003-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Tue, 3 Oct 2006 22:01:39 +0200 + +emacs-snapshot (1:20060923-1) unstable; urgency=low + + * The "Old schemes of shattered dreams" release. + + * New snapshot, includes a change to make movemail actually *use* + liblockfile, it was linked in but unused which is dangerous and a + violation of Policy (§11.6). + + * debian/rules: Give -Wl,--as-needed a try to see if it breaks some + architectures; it kills many useless library dependencies (12 for + emacs-gtk and 2 for emacs). + + * debian/emacs.postinst: Register editor.1.gz too (as a slave), thanks + to Elias Kunnas via Launchpad (https://launchpad.net/bugs/52699). + + * debian/control.in: Build-Depend on libpng12-dev, not libpng3-dev. + * debian/control: Regenerate. + + -- Romain Francoise Sat, 23 Sep 2006 19:00:41 +0200 + +emacs-snapshot (1:20060915-1) unstable; urgency=low + + * The "Grip it by the husk" release. + + * New snapshot. + + * debian/rules: Set SITELOAD_PURESIZE_EXTRA to 5000 in CFLAGS. + * debian/patches/debian-puresize.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 8 Sep 2006 21:39:45 +0200 + +emacs-snapshot (1:20060908-1) unstable; urgency=low + + * The "Fifteen steps, then a sheer drop" release. + + * New snapshot. + + * debian/control.in: Use ${source:Version} for the dependency between + emacs-bin-common and emacs-common. + * debian/control: Regenerate. + + * debian/rules: + + Check for pure space overflow after dump for each subflavor. + + Set alternative priority to 23 (closes: #386496). + + * debian/patches/debian-sendmail-program.dpatch: Dropped. + * debian/patches/00list: Update. + + * debian/patches/debian-puresize.dpatch: *Really* resync with upstream. + + -- Romain Francoise Fri, 8 Sep 2006 21:10:58 +0200 + +emacs-snapshot (1:20060901-1) unstable; urgency=low + + * The "Campershell dreams" release. + + * New snapshot. + + * debian/control.in: Don't Build-Depend on libasound2-dev on kfreebsd-*, + thanks to Petr Salinger (closes: #384492). + * debian/control: Regenerate. + + * debian/patches/debian-sendmail-program.dpatch: New patch, hardcode + location of sendmail in paths.el instead of trying to do the right + thing from the build environment (closes: #385542). + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 1 Sep 2006 22:43:37 +0200 + +emacs-snapshot (1:20060824-1) unstable; urgency=low + + * The "Sweetness follows" release. + + * New snapshot. + + * debian/control.in: Drop Build-Depends on mailx (closes: #383814). + * debian/control: Regenerate. + + -- Romain Francoise Wed, 23 Aug 2006 22:02:14 +0200 + +emacs-snapshot (1:20060817-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-emacs-bug.dpatch: Also make `report-emacs-bug' + send a courtesy copy of the report to emacs-snapshot@packages.d.o. + + * debian/README.in: Mention #emacs-snapshot@irc.freenode.net. + + -- Romain Francoise Thu, 17 Aug 2006 19:42:49 +0200 + +emacs-snapshot (1:20060811-1) unstable; urgency=low + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + + -- Romain Francoise Fri, 11 Aug 2006 18:44:58 +0200 + +emacs-snapshot (1:20060806-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Sun, 6 Aug 2006 11:06:32 +0200 + +emacs-snapshot (1:20060730-1) unstable; urgency=low + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + * debian/README.in: Cosmetic change. + + -- Romain Francoise Sun, 30 Jul 2006 13:10:08 +0200 + +emacs-snapshot (1:20060712-2) unstable; urgency=low + + * debian/control.in: Delete extra newline. + * debian/control: Regenerate. + + -- Romain Francoise Thu, 13 Jul 2006 08:03:45 +0200 + +emacs-snapshot (1:20060712-1) unstable; urgency=low + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + + -- Romain Francoise Wed, 12 Jul 2006 19:31:50 +0200 + +emacs-snapshot (1:20060707-1) unstable; urgency=low + + * The "Cities underneath cities" release. + + * New snapshot. + * debian/patches/debian-puresize.dpatch: Resync with upstream. + + * debian/docs: Add CONTRIBUTE and AUTHORS. + + * debian/patches/debian-emacs-bug.dpatch: New patch, make M-x + report-emacs-bug include the Debian version in the generated + mail buffer. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 7 Jul 2006 19:18:06 +0200 + +emacs-snapshot (1:20060629-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 29 Jun 2006 21:03:37 +0200 + +emacs-snapshot (1:20060623-1) unstable; urgency=low + + * The "Dearest Jane, I should've known better" release. + + * New snapshot, includes fix for exponents in TeX-mode (closes: #365026). + + * debian/control.in: Don't Build-Depend on libasound2-dev on hurd-i386, + thanks to Michael Banck (closes: #374436). + * debian/control: Regenerate. + + * debian/patches/debian-browse-url.dpatch: New patch, make Emacs honor + the x-www-browser alternative if no browser has been customized. + Note that the alternative will *not* be used if it's set to auto, due + to the apparent lack of good sense applied to this alternative's + priorities (closes: #373294). + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 23 Jun 2006 18:58:05 +0200 + +emacs-snapshot (1:20060615-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 15 Jun 2006 19:41:34 +0200 + +emacs-snapshot (1:20060609-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: Drop Build-Depends on gcc-4.1, now the default compiler. + * debian/control: Regenerate. + + * debian/rules: Don't set CC. + + -- Romain Francoise Fri, 9 Jun 2006 18:54:35 +0200 + +emacs-snapshot (1:20060602-1) unstable; urgency=low + + * The "Isabella Afterhours" release. + + * New snapshot: + + The menu bar can now be navigated with keys, via F10. + + Org-mode has been updated to version 4.35. + + * debian/rules: + + Build with gcc-4.1, hoping to solve long-standing FTBFS bugs on + m68k. This also allows us to finally get rid of -Wno-pointer-sign + (closes: #368023). + + Use 'tail -n +2' instead of 'tail +2', with thanks to Sven Joachim + (closes: #368846). + + * debian/control.in: Add Build-Depends on gcc-4.1. + * debian/control: Regenerate. + + * debian/patches/debian-puresize.dpatch: Resync with upstream. + * debian/patches/debian-menu.dpatch: Ditto. + + * debian/README.in: Remove reference to the Arch archive, it might go + away soon. + + * debian/copyright.in: Move Debian differences blurb closer to the top. + * debian/copyright: Regenerate. + + -- Romain Francoise Fri, 2 Jun 2006 19:58:14 +0200 + +emacs-snapshot (1:20060524-1) unstable; urgency=low + + * New snapshot: + + In Dired, `dired-goto-file' is now bound to j instead of M-g. + As a result of this change, it's now possible to use the new + error bindings in Dired buffers (M-g M-p, M-g M-n). + + Emacs can now play sounds via a native ALSA interface. + + Org-mode has been updated to version 4.33. + + * debian/control.in: Add Build-Depends on libasound2-dev. + * debian/control: Regenerate. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Wed, 24 May 2006 19:32:11 +0200 + +emacs-snapshot (1:20060518-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: Cleanups. + * debian/patches/tmp-fixes.dpatch: Revert crashy font selection changes. + + -- Romain Francoise Thu, 18 May 2006 21:33:28 +0200 + +emacs-snapshot (1:20060512-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/tmp-fixes.dpatch: Drop Ibuffer changes. + + -- Romain Francoise Fri, 12 May 2006 20:05:37 +0200 + +emacs-snapshot (1:20060505-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: + + libxaw7-dev pulls libxaw-headers, so there's no need to Build-Depend + on the latter. + + Bump Standards-Version to 3.7.2, no changes needed. + * debian/control: Regenerate. + + * debian/patches/tmp-fixes.dpatch: Drop help-mode changes. Revert buggy + change to ibuffer.el. + + -- Romain Francoise Fri, 5 May 2006 18:35:28 +0200 + +emacs-snapshot (1:20060427-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-puresize.h: Resync with upstream. + * debian/patches/tmp-fixes.dpatch: Drop recenter changes. + + -- Romain Francoise Thu, 27 Apr 2006 20:31:42 +0200 + +emacs-snapshot (1:20060420-1) unstable; urgency=low + + * New snapshot: + + RMAIL doesn't barf on MIME mail anymore (closes: #363327). + + org-mode now handles local links correctly (closes: #363328). + + Includes Tramp 2.0.53. + + History commands in comint-derived modes no longer clobber partial + inputs. + + * debian/patches/tmp-fixes.dpatch: Revert dodgy changes to recenter, and + buggy changes to help-mode. Just for safety. + + * debian/patches/debian-puresize.h: New patch, bump BASE_PURESIZE to + 1210000. This is needed to make room for Debian modifications in the + Emacs binary. + * debian/patches/00list: Update. + + * debian/copyright.in: Update copyright years and GFDL version, thanks + to Sven Joachim (closes: #363123). + * debian/copyright: Regenerate. + + -- Romain Francoise Thu, 20 Apr 2006 20:47:43 +0200 + +emacs-snapshot (1:20060415-2) unstable; urgency=low + + * debian/control.in: Add Build-Depends on libxaw-headers, libxaw7-dev. + * debian/control: Regenerate. + + -- Romain Francoise Mon, 17 Apr 2006 13:09:12 +0200 + +emacs-snapshot (1:20060415-1) unstable; urgency=low + + * New snapshot. + + * debian/control.in: Don't Build-Depend on gcc-3.3 on m68k. + * debian/control: Regenerate. + * debian/rules: Give up on compilation with gcc-3.3 on m68k. + + -- Romain Francoise Sat, 15 Apr 2006 19:20:16 +0200 + +emacs-snapshot (1:20060406-1) unstable; urgency=low + + * New snapshot. + + * debian/debian-dp-split.dpatch: Rename variable to the more logical + `display-buffer-prefer-horizontal-split'. + + * debian/emacs.desktop: Add text/plain to MimeTypes (closes: #360415). + + -- Romain Francoise Thu, 6 Apr 2006 20:17:32 +0200 + +emacs-snapshot (1:20060330-2) unstable; urgency=low + + * debian/patches/tmp-fixes.dpatch: Revert annoying changes that make + completion windows stay around in comint-derived modes. + * debian/debian-dp-split.dpatch: New patch, adds a new variable named + `display-buffer-prefer-vertical-split' which allows for a vertical + split of windows created by `display-buffer', instead of the default + horizontal split. This is very convenient on modern wide screens. + Requested by Cyril Bouthors . + * debian/patches/00list: Update. + + -- Romain Francoise Sat, 1 Apr 2006 19:18:43 +0200 + +emacs-snapshot (1:20060330-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 30 Mar 2006 20:19:28 +0200 + +emacs-snapshot (1:20060323-1) unstable; urgency=low + + * New snapshot: + + Ibuffer now uses the list of displayed group filters in M-j and + friends (closes: #357364). + + Probably fixes issues with the speed of fontification in large + buffers (see #358038, #358456). + + -- Romain Francoise Thu, 23 Mar 2006 19:50:31 +0100 + +emacs-snapshot (1:20060315-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Wed, 15 Mar 2006 20:22:24 +0100 + +emacs-snapshot (1:20060301-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Wed, 1 Mar 2006 21:27:33 +0100 + +emacs-snapshot (1:20060224-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 24 Feb 2006 19:12:07 +0100 + +emacs-snapshot (1:20060217-2) unstable; urgency=low + + * debian/rules: *Really* use gcc-3.3 on m68k. + + -- Romain Francoise Sat, 18 Feb 2006 12:47:08 +0100 + +emacs-snapshot (1:20060217-1) unstable; urgency=low + + * New snapshot, includes the fix for Tramp on Solaris (closes: #352149). + + * debian/control.in: Build-Depend on gcc-3.3 on m68k. + * debian/control: Regenerate. + * debian/rules: Build with gcc-3.3 on m68k. + + * debian/patches/tmp-fixes.dpatch: Revert changes that make C-h c insert + text in the current buffer. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 17 Feb 2006 20:02:28 +0100 + +emacs-snapshot (1:20060209-1) unstable; urgency=low + + * New snapshot: + + ERC has been updated to version 5.1.1. + + MH-E has been updated to version 7.91. + + * debian/rules: Apply patch from Stefan Schmitt + splitting the build target in subflavor targets. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Thu, 9 Feb 2006 19:32:23 +0100 + +emacs-snapshot (1:20060202-1) unstable; urgency=low + + * New snapshot: + + ERC (version 5.1) is now part of Emacs. + + Tramp has been updated to version 2.0.52. + + MH-E has been updated to version 7.90. + + Several cases where code run from signal handlers could clobber Lisp + data have been fixed, which should make Emacs more reliable. + + * debian/patches/tmp-fixes.dpatch: Drop last week's changes (included in + this new upstream snapshot). + + -- Romain Francoise Thu, 2 Feb 2006 20:53:10 +0100 + +emacs-snapshot (1:20060120-2) unstable; urgency=low + + * The "Everything in its right place" release. + + * Not a new upstream snapshot: the trunk appears to be a dangerous place + at the moment, let's give it some time to settle down. + * debian/patches/tmp-fixes.dpatch: Revert a change that makes C-a skip + over fields (closes: #349819), add a patch to fix the "cursors appear + in all windows when the echo area is active" syndrome, other minor + changes. + + * Introducing subflavors: + + It is now possible to install the -x, -gtk and -nox binary packages + concurrently, each installed package constitutes a "subflavor" of the + emacs-snapshot flavor. To make this possible, a number of files have + been moved from the binary packages to -common or -bin-common, and + /usr/bin/emacs-snapshot is now an alternative. + + In addition, the way the packages install menu entries has been + reworked: the text version entry is now installed in emacs-common, and + menu/desktop entries installed by the -x and -gtk subflavors now have + only one entry (which mentions the right subflavor instead of a plain + "X11"). + * debian/control.in: + + emacs no longer Conflicts/Replaces emacs-gtk, emacs-nox. + + emacs-gtk no longer Conflicts/Replaces emacs, emacs-nox. + + emacs-nox no longer Conflicts/Replaces emacs-gtk, emacs. + + emacs-common Conflicts with emacs{,-gtk,-nox} (<< 1:20060120-2) + + emacs-bin-common Conflicts with emacs{,-gtk,-nox} (<< 1:20060120-2) + * debian/control: Regenerate. + * debian/emacs.desktop: + + Use @SUB_FLAVOR@, not "X11". + + Run the subflavor command, not just @BIN_NAME@. + * debian/emacs.menu.in: Remove text entry, use @SUB_FLAVOR@. + * debian/emacs.postinst: + + Install the subflavor alternative. + + If we're the first subflavor of this flavor, call `emacs-install'. + + Register the subflavor in /var/lib/@BIN_NAME@/installed-subflavors. + * debian/emacs.prerm: + + Remove the subflavor alternative. + + Unregister the subflavor. + + If we were the last installed subflavor, call `emacs-remove'. + * debian/rules: + + Generate emacs-common.menu, expand *.menu.in (not only emacs.menu.in). + + Handle new replacement variable SUB_FLAVOR. + + Set emacs subflavor to "X11", emacs-gtk subflavor to "GTK". + + Install /var/lib/@BIN_NAME@/installed-subflavors in emacs-common. + + Move emacs.1emacs-snapshot.gz symlink to emacs-bin-common. + + Don't install the DOC file in binary packages, install it in + emacs-common. + + Don't ship a flavor symlink in binary packages (now an alternative). + + Don't remove the DOC file from the emacs-common tree. + + Call dh_installmenu in binary-indep target, too. + * debian/emacs-common.overrides.lintian: Add override to silence lintian + about the missing /usr/bin/emacs-snapshot. + * debian/NEWS: Mention subflavors. + + -- Romain Francoise Sat, 28 Jan 2006 14:55:50 +0100 + +emacs-snapshot (1:20060120-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Fri, 20 Jan 2006 18:35:44 +0100 + +emacs-snapshot (1:20060114-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-menu.dpatch: New patch, add Debian related items + to the Help menu (README, NEWS, changelog). + * debian/patches/00list: Update. + + -- Romain Francoise Sat, 14 Jan 2006 21:29:32 +0100 + +emacs-snapshot (1:20060109-1) unstable; urgency=low + + * New snapshot: + + Now supports IPv6 for client/server network processes. + + If the user interrupts `save-buffer', `buffer-backed-up' is now + correctly reset to nil (closes: #343705). + + * debian/patches/tmp-fixes.dpatch: Temporary patch reverting changes to + mouse.el that prevent a mouse-1 click from working in non-selected + windows, which is especially annoying in Gnus (closes: #347207). + * debian/patches/00list: Update. + + -- Romain Francoise Mon, 9 Jan 2006 19:32:53 +0100 + +emacs-snapshot (1:20060103-1) unstable; urgency=low + + * New snapshot: + + battery.el's ACPI code also tries /proc/acpi/thermal_zone/THM0 to get + the system temperature (closes: #344528). + + font-lock defaults are now set early and in all entry points, which + should hopefully fix fontification issues in Gnus (closes: #344610). + + Should now manage to byte-compile semantic (closes: #343709, #344999). + + The GTK+ file selector has been significantly improved. + + -- Romain Francoise Tue, 3 Jan 2006 20:06:13 +0100 + +emacs-snapshot (1:20051221-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Wed, 21 Dec 2005 14:53:27 +0100 + +emacs-snapshot (1:20051215-1) unstable; urgency=low + + * New snapshot: + + SPC doesn't complete file names in the minibuffer anymore. See the + FAQ for instructions on how to get the old behavior back. + + Characters are now translated in isearch, which makes it possible to + search for Cyrillic UTF-8 chars, etc (closes: #337600). + + The Emacs FAQ has been updated for the upcoming 22.1 release. + + * debian/patches/tmp-fixes.dpatch: Drop last week's changes, add a patch + from RMS fixing autoload problems leading to the recursive load of + newsticker.el (closes: #342846). + + * debian/copyright.in: Update with new Savannah CVS setup. + * debian/copyright: Regenerate. + + -- Romain Francoise Thu, 15 Dec 2005 20:16:20 +0100 + +emacs-snapshot (1:20051207-1) unstable; urgency=low + + * New snapshot: + + CC Mode has been updated to version 5.31 and doesn't infloop on + unbalanced bracket/paren expressions anymore (closes: #341716). + See for more info. + + tumme.el is now part of the Emacs distribution, as a replacement + for thumbs.el. + + * debian/patches/debian-mail-from-style.dpatch: Resync with upstream. + * debian/patches/tmp-fixes.dpatch: Temporary patch reverting changes to + `enlarge-window' that break `balance-windows', and changes to the + minibuffer maps that make SPC a regular character and not complete + anymore (these changes broke ido, perhaps others). + * debian/patches/00list: Update. + + -- Romain Francoise Wed, 7 Dec 2005 20:32:36 +0100 + +emacs-snapshot (1:20051202-1) unstable; urgency=low + + * New snapshot: + + More `hard-newline' changes have been reverted, fixing issues in + Gnus where messages would be sent as format=flowed without + warning (closes: #340988). + + hi-lock-mode has been revamped and should now work in special + buffers (see #339920). + + The Calc global entry point (`calc-dispatch') is now bound to `C-x *'. + + * debian/rules: + + Add a symlink to the Emacs NEWS file in /usr/share/doc/emacs-common + (suggested by Vincent Lefevre). + + Install emacs.xpm ourselves (it was previously added in the upstream + tarball manually). + + * debian/patches/tmp-fixes.dpatch: Dropped. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 2 Dec 2005 18:49:40 +0100 + +emacs-snapshot (1:20051124-1) unstable; urgency=low + + * New snapshot. + + * debian/bug.script.in: New file. + * debian/bug.presubj.in: Likewise. + * debian/bug.control.in: Likewise. + + * debian/rules: + + Install README.Debian for emacs-bin-common. + + Generate bug files from debian/bug.*.in. + + Install bug script and bug control file under /usr/share/bug for + all binary packages. Install presubj file for emacs, emacs-gtk + and emacs-nox. + + Misc cleanups. + + * debian/patches/tmp-fixes.dpatch: Temporary patch reverting hi-lock + changes that broke fontification in special buffers (Gnus, ERC, ...) + if hi-lock mode was on. With thanks to Jay Berkenbilt, Bill Wohler + and Michael Olson for their help in tracking down this problem + (closes: #339920). + * debian/patches/00list: Update. + + -- Romain Francoise Thu, 24 Nov 2005 20:24:28 +0100 + +emacs-snapshot (1:20051117-1) unstable; urgency=low + + * New snapshot: + + file-name-shadow-mode is now enabled by default. + + Emacs now has an icon of its own, instead of the GNU icon. + + Displaying a non-break space character in an overlay doesn't make + Emacs infloop in redisplay anymore (closes: #337151). + + `C-h d' now runs apropos-documentation. + + savehist.el has been updated to version 24. + + * debian/rules: + + Don't install the gnu icon. + + Fix installation of README.Debian for emacs{,-{gtk,nox,el}}. + + * debian/gnu-32x32.xpm: Remove. + * debian/README.in: Remove reference to the gnu icon. + + * debian/emacs.desktop: Use the new icon. + * debian/emacs.menu.in: Ditto. + * debian/emacs.overrides.lintian: Ditto. + + * debian/compat: Switch to debhelper compatibility level 5. + * debian/control.in: Build-Depend on debhelper (>= 5.0.0). + * debian/control: Regenerate. + + -- Romain Francoise Thu, 17 Nov 2005 19:00:40 +0100 + +emacs-snapshot (1:20051111-1) unstable; urgency=low + + * New snapshot: + + Font-Lock mode is now enabled by default. + + rcirc.el and newsticker.el have been updated to newer versions. + + -- Romain Francoise Fri, 11 Nov 2005 15:39:58 +0100 + +emacs-snapshot (1:20051103-1) unstable; urgency=low + + * New snapshot, includes a newer version of savehist.el (closes: #336976). + + * debian/rules: Source files are now compressed upstream, just move them + to emacs-el. + + -- Romain Francoise Thu, 3 Nov 2005 19:09:09 +0100 + +emacs-snapshot (1:20051027-1) unstable; urgency=low + + * New snapshot: + + eterm-color.ti now defines the correct terminal name (closes: #335241). + + Exiting when some buffers still have clients attached now prompts + only once (closes: #335444). + + -- Romain Francoise Thu, 27 Oct 2005 18:28:24 +0200 + +emacs-snapshot (1:20051020-1) unstable; urgency=low + + * New snapshot: + + Includes savehist.el, a package to save minibuffer histories between + sessions. + + Includes rcirc.el, a simple IRC client. + + Includes MH-E version 7.85. + + * debian/control.in: Delete Uploaders field. + * debian/control: Regenerate. + + -- Romain Francoise Thu, 20 Oct 2005 20:33:49 +0200 + +emacs-snapshot (1:20051014-1) unstable; urgency=low + + * New snapshot: + + Emacs now shows its icon by default in the GNOME task list and + elsewhere, the new option --no-bitmap-icon turns it off. + + Includes Tramp 2.0.51. + + * debian/control.in: + + Conflict with old versions of dictionaries-common since proper + support for emacs-snapshot was introduced in version 0.60.0, suggested + by Karl Chen (closes: #333409). + + Remove useless (but harmless) Replaces on emacs21, suggested by + Sven Joachim. + * debian/control: Regenerate. + + * debian/emacs.desktop: Remove -i switch. + * debian/emacs.menu.in: Likewise. + + * debian/patches/tmp-build-fix.dpatch: Drop. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 14 Oct 2005 18:10:18 +0200 + +emacs-snapshot (1:20051007-1) unstable; urgency=low + + * New snapshot: + + BibTeX mode now honors `sentence-end-double-space' and other filling + variables, thanks to Roland Winkler (closes: #330917). + + Autoloads in cua-base and ibuf-ext no longer explicitely request the + .el file (closes: #332315). + + Includes Speedbar version 1.0. + + * debian/patches/tmp-build-fix.dpatch: Temporary patch reverting + unimportant changes that break the emacs-nox build. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 7 Oct 2005 15:41:44 +0200 + +emacs-snapshot (1:20050929-1) unstable; urgency=low + + * The "Dittsche" release. + + * New snapshot. + + -- Romain Francoise Thu, 29 Sep 2005 08:52:15 +0200 + +emacs-snapshot (1:20050922-1) unstable; urgency=low + + * New snapshot. + + -- Romain Francoise Thu, 22 Sep 2005 08:23:16 +0200 + +emacs-snapshot (1:20050918-1) unstable; urgency=low + + * New snapshot. + + * Add linda overrides, bringing the override support level with lintian. + + debian/*.overrides: Rename to debian/*.overrides.lintian. + + debian/emacs-bin-common.overrides.linda: New file. + + debian/emacs-common.overrides.linda: Ditto. + + debian/emacs-el.overrides.linda: Ditto. + + debian/emacs.overrides.linda: Ditto. + + * debian/patches/debian-version-mention.dpatch: Fix patch description to + mention emacs-version and not version as the function modified. + + * debian/rules: + + Update lintian override filenames. + + Install linda overrides. + + Remove useless '--with-gif' confflag. + + -- Romain Francoise Sun, 18 Sep 2005 15:33:30 +0200 + +emacs-snapshot (1:20050908-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: Compress all files in emacs-el. + + -- Romain Francoise Thu, 8 Sep 2005 18:33:23 +0200 + +emacs-snapshot (1:20050901-1) unstable; urgency=low + + * New snapshot. + + * debian/patches/debian-rpath.dpatch: New file, disables RPATH in + emacs-x and emacs-gtk binaries. + * debian/patches/00list: Update. + + * debian/emacs-bin-common.overrides: Add overrides for man pages + installed as alternatives: their section is correct, and the binaries + do have man pages. + + * debian/emacs-common.overrides: Add override for the "wrong name for + upstream changelog" check: it's a directory, and it holds the (many) + upstream changelogs (and the top-level changelog is now symlinked, + too). + + * debian/rules: + + Strip the dpatch-list-patch header line. + + Symlink upstream top-level changelog. + + Swap fixed and variable parts in changelog file names. + + * debian/patches/debian-cssc-vc-backend.dpatch: Add "Provided by" line. + * debian/patches/debian-font-lock-tty.dpatch: Ditto. + * debian/patches/debian-licenses-location.dpatch: Ditto. + * debian/patches/debian-vc-bfn.dpatch: Ditto. + * debian/patches/debian-version-mention.dpatch: Ditto. + + -- Romain Francoise Thu, 1 Sep 2005 18:25:51 +0200 + +emacs-snapshot (1:20050825-1) unstable; urgency=low + + * New snapshot. + + * debian/emacs-bin-common.prerm: Fix buggy loop left over from + pre-unstable packaging, because of this no alternatives were actually + removed when emacs-bin-common was removed... (closes: #324870). + + * debian/emacs-bin-common.postinst: + + In emacs-snapshot, the binary named 'emacs' is moved out of the way + before expanding @ALTERNATIVES@ so it doesn't appear in the list. + Don't special-case for it in emacs-bin-common.postinst as it'll never + be there. + + Remove unused INFOFILES variable. + + * debian/rules: + + Add upstream changelogs in /usr/share/doc so that users can have + access to them without downloading 30M of sources. It doesn't make + much difference in a package that occupies more than 50M and has some + real value for users since emacs-snapshot is a constantly moving + target. + + Don't install menu items for emacs-nox. + + * debian/patches/debian-licenses-location.dpatch: New patch, modifies + `describe-copying' to find the full text of the GPL in the system-wide + location for licenses (/usr/share/common-licenses), the COPYING file + included in the Emacs distribution isn't installed (and differs from + the Debian version in whitespace only). + + * New versioning scheme: the overly large version number in previous + uploads triggered a bug in quinn-diff which resulted in emacs-snapshot + not appearing in q-d output and thus not being rebuilt on some archs. + The bug has been fixed in quinn-diff (thanks to Ryan Murray) but to + prevent any further damage, I'm changing the versioning scheme to + something sane (and mandated by Policy, see §3.2.1). + The historical versioning scheme was of doubtful value anyway. + + * debian/changelog: Delete trailing whitespace in pre-unstable entries. + + -- Romain Francoise Thu, 25 Aug 2005 18:35:13 +0200 + +emacs-snapshot (20050819140000-1) unstable; urgency=low + + * New snapshot. + + * debian/rules: README.Debian is generated from the list of Debian + patches and its size varies depending on the number of patches, so + dh_compress sometimes compresses it, and sometimes not. To avoid + having to fix the references in debian/copyright and NEWS, forcibly + leave it uncompressed. + + * debian/patches/image-pbm-xbm.dpatch: Dropped (fixed upstream). + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 19 Aug 2005 18:34:53 +0200 + +emacs-snapshot (20050812140000-2) unstable; urgency=low + + * debian/patches/image-pbm-xbm.dpatch: New file, revert an upstream + change that erroneously removes the pbm and xbm image types. + * debian/patches/00list: Update. + + -- Romain Francoise Fri, 12 Aug 2005 20:00:22 +0200 + +emacs-snapshot (20050812140000-1) unstable; urgency=low + + * New snapshot: + + Fixes a bug triggered by GTK+ 2.6.9 where opened menus could + disappear randomly in emacs-snapshot-gtk (closes: #322307). + + Includes Tramp 2.0.50. + + * debian/patches/debian-emacs-news.dpatch: Fix reference to + README.Debian, it isn't compressed automatically in emacs-snapshot + (it's now installed by dh_installdocs). + + * debian/changelog: + + Fix name of NEWS file in previous entry. + + Add mode to the local variables section. + + * debian/rules: + + Set pkg_name for emacs-common and emacs-bin-common to fix the + generation of lintian override files. + + Set flavour description. + + Pipe dpatch-list-patch output to sed to generate outline compliant + headings, the outline regexp used in the emacs21 packages doesn't + match in emacs-snapshot, and it's simpler to have regular outline + sections in the file in the first place. + + * debian/copyright.in: + + Use the new FSF postal address (updated in COPYING in the Emacs + sources). + + Add 2005 to copyright years. + + Fix location of README.Debian. + * debian/copyright: Regenerate. + + * debian/patches/debian-font-lock-tty.dpatch: Add outline markers. + * debian/patches/debian-vc-bfn.dpatch: Ditto. + + * debian/patches/debian-cssc-vc-backend.dpatch: Add dpatch description + marker (caused an empty patch description in README.Debian). + + * debian/control.in: Add flavour description to the short description of + the main package, which is emacs-snapshot in this source package + (closes: #322180). + * debian/control: Regenerate. + + * debian/README.in: + + Add information section stolen from the initial NEWS entry. + + Remove paragraph about .elc files and Leim being added to the + upstream sources: these packages are built from a snapshot tarball for + which neither of these things is true. + + Remove local variables section. + + Add note about the baz archive. + + * debian/emacs.menu.in: Add -i option to the menu command item in order + to get the Emacs icon in the GNOME window list (and equivalent + features in other desktop environments). + * debian/emacs.desktop: Ditto. + + -- Romain Francoise Fri, 12 Aug 2005 17:51:10 +0200 + +emacs-snapshot (20050805100000-1) unstable; urgency=low + + * Initial snapshot release in unstable. See NEWS.Debian.gz for general + information on these packages. + + * debian/control.in: + + Set myself as Maintainer, Jerome and Rob as Uploaders. + + Bump dpatch build-dependency to dpatch (>= 2.0.9). + + Bump Standards-Version to 3.6.2, no changes needed. + + Fix Replaces line on emacs21. + * debian/control: Regenerate. + + * debian/rules: + + Add -Wno-pointer-sign to CFLAGS. + + Generate debian/README.Debian from the templates. + + * debian/NEWS: New file. + + * debian/patches/debian-font-lock-tty.dpatch: New file. + * debian/patches/debian-vc-bfn.dpatch: New file. + * debian/patches/00list: Update. + + * Several other minor changes, see the baz log. + + -- Romain Francoise Fri, 5 Aug 2005 14:41:18 +0200 + +emacs-snapshot (20050519215621-1) unstable; urgency=low + + * New snapshot release. + + * Do not force epaths re-generation after calls to configure any more + since configure now provides a '--enable-locallisppath' + - debian/rules: + + Add --enable-locallisppath option to confflags + + Remove epaths_force_cmd function + + Remove calls to epaths_force_cmd + + -- Jerome Marant Thu, 19 May 2005 22:07:33 +0200 + +emacs-snapshot (20050425220908-2) unstable; urgency=low + + * Merge fixes from Davide Salvetti + - debian/patches/misc-unseparated.dpatch: Remove hunks. + + * Incorporated fixes from Daniel Brockman : + - debian/rules: + + Don't prefix local_lpath paths with EMACS_COMMON + + Add new epaths_force_cmd + + Add calls to epaths_force_cmd after every call to configure + + Add new variable local_lpath_install which prefixes all + paths from local_lpath with EMACS_COMMON + + Set locallisppath to local_lpath_install at install-time + + -- Jerome Marant Thu, 12 May 2005 21:57:05 +0200 + +emacs-snapshot (20050425220908-1) unstable; urgency=low + + * New snapshot release. + + * Merge changes from 21.4a-1 + + * debian/control: + - Switch Maintainer and Uploaders fields. + - Build-depend on dpatch >= 2.0.9. + + * debian/rules: properly install emacs-snapshot-nox manpage. + + * debian/patches/misc-unseparated.dpatch: + - Fix docstring for message-sendmail-f-is-evil: the first line of a + docstring should be a complete sentence describing the function. + Thanks to Kai Großjohann + - Updated patch to etc/NEWS. + + -- Jerome Marant Mon, 25 Apr 2005 22:37:09 +0200 + +emacs-snapshot (20040508-1) unstable; urgency=low + + * Initial release. This package is branched from emacs21 21.3+1-5. + + * Port package to debhelper [Jérôme Marant] + - debian/control.in: added debhelper to build-dependencies. + - debian/control: regenerated. + - debian/rules + - debian/build-binary-pkg: removed. + - debian/compat: new file containing debhelper compatibility version. + - debian/docs: new file. + - debian/emacs-common.docs: new file. + + * Add GTK+ 2.x support (#179469, #194388) [Jérôme Marant] + - debian/control.in: add new package emacs-gtk + - debian/control: regenerated. + - debian/rules + + * Remove upstream applied patches [Jérôme Marant] + - debian/patches/scroll-margin.dpatch + - debian/patches/save-buffer.dpatch + - debian/patches/hurd-libio-glibc.dpatch + - debian/patches/detect-coding-iso2022.dpatch + - debian/patches/browse-url.dpatch + - debian/patches/battery-acpi-support.dpatch + + -- Jerome Marant Sat, 8 May 2004 14:42:33 +0200 --- emacs-snapshot-20080228.orig/debian/copyright.in +++ emacs-snapshot-20080228/debian/copyright.in @@ -0,0 +1,36 @@ +-*-text-*- + +This package was debianized by Rob Browning +on Tue, 16 Dec 1997 00:05:45 -0600 and is now maintained by +Romain Francoise . + +The Debian source is based on a CVS checkout of the GNU Emacs CVS trunk, +which can be obtained with: + + cvs -z3 -d :pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs co emacs + +For more details, see . + +Please see /usr/share/doc/@BIN_NAME@-common/README.Debian for a +description of the Debian specific differences from the upstream +version. + +Copyright: + + GNU Emacs is Copyright (C) 1985, 1986, 1987, 1993-2007 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA and is covered under the terms of the GPL. See the file + /usr/share/common-licenses/GPL for more information. + + The GNU Emacs Manual is Copyright (C) 1985, 1986, 1987, 1993-2007 Free + Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. It is covered under the terms of the GNU Free + Documentation License, version 1.2 or later. See node `GNU Free + Documentation License' in the Info manual (emacs) for details. + + The GNU Emacs Manual and related manuals in /usr/share/info/@BIN_NAME@ + are Copyright (C) 1985, 1986, 1987, 1993-2007 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA. They are covered under the terms of the GNU Free Documentation + License, version 1.2 or later. See node `GNU Free Documentation + License' in the Info manual (emacs) for details. --- emacs-snapshot-20080228.orig/debian/README.binpkg.in +++ emacs-snapshot-20080228/debian/README.binpkg.in @@ -0,0 +1,2 @@ +Please see /usr/share/doc/@BIN_NAME@-common/ as the primary +documentation directory. --- emacs-snapshot-20080228.orig/debian/emacs.menu.in +++ emacs-snapshot-20080228/debian/emacs.menu.in @@ -0,0 +1,7 @@ +?package(@PKG_NAME@):\ + needs="X11"\ + section="Applications/Editors"\ + title="@MENU_TITLE@ (@SUB_FLAVOR@)"\ + command="/usr/bin/@BIN_NAME@-@X_SUPPORT@"\ + icon="/usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm"\ + hints="Text" --- emacs-snapshot-20080228.orig/debian/compat +++ emacs-snapshot-20080228/debian/compat @@ -0,0 +1 @@ +5 --- emacs-snapshot-20080228.orig/debian/bug.control.in +++ emacs-snapshot-20080228/debian/bug.control.in @@ -0,0 +1,2 @@ +report-with: @BIN_NAME@-common @BIN_NAME@-bin-common @BIN_NAME@ @BIN_NAME@-gtk @BIN_NAME@-nox @BIN_NAME@-el emacsen-common +package-status: dictionaries-common --- emacs-snapshot-20080228.orig/debian/mangle-info +++ emacs-snapshot-20080228/debian/mangle-info @@ -0,0 +1,17 @@ +#!/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$2 ($prefix): ($prefix/$3)"; +print ${POSTMATCH}; --- emacs-snapshot-20080228.orig/debian/emacsclient.desktop +++ emacs-snapshot-20080228/debian/emacsclient.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=@MENU_TITLE@ (client) +GenericName=Emacs +Comment=GNU @MENU_TITLE@ Client +Exec=/usr/bin/emacsclient.@BIN_NAME@ -a @BIN_NAME@ +TryExec=@BIN_NAME@ +Terminal=false +Type=Application +Icon=/usr/share/icons/@BIN_NAME@/emacs.xpm +Categories=Development;Utility;TextEditor; +MimeType=text/plain --- emacs-snapshot-20080228.orig/debian/control.in +++ emacs-snapshot-20080228/debian/control.in @@ -0,0 +1,72 @@ +Source: @SRC_NAME@ +Section: editors +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Romain Francoise +Build-Depends: libncurses5-dev, texinfo, liblockfile-dev, libgif-dev, libtiff-dev, libpng12-dev, libjpeg62-dev, libxpm-dev, libgtk2.0-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 5.0.0), libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], librsvg2-dev, lsb-release, libxft-dev, libdbus-1-dev +Standards-Version: 3.7.3 +Homepage: http://www.gnu.org/software/emacs/ +Vcs-Browser: http://git.debian.org/?p=users/rfrancoise/emacs-snapshot.git +Vcs-Git: git://git.debian.org/git/users/rfrancoise/emacs-snapshot.git + +Package: @BIN_NAME@-common +Section: editors +Priority: optional +Architecture: all +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0) +Suggests: @BIN_NAME@-el +Conflicts: @BIN_NAME@-el (<< ${source:Version}), w3-el, dictionaries-common (<< 0.60.0), @BIN_NAME@ (<< 1:20060120-2), @BIN_NAME@-gtk (<< 1:20060120-2), @BIN_NAME@-nox (<< 1:20060120-2) +Description: The GNU Emacs editor's common infrastructure + GNU Emacs is the extensible self-documenting text editor. + This package contains the infrastructure common between @BIN_NAME@ + and @BIN_NAME@-nox. + +Package: @BIN_NAME@-bin-common +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-common (= ${source:Version}), ${shlibs:Depends} +Conflicts: @BIN_NAME@ (<< 1:20060120-2), @BIN_NAME@-gtk (<< 1:20060120-2), @BIN_NAME@-nox (<< 1:20060120-2) +Description: The 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 @BIN_NAME@ and @BIN_NAME@-nox. + +Package: @BIN_NAME@ +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-bin-common (= ${binary:Version}), ${shlibs:Depends} +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el, @BIN_NAME@-gtk (<= 1:20070824-1) +Description: The GNU Emacs editor@FLAVOUR_DESC@ + GNU Emacs is the extensible self-documenting text editor. + +Package: @BIN_NAME@-gtk +Section: editors +Priority: extra +Architecture: all +Depends: @BIN_NAME@ +Description: The GNU Emacs editor (transitional package) + Empty package to facilitate upgrades, can be safely removed. + +Package: @BIN_NAME@-nox +Section: editors +Priority: optional +Architecture: any +Depends: @BIN_NAME@-bin-common (= ${binary:Version}), ${shlibs:Depends} +Provides: @BIN_NAME@, emacsen, editor, info-browser, mail-reader, news-reader +Conflicts: w3-el +Description: The 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: @BIN_NAME@-el +Section: editors +Priority: optional +Architecture: all +Depends: @BIN_NAME@-common (= ${source:Version}) +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. --- emacs-snapshot-20080228.orig/debian/emacs-bin-common.overrides.linda +++ emacs-snapshot-20080228/debian/emacs-bin-common.overrides.linda @@ -0,0 +1,2 @@ +Tag: no-manual-for-binary +Data: (e|c)(tags|macsclient).emacs-snapshot --- emacs-snapshot-20080228.orig/debian/emacs-common.menu.in +++ emacs-snapshot-20080228/debian/emacs-common.menu.in @@ -0,0 +1,7 @@ +?package(@PKG_NAME@):\ + needs="text"\ + section="Applications/Editors"\ + title="@MENU_TITLE@ (text)"\ + command="/usr/bin/@BIN_NAME@ -nw"\ + icon="/usr/share/emacs/@FULL_VERSION@/etc/emacs.xpm"\ + hints="Text" --- emacs-snapshot-20080228.orig/debian/emacs-common.overrides.linda +++ emacs-snapshot-20080228/debian/emacs-common.overrides.linda @@ -0,0 +1 @@ +Tag: extra-license-file --- emacs-snapshot-20080228.orig/debian/patches/debian-cssc-vc-backend.diff +++ emacs-snapshot-20080228/debian/patches/debian-cssc-vc-backend.diff @@ -0,0 +1,18 @@ +** Use CSSC instead of SCCS. + SCCS isn't in Debian, use CSSC as replacement. + + Provided by: Rob Browning + +--- emacs-snapshot-20070902.orig/lisp/vc-hooks.el ++++ emacs-snapshot-20070902/lisp/vc-hooks.el +@@ -76,8 +76,8 @@ + :group 'vc) + + (defcustom vc-path +- (if (file-directory-p "/usr/sccs") +- '("/usr/sccs") ++ (if (file-directory-p "/usr/lib/cssc") ++ '("/usr/lib/cssc") + nil) + "List of extra directories to search for version control commands." + :type '(repeat directory) --- emacs-snapshot-20080228.orig/debian/patches/debian-emacs-manpage.diff +++ emacs-snapshot-20080228/debian/patches/debian-emacs-manpage.diff @@ -0,0 +1,49 @@ +** Some documentation references to /usr/local/ have been changed to /usr. + Provided by: Romain Francoise + +--- a/doc/man/emacs.1 ++++ b/doc/man/emacs.1 +@@ -630,28 +630,28 @@ + . + . + .SH FILES +-/usr/local/share/info \(em files for the Info documentation browser. ++/usr/share/info \(em files for the Info documentation browser. + The complete text of the Emacs reference manual is included in a + convenient tree structured form. + Also includes the Emacs Lisp Reference Manual, useful to anyone + wishing to write programs in the Emacs Lisp extension language. + +-/usr/local/share/emacs/$VERSION/lisp \(em Lisp source files and ++/usr/share/emacs/$VERSION/lisp \(em Lisp source files and + compiled files that define most editing commands. + Some are preloaded; others are autoloaded from this directory when + used. + +-/usr/local/libexec/emacs/$VERSION/$ARCH \(em various programs that are ++/usr/lib/emacs/$VERSION/$ARCH \(em various programs that are + used with GNU Emacs. + +-/usr/local/share/emacs/$VERSION/etc \(em various files of information. ++/usr/share/emacs/$VERSION/etc \(em various files of information. + +-/usr/local/share/emacs/$VERSION/etc/DOC.* \(em contains the documentation ++/usr/share/emacs/$VERSION/etc/DOC.* \(em contains the documentation + strings for the Lisp primitives and preloaded Lisp functions + of GNU Emacs. + They are stored here to reduce the size of Emacs proper. + +-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering ++/usr/share/emacs/$VERSION/etc/SERVICE lists people offering + various services to assist users of GNU Emacs, including education, + troubleshooting, porting and customization. + . +@@ -675,7 +675,7 @@ + + Please do not send anything but bug reports to this mailing list. + For more information about Emacs mailing lists, see the +-file /usr/local/emacs/etc/MAILINGLISTS. ++file /usr/share/emacs/$VERSION/etc/MAILINGLISTS. + Bugs tend actually to be fixed if they can be isolated, so it is + in your interest to report them in such a way that they can be + easily reproduced. --- emacs-snapshot-20080228.orig/debian/patches/debian-version-mention.diff +++ emacs-snapshot-20080228/debian/patches/debian-version-mention.diff @@ -0,0 +1,16 @@ +** (emacs-version) has been modified to indicate Debian modifications. + Provided by: Rob Browning + +--- a/lisp/version.el ++++ b/lisp/version.el +@@ -58,8 +58,8 @@ + (interactive "P") + (let ((version-string + (format (if (not (interactive-p)) +- "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) --- emacs-snapshot-20080228.orig/debian/patches/debian-emacs-bugmail.diff +++ emacs-snapshot-20080228/debian/patches/debian-emacs-bugmail.diff @@ -0,0 +1,14 @@ +** M-x report-emacs-bug CCs the report to the maintainer. + Provided by: Romain Francoise + +--- emacs-snapshot-20070902.orig/lisp/mail/emacsbug.el ++++ emacs-snapshot-20070902/lisp/mail/emacsbug.el +@@ -98,7 +98,7 @@ + (with-current-buffer (get-buffer-create "*Messages*") + (point-max-marker))) + (compose-mail reporting-address +- topic) ++ topic '(("Cc" . "rfrancoise@debian.org"))) + ;; The rest of this does not execute + ;; if the user was asked to confirm and said no. + (rfc822-goto-eoh) --- emacs-snapshot-20080228.orig/debian/patches/debian-licenses-location.diff +++ emacs-snapshot-20080228/debian/patches/debian-licenses-location.diff @@ -0,0 +1,19 @@ +** (describe-copying) uses /usr/share/common-licenses/GPL + On Debian systems, the full text of the GPL is available from the + /usr/share/common-licenses directory. The COPYING file included + in the Emacs distribution is not installed in `data-directory', + so `describe-copying' has been modified accordingly. + + Provided by: Romain Francoise + +--- emacs-snapshot-20070902.orig/lisp/help.el ++++ emacs-snapshot-20070902/lisp/help.el +@@ -287,7 +287,7 @@ + (defun describe-copying () + "Display info on how you may redistribute copies of GNU Emacs." + (interactive) +- (view-file (expand-file-name "COPYING" data-directory)) ++ (view-file "/usr/share/common-licenses/GPL") + (goto-char (point-min))) + + (defun describe-project () --- emacs-snapshot-20080228.orig/debian/patches/debian-emacs-bugver.diff +++ emacs-snapshot-20080228/debian/patches/debian-emacs-bugver.diff @@ -0,0 +1,17 @@ +** M-x report-emacs-bug includes the package version. + Provided by: Romain Francoise + +--- emacs-snapshot-20070902.orig/lisp/mail/emacsbug.el ++++ emacs-snapshot-20070902/lisp/mail/emacsbug.el +@@ -146,6 +146,11 @@ + (add-text-properties (1+ user-point) (point) prompt-properties) + + (insert "\n\nIn " (emacs-version) "\n") ++ (insert " (emacs-snapshot package, version " ++ (substring (shell-command-to-string ++ "dpkg -s emacs-snapshot-common | grep ^Version:") ++ 9 -1) ++ ")\n") + (if (fboundp 'x-server-vendor) + (condition-case nil + ;; This is used not only for X11 but also W32 and others. --- emacs-snapshot-20080228.orig/debian/patches/debian-mail-from-style.diff +++ emacs-snapshot-20080228/debian/patches/debian-mail-from-style.diff @@ -0,0 +1,14 @@ +** `mail-from-style' is set to 'system-default by default. + Provided by: Romain Francoise + +--- emacs-snapshot-20070902.orig/lisp/mail/sendmail.el ++++ emacs-snapshot-20070902/lisp/mail/sendmail.el +@@ -59,7 +59,7 @@ + :type 'file) + + ;;;###autoload +-(defcustom mail-from-style 'angles ++(defcustom mail-from-style 'system-default + "Specifies how \"From:\" fields look. + + If `nil', they contain just the return address like: --- emacs-snapshot-20080228.orig/debian/patches/debian-inst.diff +++ emacs-snapshot-20080228/debian/patches/debian-inst.diff @@ -0,0 +1,24 @@ +** The installation of some files in system-wide directories has been disabled. + Provided by: Romain Francoise + +--- a/Makefile.in ++++ b/Makefile.in +@@ -438,7 +438,7 @@ + ## Note that the Makefiles in the etc directory are potentially useful + ## in an installed Emacs, so should not be excluded. + +-install-arch-indep: mkdir info install-etc ++install-arch-indep: mkdir info + -set ${COPYDESTS} ; \ + unset CDPATH; \ + for dir in ${COPYDIR} ; do \ +@@ -613,8 +613,7 @@ + $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ + $(DESTDIR)${datadir}/emacs/site-lisp \ + $(DESTDIR)${datadir}/emacs/${version}/site-lisp \ +- $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \ +- $(DESTDIR)${desktopdir} $${icondirs} ++ $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` + + ### Delete all the installed files that the `install' target would + ### create (but not the noninstalled files such as `make all' would --- emacs-snapshot-20080228.orig/debian/patches/tmp-fixes.diff +++ emacs-snapshot-20080228/debian/patches/tmp-fixes.diff @@ -0,0 +1,917 @@ +* Some upstream changes were temporarily reverted. + Provided by: Romain Francoise + +--- a/src/xdisp.c ++++ b/src/xdisp.c +@@ -5808,29 +5808,29 @@ + can be defined in the display table. Fill + IT->ctl_chars with glyphs for what we have to + display. Then, set IT->dpvec to these glyphs. */ +- Lisp_Object gc; ++ GLYPH g; + int ctl_len; + int face_id, lface_id = 0 ; +- int escape_glyph; ++ GLYPH escape_glyph; + + /* Handle control characters with ^. */ + + if (it->c < 128 && it->ctl_arrow_p) + { +- int g; +- + g = '^'; /* default glyph for Control */ + /* Set IT->ctl_chars[0] to the glyph for `^'. */ + if (it->dp +- && (gc = DISP_CTRL_GLYPH (it->dp), GLYPH_CODE_P (gc)) +- && GLYPH_CODE_CHAR_VALID_P (gc)) ++ && INTEGERP (DISP_CTRL_GLYPH (it->dp)) ++ && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) + { +- g = GLYPH_CODE_CHAR (gc); +- lface_id = GLYPH_CODE_FACE (gc); ++ g = XINT (DISP_CTRL_GLYPH (it->dp)); ++ lface_id = FAST_GLYPH_FACE (g); + } + if (lface_id) + { +- face_id = merge_faces (it->f, Qt, lface_id, it->face_id); ++ g = FAST_GLYPH_CHAR (g); ++ face_id = merge_faces (it->f, Qt, lface_id, ++ it->face_id); + } + else if (it->f == last_escape_glyph_frame + && it->face_id == last_escape_glyph_face_id) +@@ -5848,7 +5848,8 @@ + } + + XSETINT (it->ctl_chars[0], g); +- XSETINT (it->ctl_chars[1], it->c ^ 0100); ++ g = it->c ^ 0100; ++ XSETINT (it->ctl_chars[1], g); + ctl_len = 2; + goto display_control; + } +@@ -5863,8 +5864,8 @@ + face_id = merge_faces (it->f, Qnobreak_space, 0, + it->face_id); + +- it->c = ' '; +- XSETINT (it->ctl_chars[0], ' '); ++ g = it->c = ' '; ++ XSETINT (it->ctl_chars[0], g); + ctl_len = 1; + goto display_control; + } +@@ -5875,16 +5876,17 @@ + escape_glyph = '\\'; + + if (it->dp +- && (gc = DISP_ESCAPE_GLYPH (it->dp), GLYPH_CODE_P (gc)) +- && GLYPH_CODE_CHAR_VALID_P (gc)) ++ && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) ++ && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp)))) + { +- escape_glyph = GLYPH_CODE_CHAR (gc); +- lface_id = GLYPH_CODE_FACE (gc); ++ escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); ++ lface_id = FAST_GLYPH_FACE (escape_glyph); + } + if (lface_id) + { + /* The display table specified a face. + Merge it into face_id and also into escape_glyph. */ ++ escape_glyph = FAST_GLYPH_CHAR (escape_glyph); + face_id = merge_faces (it->f, Qt, lface_id, + it->face_id); + } +@@ -5909,8 +5911,8 @@ + if (EQ (Vnobreak_char_display, Qt) + && it->c == 0xAD) + { +- it->c = '-'; +- XSETINT (it->ctl_chars[0], '-'); ++ g = it->c = '-'; ++ XSETINT (it->ctl_chars[0], g); + ctl_len = 1; + goto display_control; + } +@@ -5921,8 +5923,8 @@ + if (it->c == 0xA0 || it->c == 0xAD) + { + XSETINT (it->ctl_chars[0], escape_glyph); +- it->c = (it->c == 0xA0 ? ' ' : '-'); +- XSETINT (it->ctl_chars[1], it->c); ++ g = it->c = (it->c == 0xA0 ? ' ' : '-'); ++ XSETINT (it->ctl_chars[1], g); + ctl_len = 2; + goto display_control; + } +@@ -5958,7 +5960,6 @@ + + for (i = 0; i < len; i++) + { +- int g; + XSETINT (it->ctl_chars[i * 4], escape_glyph); + /* Insert three more glyphs into IT->ctl_chars for + the octal display of the character. */ +@@ -6198,20 +6199,18 @@ + next_element_from_display_vector (it) + struct it *it; + { +- Lisp_Object gc; +- + /* Precondition. */ + xassert (it->dpvec && it->current.dpvec_index >= 0); + + it->face_id = it->saved_face_id; + +- /* KFS: This code used to check ip->dpvec[0] instead of the current element. +- That seemed totally bogus - so I changed it... */ +- +- if ((gc = it->dpvec[it->current.dpvec_index], GLYPH_CODE_P (gc)) +- && GLYPH_CODE_CHAR_VALID_P (gc)) ++ if (INTEGERP (*it->dpvec) ++ && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) + { +- it->c = GLYPH_CODE_CHAR (gc); ++ GLYPH g; ++ ++ g = XFASTINT (it->dpvec[it->current.dpvec_index]); ++ it->c = FAST_GLYPH_CHAR (g); + it->len = CHAR_BYTES (it->c); + + /* The entry may contain a face id to use. Such a face id is +@@ -6221,7 +6220,7 @@ + it->face_id = it->dpvec_face_id; + else + { +- int lface_id = GLYPH_CODE_FACE (gc); ++ int lface_id = FAST_GLYPH_FACE (g); + if (lface_id > 0) + it->face_id = merge_faces (it->f, Qt, lface_id, + it->saved_face_id); +--- a/src/term.c ++++ b/src/term.c +@@ -235,7 +235,7 @@ + tty_set_terminal_modes (struct terminal *terminal) + { + struct tty_display_info *tty = terminal->display_info.tty; +- ++ + if (tty->output) + { + if (tty->TS_termcap_modes) +@@ -569,6 +569,7 @@ + struct coding_system *coding; + { + struct glyph *src_end = src + src_len; ++ register GLYPH g; + unsigned char *buf; + int nchars, nbytes, required; + register int tlen = GLYPH_TABLE_LENGTH; +@@ -614,7 +615,7 @@ + for (i = 0; i < cmp->glyph_len; i++) + { + int c = COMPOSITION_GLYPH (cmp, i); +- ++ + if (! char_charset (c, charset_list, NULL)) + break; + buf += CHAR_STRING (c, buf); +@@ -630,14 +631,13 @@ + /* We must skip glyphs to be padded for a wide character. */ + else if (! CHAR_GLYPH_PADDING_P (*src)) + { +- GLYPH g; + int c; + Lisp_Object string; + + string = Qnil; +- SET_GLYPH_FROM_CHAR_GLYPH (g, src[0]); ++ g = GLYPH_FROM_CHAR_GLYPH (src[0]); + +- if (GLYPH_INVALID_P (g) || GLYPH_SIMPLE_P (tbase, tlen, g)) ++ if (g < 0 || g >= tlen) + { + /* This glyph doesn't has an entry in Vglyph_table. */ + c = src->u.ch; +@@ -651,10 +651,10 @@ + if (GLYPH_SIMPLE_P (tbase, tlen, g)) + /* We set the multi-byte form of a character in G + (that should be an ASCII character) at WORKBUF. */ +- c = GLYPH_CHAR (g); ++ c = FAST_GLYPH_CHAR (g); + else + /* We have a string in Vglyph_table. */ +- string = tbase[GLYPH_CHAR (g)]; ++ string = tbase[g]; + } + + if (NILP (string)) +@@ -1016,7 +1016,7 @@ + if (!FRAME_MEMORY_BELOW_FRAME (f) + && vpos + i >= FRAME_LINES (f)) + return; +- ++ + if (multi) + { + raw_cursor_to (f, vpos, 0); +@@ -1046,7 +1046,7 @@ + OUTPUTL (tty, scroll, tty->specified_window - vpos); + tty_set_scroll_region (f, 0, tty->specified_window); + } +- ++ + if (!FRAME_SCROLL_REGION_OK (f) + && FRAME_MEMORY_BELOW_FRAME (f) + && n < 0) +@@ -1371,7 +1371,7 @@ + + char **address = term_get_fkeys_address; + KBOARD *kboard = term_get_fkeys_kboard; +- ++ + /* This can happen if CANNOT_DUMP or with strange options. */ + if (!KEYMAPP (kboard->Vinput_decode_map)) + kboard->Vinput_decode_map = Fmake_sparse_keymap (Qnil); +@@ -1792,7 +1792,6 @@ + enum display_element_type what; + { + struct it temp_it; +- Lisp_Object gc; + GLYPH glyph; + + temp_it = *it; +@@ -1805,32 +1804,34 @@ + if (what == IT_CONTINUATION) + { + /* Continuation glyph. */ +- SET_GLYPH_FROM_CHAR (glyph, '\\'); + if (it->dp +- && (gc = DISP_CONTINUE_GLYPH (it->dp), GLYPH_CODE_P (gc)) +- && GLYPH_CODE_CHAR_VALID_P (gc)) ++ && INTEGERP (DISP_CONTINUE_GLYPH (it->dp)) ++ && GLYPH_CHAR_VALID_P (XINT (DISP_CONTINUE_GLYPH (it->dp)))) + { +- SET_GLYPH_FROM_GLYPH_CODE (glyph, gc); +- spec_glyph_lookup_face (XWINDOW (it->window), &glyph); ++ glyph = XINT (DISP_CONTINUE_GLYPH (it->dp)); ++ glyph = spec_glyph_lookup_face (XWINDOW (it->window), glyph); + } ++ else ++ glyph = '\\'; + } + else if (what == IT_TRUNCATION) + { + /* Truncation glyph. */ +- SET_GLYPH_FROM_CHAR (glyph, '$'); + if (it->dp +- && (gc = DISP_TRUNC_GLYPH (it->dp), GLYPH_CODE_P (gc)) +- && GLYPH_CODE_CHAR_VALID_P (gc)) ++ && INTEGERP (DISP_TRUNC_GLYPH (it->dp)) ++ && GLYPH_CHAR_VALID_P (XINT (DISP_TRUNC_GLYPH (it->dp)))) + { +- SET_GLYPH_FROM_GLYPH_CODE (glyph, gc); +- spec_glyph_lookup_face (XWINDOW (it->window), &glyph); ++ glyph = XINT (DISP_TRUNC_GLYPH (it->dp)); ++ glyph = spec_glyph_lookup_face (XWINDOW (it->window), glyph); + } ++ else ++ glyph = '$'; + } + else + abort (); + +- temp_it.c = GLYPH_CHAR (glyph); +- temp_it.face_id = GLYPH_FACE (glyph); ++ temp_it.c = FAST_GLYPH_CHAR (glyph); ++ temp_it.face_id = FAST_GLYPH_FACE (glyph); + temp_it.len = CHAR_BYTES (temp_it.c); + + produce_glyphs (&temp_it); +@@ -2242,7 +2243,7 @@ + This function ignores suspended devices. + + Returns NULL if the named terminal device is not opened. */ +- ++ + struct terminal * + get_named_tty (name) + char *name; +@@ -2346,12 +2347,12 @@ + { + struct terminal *t = get_tty_terminal (tty, 1); + FILE *f; +- ++ + if (!t) + error ("Unknown tty device"); + + f = t->display_info.tty->input; +- ++ + if (f) + { + /* First run `suspend-tty-functions' and then clean up the tty +@@ -2368,17 +2369,17 @@ + reset_sys_modes (t->display_info.tty); + + delete_keyboard_wait_descriptor (fileno (f)); +- ++ + fclose (f); + if (f != t->display_info.tty->output) + fclose (t->display_info.tty->output); +- ++ + t->display_info.tty->input = 0; + t->display_info.tty->output = 0; + + if (FRAMEP (t->display_info.tty->top_frame)) + FRAME_SET_VISIBLE (XFRAME (t->display_info.tty->top_frame), 0); +- ++ + } + + /* Clear display hooks to prevent further output. */ +@@ -2491,7 +2492,7 @@ + /* write_glyphs writes at cursor position, so we need to + temporarily move cursor coordinates to the beginning of + the highlight region. */ +- ++ + /* Save current cursor co-ordinates */ + save_y = curY (tty); + save_x = curX (tty); +@@ -2535,7 +2536,7 @@ + pos_y = row->y + WINDOW_TOP_EDGE_Y (w); + pos_x = row->used[LEFT_MARGIN_AREA] + start_hpos + + WINDOW_LEFT_EDGE_X (w); +- ++ + cursor_to (f, pos_y, pos_x); + + if (draw == DRAW_MOUSE_FACE) +@@ -2959,10 +2960,10 @@ + result->modifiers = down_modifier; + else + result->modifiers = 0; +- ++ + if (event->type & GPM_SINGLE) + result->modifiers |= click_modifier; +- ++ + if (event->type & GPM_DOUBLE) + result->modifiers |= double_modifier; + +@@ -2995,7 +2996,7 @@ + return Qnil; + } + +-int ++int + handle_one_term_event (struct tty_display_info *tty, Gpm_Event *event, struct input_event* hold_quit) + { + struct frame *f = XFRAME (tty->top_frame); +@@ -3106,7 +3107,7 @@ + + if (!tty || gpm_tty != tty) + return Qnil; /* Not activated on this terminal, nothing to do. */ +- ++ + if (gpm_fd >= 0) + delete_gpm_wait_descriptor (gpm_fd); + while (Gpm_Close()); /* close all the stack */ +@@ -3210,7 +3211,7 @@ + terminal->delete_glyphs_hook = &tty_delete_glyphs; + + terminal->ring_bell_hook = &tty_ring_bell; +- ++ + terminal->reset_terminal_modes_hook = &tty_reset_terminal_modes; + terminal->set_terminal_modes_hook = &tty_set_terminal_modes; + terminal->update_begin_hook = 0; /* Not needed. */ +@@ -3228,7 +3229,7 @@ + + terminal->read_socket_hook = &tty_read_avail_input; /* keyboard.c */ + terminal->frame_up_to_date_hook = 0; /* Not needed. */ +- ++ + terminal->delete_frame_hook = &delete_tty_output; + terminal->delete_terminal_hook = &delete_tty; + } +@@ -3858,7 +3859,7 @@ + + if (terminal) + delete_tty (terminal); +- ++ + if (must_succeed) + fatal (str2, arg1, arg2); + else +@@ -3889,7 +3890,7 @@ + struct tty_display_info *tty; + Lisp_Object tail, frame; + int last_terminal; +- ++ + /* Protect against recursive calls. Fdelete_frame in + delete_terminal calls us back when it deletes our last frame. */ + if (!terminal->name) +@@ -3899,7 +3900,7 @@ + abort (); + + tty = terminal->display_info.tty; +- ++ + last_terminal = 1; + FOR_EACH_FRAME (tail, frame) + { +@@ -3912,7 +3913,7 @@ + } + if (last_terminal) + error ("Attempt to delete the sole terminal device with live frames"); +- ++ + if (tty == tty_list) + tty_list = tty->next; + else +--- a/src/msdos.c ++++ b/src/msdos.c +@@ -987,8 +987,8 @@ + /* Set up the unsupported character glyph */ + if (!NILP (Vdos_unsupported_char_glyph)) + { +- unsupported_char = GLYPH_CHAR (XINT (Vdos_unsupported_char_glyph)); +- unsupported_face = GLYPH_FACE (XINT (Vdos_unsupported_char_glyph)); ++ unsupported_char = FAST_GLYPH_CHAR (XINT (Vdos_unsupported_char_glyph)); ++ unsupported_face = FAST_GLYPH_FACE (XINT (Vdos_unsupported_char_glyph)); + } + + screen_buf = screen_bp = alloca (str_len * 2); +@@ -1021,12 +1021,13 @@ + } + else + { +- GLYPH g; ++ register GLYPH g = GLYPH_FROM_CHAR_GLYPH (*str); + int glyph_not_in_table = 0; + +- SET_GLYPH_FROM_CHAR_GLYPH (g, *str); +- +- if (GLYPH_INVALID_P (g) || GLYPH_SIMPLE_P (tbase, tlen, g)) ++ /* If g is negative, it means we have a multibyte character ++ in *str. That's what GLYPH_FROM_CHAR_GLYPH returns for ++ multibyte characters. */ ++ if (g < 0 || g >= tlen) + { + /* This glyph doesn't have an entry in Vglyph_table. */ + ch = str->u.ch; +@@ -1037,7 +1038,7 @@ + /* This glyph has an entry in Vglyph_table, so process + any aliases before testing for simpleness. */ + GLYPH_FOLLOW_ALIASES (tbase, tlen, g); +- ch = GLYPH_CHAR (g); ++ ch = FAST_GLYPH_CHAR (g); + } + + /* Convert the character code to multibyte, if they +@@ -1053,10 +1054,10 @@ + /* Invalid characters are displayed with a special glyph. */ + if (! CHAR_VALID_P (ch, 0)) + { +- ch = !NILP (Vdos_unsupported_char_glyph) ++ g = !NILP (Vdos_unsupported_char_glyph) + ? XINT (Vdos_unsupported_char_glyph) +- : '\177'; +- SET_GLYPH_CHAR (g, ch); ++ : MAKE_GLYPH (sf, '\177', GLYPH_FACE (sf, g)); ++ ch = FAST_GLYPH_CHAR (g); + } + + /* If the face of this glyph is different from the current +--- a/src/lisp.h ++++ b/src/lisp.h +@@ -1424,54 +1424,43 @@ + #define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1) + + +-/* The glyph datatype, used to represent characters on the display. +- It consists of a char code and a face id. */ ++/* The glyph datatype, used to represent characters on the display. */ + +-typedef struct { +- int ch; +- int face_id; +-} GLYPH; ++/* Glyph code to use as an index to the glyph table. If it is out of ++ range for the glyph table, or the corresonding element in the table ++ is nil, the low 8 bits are the single byte character code, and the ++ bits above are the numeric face ID. If FID is the face ID of a ++ glyph on a frame F, then F->display.x->faces[FID] contains the ++ description of that face. This is an int instead of a short, so we ++ can support a good bunch of face ID's (2^(31 - 8)); given that we ++ have no mechanism for tossing unused frame face ID's yet, we'll ++ probably run out of 255 pretty quickly. ++ This is always -1 for a multibyte character. */ ++#define GLYPH int ++ ++/* Mask bits for face. */ ++#define GLYPH_MASK_FACE 0x7FC00000 ++ /* Mask bits for character code. */ ++#define GLYPH_MASK_CHAR 0x003FFFFF /* The lowest 22 bits */ ++ ++/* The FAST macros assume that we already know we're in an X window. */ ++ ++/* Set a character code and a face ID in a glyph G. */ ++#define FAST_MAKE_GLYPH(char, face) ((char) | ((face) << CHARACTERBITS)) + + /* Return a glyph's character code. */ +-#define GLYPH_CHAR(glyph) ((glyph).ch) ++#define FAST_GLYPH_CHAR(glyph) ((glyph) & GLYPH_MASK_CHAR) + + /* Return a glyph's face ID. */ +-#define GLYPH_FACE(glyph) ((glyph).face_id) ++#define FAST_GLYPH_FACE(glyph) (((glyph) & GLYPH_MASK_FACE) >> CHARACTERBITS) + +-#define SET_GLYPH_CHAR(glyph, char) ((glyph).ch = (char)) +-#define SET_GLYPH_FACE(glyph, face) ((glyph).face_id = (face)) +-#define SET_GLYPH(glyph, char, face) ((glyph).ch = (char), (glyph).face_id = (face)) ++/* Slower versions that test the frame type first. */ ++#define MAKE_GLYPH(f, char, face) (FAST_MAKE_GLYPH (char, face)) ++#define GLYPH_CHAR(f, g) (FAST_GLYPH_CHAR (g)) ++#define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g)) + + /* Return 1 if GLYPH contains valid character code. */ +-#define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (GLYPH_CHAR (glyph), 1) +- +- +-/* Glyph Code from a display vector may either be an integer which +- encodes a char code in the lower CHARACTERBITS bits and a (very small) +- face-id in the upper bits, or it may be a cons (CHAR . FACE-ID). */ +- +-#define GLYPH_CODE_CHAR(gc) \ +- (CONSP (gc) ? XINT (XCAR (gc)) : INTEGERP (gc) ? (XINT (gc) & ((1 << CHARACTERBITS)-1)) : 0) +- +-#define GLYPH_CODE_FACE(gc) \ +- (CONSP (gc) ? XINT (XCDR (gc)) : INTEGERP (gc) ? (XINT (gc) >> CHARACTERBITS) : DEFAULT_FACE_ID) +- +-/* Return 1 if glyph code from display vector contains valid character code. */ +-#define GLYPH_CODE_CHAR_VALID_P(gc) CHAR_VALID_P (GLYPH_CODE_CHAR (gc), 1) +- +-#define GLYPH_CODE_P(gc) ((CONSP (gc) && INTEGERP (XCAR (gc)) && INTEGERP (XCDR (gc))) || INTEGERP (gc)) +- +-/* Only called when GLYPH_CODE_P (gc) is true. */ +-#define SET_GLYPH_FROM_GLYPH_CODE(glyph, gc) \ +- do \ +- { \ +- if (CONSP (gc)) \ +- SET_GLYPH (glyph, XINT (XCAR (gc)), XINT (XCDR (gc))); \ +- else \ +- SET_GLYPH (glyph, (XINT (gc) & ((1 << CHARACTERBITS)-1)), \ +- (XINT (gc) >> CHARACTERBITS)); \ +- } \ +- while (0) ++#define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1) + + /* The ID of the mode line highlighting face. */ + #define GLYPH_MODE_LINE_FACE 1 +--- a/src/indent.c ++++ b/src/indent.c +@@ -447,9 +447,9 @@ + next_element_from_display_vector does it. */ + Lisp_Object entry = AREF (charvec, i); + +- if (GLYPH_CODE_P (entry) +- && GLYPH_CODE_CHAR_VALID_P (entry)) +- c = GLYPH_CODE_CHAR (entry); ++ if (INTEGERP (entry) ++ && GLYPH_CHAR_VALID_P (XFASTINT (entry))) ++ c = FAST_GLYPH_CHAR (XFASTINT (entry)); + else + c = ' '; + } +@@ -583,11 +583,12 @@ + { + /* This should be handled the same as + next_element_from_display_vector does it. */ +- Lisp_Object entry = AREF (charvec, i); ++ Lisp_Object entry; ++ entry = AREF (charvec, i); + +- if (GLYPH_CODE_P (entry) +- && GLYPH_CODE_CHAR_VALID_P (entry)) +- c = GLYPH_CODE_CHAR (entry); ++ if (INTEGERP (entry) ++ && GLYPH_CHAR_VALID_P (XFASTINT (entry))) ++ c = FAST_GLYPH_CHAR (XFASTINT (entry)); + else + c = ' '; + +@@ -1020,11 +1021,13 @@ + { + /* This should be handled the same as + next_element_from_display_vector does it. */ +- Lisp_Object entry = AREF (charvec, i); + +- if (GLYPH_CODE_P (entry) +- && GLYPH_CODE_CHAR_VALID_P (entry)) +- c = GLYPH_CODE_CHAR (entry); ++ Lisp_Object entry; ++ entry = AREF (charvec, i); ++ ++ if (INTEGERP (entry) ++ && GLYPH_CHAR_VALID_P (XFASTINT (entry))) ++ c = FAST_GLYPH_CHAR (XFASTINT (entry)); + else + c = ' '; + +@@ -1624,9 +1627,9 @@ + next_element_from_display_vector does it. */ + Lisp_Object entry = AREF (charvec, i); + +- if (GLYPH_CODE_P (entry) +- && GLYPH_CODE_CHAR_VALID_P (entry)) +- c = GLYPH_CODE_CHAR (entry); ++ if (INTEGERP (entry) ++ && GLYPH_CHAR_VALID_P (XFASTINT (entry))) ++ c = FAST_GLYPH_CHAR (XFASTINT (entry)); + else + c = ' '; + } +--- a/src/disptab.h ++++ b/src/disptab.h +@@ -74,37 +74,38 @@ + /* Given BASE and LEN returned by the two previous macros, + return nonzero if the GLYPH code G should be output as a single + character with code G. Return zero if G has a string in the table. */ +-#define GLYPH_SIMPLE_P(base,len,g) \ +- (GLYPH_FACE (g) != DEFAULT_FACE_ID || GLYPH_CHAR (g) >= (len) || !STRINGP (base[GLYPH_CHAR (g)])) ++#define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g])) + + /* Given BASE and LEN returned by the two previous macros, + return nonzero if GLYPH code G is aliased to a different code. */ +-#define GLYPH_ALIAS_P(base,len,g) \ +- (GLYPH_FACE (g) == DEFAULT_FACE_ID && GLYPH_CHAR (g) < (len) && INTEGERP (base[GLYPH_CHAR (g)])) ++#define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g])) ++ ++/* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1, ++ return the alias for G. */ ++#define GLYPH_ALIAS(base, g) XINT (base[g]) + + /* Follow all aliases for G in the glyph table given by (BASE, + LENGTH), and set G to the final glyph. */ +-#define GLYPH_FOLLOW_ALIASES(base, length, g) \ +- do { \ +- while (GLYPH_ALIAS_P ((base), (length), (g))) \ +- SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \ +- if (!GLYPH_CHAR_VALID_P (g)) \ +- SET_GLYPH_CHAR (g, ' '); \ ++#define GLYPH_FOLLOW_ALIASES(base, length, g) \ ++ do { \ ++ while (GLYPH_ALIAS_P ((base), (length), (g))) \ ++ (g) = GLYPH_ALIAS ((base), (g)); \ ++ if (!GLYPH_CHAR_VALID_P (FAST_GLYPH_CHAR (g))) \ ++ g = FAST_MAKE_GLYPH (' ', FAST_GLYPH_FACE (g)); \ + } while (0) + + /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0, + return the length and the address of the character-sequence + used for outputting GLYPH G. */ +-#define GLYPH_LENGTH(base,g) SCHARS (base[GLYPH_CHAR (g)]) +-#define GLYPH_STRING(base,g) SDATA (base[GLYPH_CHAR (g)]) ++#define GLYPH_LENGTH(base,g) SCHARS (base[g]) ++#define GLYPH_STRING(base,g) SDATA (base[g]) + + /* GLYPH for a space character. */ + + #define SPACEGLYPH 040 + #define NULL_GLYPH 00 + +-#define SET_GLYPH_FROM_CHAR(glyph, c) \ +- SET_GLYPH (glyph, c, DEFAULT_FACE_ID) ++#define GLYPH_FROM_CHAR(c) (c) + + /* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349 + (do not change this comment) */ +--- a/src/dispnew.c ++++ b/src/dispnew.c +@@ -1468,11 +1468,9 @@ + len = 0; + while (beg < end) + { +- GLYPH g; ++ GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); + +- SET_GLYPH_FROM_CHAR_GLYPH (g, *beg); +- +- if (GLYPH_INVALID_P (g) < 0 ++ if (g < 0 + || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) + len += 1; + else +@@ -2177,7 +2175,7 @@ + else if (!NILP (w->left_margin_cols) + || !NILP (w->right_margin_cols)) + return 1; +- ++ + w = NILP (w->next) ? 0 : XWINDOW (w->next); + } + return 0; +@@ -2742,9 +2740,7 @@ + struct glyph_matrix *window_matrix; + int window_y, frame_y; + /* If non-zero, a glyph to insert at the right border of W. */ +- GLYPH right_border_glyph; +- +- SET_GLYPH_FROM_CHAR (right_border_glyph, 0); ++ GLYPH right_border_glyph = 0; + + /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ + if (w->must_be_updated_p) +@@ -2755,19 +2751,15 @@ + if (!WINDOW_RIGHTMOST_P (w)) + { + struct Lisp_Char_Table *dp = window_display_table (w); +- Lisp_Object gc; + +- SET_GLYPH_FROM_CHAR (right_border_glyph, '|'); +- if (dp +- && (gc = DISP_BORDER_GLYPH (dp), GLYPH_CODE_P (gc)) +- && GLYPH_CODE_CHAR_VALID_P (gc)) +- { +- SET_GLYPH_FROM_GLYPH_CODE (right_border_glyph, gc); +- spec_glyph_lookup_face (w, &right_border_glyph); +- } +- +- if (GLYPH_FACE (right_border_glyph) <= 0) +- SET_GLYPH_FACE (right_border_glyph, VERTICAL_BORDER_FACE_ID); ++ right_border_glyph ++ = ((dp && INTEGERP (DISP_BORDER_GLYPH (dp))) ++ ? spec_glyph_lookup_face (w, XINT (DISP_BORDER_GLYPH (dp))) ++ : '|'); ++ ++ if (FAST_GLYPH_FACE (right_border_glyph) <= 0) ++ right_border_glyph ++ = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_BORDER_FACE_ID); + } + } + else +@@ -2817,7 +2809,7 @@ + + /* Maybe insert a vertical border between horizontally adjacent + windows. */ +- if (GLYPH_CHAR (right_border_glyph) != 0) ++ if (right_border_glyph) + { + struct glyph *border = window_row->glyphs[LAST_AREA] - 1; + SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); +@@ -2853,19 +2845,21 @@ + This is used for glyphs displayed specially and not part of the text; + for instance, vertical separators, truncation markers, etc. */ + +-void ++GLYPH + spec_glyph_lookup_face (w, glyph) + struct window *w; +- GLYPH *glyph; ++ GLYPH glyph; + { +- int lface_id = GLYPH_FACE (*glyph); ++ int lface_id = FAST_GLYPH_FACE (glyph); + /* Convert the glyph's specified face to a realized (cache) face. */ + if (lface_id > 0) + { + int face_id = merge_faces (XFRAME (w->frame), + Qt, lface_id, DEFAULT_FACE_ID); +- SET_GLYPH_FACE (*glyph, face_id); ++ glyph ++ = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), face_id); + } ++ return glyph; + } + + /* Add spaces to a glyph row ROW in a window matrix. +@@ -4064,7 +4058,7 @@ + { + int i; + struct frame *f = XFRAME (WINDOW_FRAME (w)); +- ++ + /* If rows overlapping others have been changed, the rows being + overlapped have to be redrawn. This won't draw lines that have + already been drawn in update_window_line because overlapped_p in +@@ -4115,7 +4109,7 @@ + int i, bottom_y; + struct glyph_row *row; + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); +- ++ + for (i = 0; i < w->current_matrix->nrows; ++i) + { + row = w->current_matrix->rows + i; +@@ -6202,10 +6196,10 @@ + continue; + + get_tty_size (fileno (tty->input), &width, &height); +- ++ + if (width > 5 && height > 2) { + Lisp_Object tail, frame; +- ++ + FOR_EACH_FRAME (tail, frame) + if (FRAME_TERMCAP_P (XFRAME (frame)) && FRAME_TTY (XFRAME (frame)) == tty) + /* Record the new sizes, but don't reallocate the data +@@ -6214,7 +6208,7 @@ + change_frame_size (XFRAME (frame), height, width, 0, 1, 0); + } + } +- ++ + errno = old_errno; + } + #endif /* SIGWINCH */ +@@ -6459,7 +6453,7 @@ + error ("Unknown terminal device"); + + tty = t->display_info.tty; +- ++ + if (tty->termscript) + { + fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); +@@ -6798,7 +6792,7 @@ + + /* Construct the space glyph. */ + space_glyph.type = CHAR_GLYPH; +- SET_CHAR_GLYPH (space_glyph, ' ', DEFAULT_FACE_ID, 0); ++ SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); + space_glyph.charpos = -1; + + inverse_video = 0; +@@ -6969,7 +6963,7 @@ + Ftty_type (selected_frame)), Qnil)); + Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil)); + } +- ++ + { + struct frame *sf = SELECTED_FRAME (); + int width = FRAME_TOTAL_COLS (sf); +--- a/src/dispextern.h ++++ b/src/dispextern.h +@@ -418,7 +418,7 @@ + /* Is GLYPH a space? */ + + #define CHAR_GLYPH_SPACE_P(GLYPH) \ +- ((GLYPH).u.ch == SPACEGLYPH) ++ (GLYPH_FROM_CHAR_GLYPH ((GLYPH)) == SPACEGLYPH) + + /* Are glyph slices of glyphs *X and *Y equal */ + +@@ -465,25 +465,18 @@ + + #define SET_CHAR_GLYPH_FROM_GLYPH(GLYPH, FROM) \ + SET_CHAR_GLYPH ((GLYPH), \ +- GLYPH_CHAR ((FROM)), \ +- GLYPH_FACE ((FROM)), \ ++ FAST_GLYPH_CHAR ((FROM)), \ ++ FAST_GLYPH_FACE ((FROM)), \ + 0) + + /* Construct a glyph code from a character glyph GLYPH. If the + character is multibyte, return -1 as we can't use glyph table for a + multibyte character. */ + +-#define SET_GLYPH_FROM_CHAR_GLYPH(G, GLYPH) \ +- do \ +- { \ +- if ((GLYPH).u.ch < 256) \ +- SET_GLYPH ((G), (GLYPH).u.ch, ((GLYPH).face_id)); \ +- else \ +- SET_GLYPH ((G), -1, 0); \ +- } \ +- while (0) +- +-#define GLYPH_INVALID_P(GLYPH) (GLYPH_CHAR (GLYPH) < 0) ++#define GLYPH_FROM_CHAR_GLYPH(GLYPH) \ ++ ((GLYPH).u.ch < 256 \ ++ ? ((GLYPH).u.ch | ((GLYPH).face_id << CHARACTERBITS)) \ ++ : -1) + + /* Is GLYPH a padding glyph? */ + +@@ -3024,7 +3017,7 @@ + void init_display P_ ((void)); + void syms_of_display P_ ((void)); + extern Lisp_Object Qredisplay_dont_pause; +-void spec_glyph_lookup_face P_ ((struct window *, GLYPH *)); ++GLYPH spec_glyph_lookup_face P_ ((struct window *, GLYPH)); + + /* Defined in terminal.c */ + --- emacs-snapshot-20080228.orig/debian/patches/debian-site-init.diff +++ emacs-snapshot-20080228/debian/patches/debian-site-init.diff @@ -0,0 +1,20 @@ +** Info-default-directory-list includes /usr/share/info/emacs-snapshot + Info-default-directory-list was modified such that the info files + for this specific flavor of Emacs come before the site-wide Info + directory. + + Provided by: Michael Olson + +--- /dev/null ++++ emacs-snapshot-20070902/lisp/site-init.el +@@ -0,0 +1,10 @@ ++ ++;; Place the flavor-specific info directory ahead of the general one. ++(catch 'done ++ (let ((cur Info-default-directory-list)) ++ (while cur ++ (when (string= (car cur) "/usr/share/info/") ++ (setcdr cur (cons (car cur) (cdr cur))) ++ (setcar cur "/usr/share/info/emacs-snapshot/") ++ (throw 'done t)) ++ (setq cur (cdr cur))))) --- emacs-snapshot-20080228.orig/debian/patches/series +++ emacs-snapshot-20080228/debian/patches/series @@ -0,0 +1,17 @@ +debian-cssc-vc-backend.diff +debian-site-init.diff +debian-startup.diff +debian-emacs-news.diff +debian-mail-from-style.diff +debian-emacs-bugmail.diff +debian-emacs-bugver.diff +debian-menu.diff +fix-font-lock-tty.diff +debian-licenses-location.diff +debian-rpath.diff +debian-browse-url.diff +debian-version-mention.diff +debian-emacs-manpage.diff +debian-inst.diff +fix-xft-invalid-face-slant.diff +tmp-fixes.diff --- emacs-snapshot-20080228.orig/debian/patches/debian-rpath.diff +++ emacs-snapshot-20080228/debian/patches/debian-rpath.diff @@ -0,0 +1,17 @@ +** Emacs is built without RPATH. + On Debian, binaries must not contain an RPATH section (and in + this case, it's redundant with system-wide library paths). + + Provided by: Romain Francoise + +--- emacs-snapshot-20070902.orig/configure ++++ emacs-snapshot-20070902/configure +@@ -9446,7 +9446,7 @@ + if test "${x_libraries}" != NONE; then + if test -n "${x_libraries}"; then + LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` +- LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` ++ LD_SWITCH_X_SITE_AUX="" + fi + x_default_search_path="" + x_search_path=${x_libraries} --- emacs-snapshot-20080228.orig/debian/patches/debian-menu.diff +++ emacs-snapshot-20080228/debian/patches/debian-menu.diff @@ -0,0 +1,61 @@ +** Debian-related items were added to the Help menu. + Provided by: Romain Francoise + +--- a/lisp/menu-bar.el ++++ b/lisp/menu-bar.el +@@ -1282,6 +1282,28 @@ + (info "elisp") + (Info-index topic)) + ++(defun debian-emacs-changelog () ++ "Display the Debian changelog file for this package." ++ (interactive) ++ (view-file "/usr/share/doc/emacs-snapshot-common/changelog.Debian.gz") ++ (goto-address)) ++ ++(defun debian-emacs-news () ++ "Display the Debian NEWS file for this package." ++ (interactive) ++ (view-file "/usr/share/doc/emacs-snapshot-common/NEWS.Debian.gz") ++ (goto-address)) ++ ++(defun debian-emacs-readme () ++ "Display the Debian README file for this package." ++ (interactive) ++ ;; Force opening of this file in outline mode, even if the other mode ++ ;; is present. ++ (let ((auto-mode-alist (cons '("debian/README.Debian$" . outline-mode) ++ auto-mode-alist))) ++ (view-file "/usr/share/doc/emacs-snapshot-common/README.Debian") ++ (goto-address))) ++ + (define-key menu-bar-search-documentation-menu [search-documentation-strings] + '(menu-item "Search Documentation Strings..." apropos-documentation + :help +@@ -1363,7 +1385,7 @@ + (view-file (expand-file-name "MORE.STUFF" + data-directory)) + (goto-address))) +-(define-key menu-bar-help-menu [sep2] ++(define-key menu-bar-help-menu [sep3] + '("--")) + (define-key menu-bar-help-menu [more] + '(menu-item "External Packages" menu-bar-help-extra-packages +@@ -1380,6 +1402,17 @@ + (list 'menu-item "Describe" menu-bar-describe-menu)) + (define-key menu-bar-help-menu [search-documentation] + (list 'menu-item "Search Documentation" menu-bar-search-documentation-menu)) ++(define-key menu-bar-help-menu [sep2] ++ '("--")) ++(define-key menu-bar-help-menu [debian-emacs-changelog] ++ '(menu-item "Debian ChangeLog" debian-emacs-changelog ++ :help "Display the Debian changelog")) ++(define-key menu-bar-help-menu [debian-emacs-news] ++ '(menu-item "Debian News" debian-emacs-news ++ :help "Display the NEWS.Debian file")) ++(define-key menu-bar-help-menu [debian-emacs-readme] ++ '(menu-item "Debian README" debian-emacs-readme ++ :help "Display the README.Debian file")) + (define-key menu-bar-help-menu [sep1] + '("--")) + (define-key menu-bar-help-menu [eliza] --- emacs-snapshot-20080228.orig/debian/patches/debian-startup.diff +++ emacs-snapshot-20080228/debian/patches/debian-startup.diff @@ -0,0 +1,31 @@ +** Define a Debian-specific Emacs flavor. + Provided by: Rob Browning + +--- a/lisp/startup.el ++++ b/lisp/startup.el +@@ -317,6 +317,10 @@ + + (defvar normal-top-level-add-subdirs-inode-list nil) + ++(defconst debian-emacs-flavor 'emacs-snapshot ++ "A symbol representing the particular debian flavor of emacs running. ++Something like 'emacs20, 'xemacs20, etc.") ++ + (defvar no-blinking-cursor nil) + + (defvar default-frame-background-mode) +@@ -879,7 +883,13 @@ + ;; 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)) ++ (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 nil))) + + ;; Sites should not disable this. Only individuals should disable + ;; the startup screen. --- emacs-snapshot-20080228.orig/debian/patches/fix-xft-invalid-face-slant.diff +++ emacs-snapshot-20080228/debian/patches/fix-xft-invalid-face-slant.diff @@ -0,0 +1,12 @@ +--- emacs-snapshot-20080228/src/xfaces.c 2008-02-26 13:18:05.000000000 -0500 ++++ emacs-snapshot-20080228.new/src/xfaces.c 2008-03-01 17:57:30.000000000 -0500 +@@ -1872,7 +1872,8 @@ + {"ot", XLFD_SLANT_OTHER, &Qitalic}, + {"r", XLFD_SLANT_ROMAN, &Qnormal}, + {"ri", XLFD_SLANT_REVERSE_ITALIC, &Qreverse_italic}, +- {"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique} ++ {"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique}, ++ {"roman", XLFD_SLANT_ROMAN, &Qnormal} + }; + + /* Table of XLFD weight names. This table must be sorted by weight --- emacs-snapshot-20080228.orig/debian/patches/debian-browse-url.diff +++ emacs-snapshot-20080228/debian/patches/debian-browse-url.diff @@ -0,0 +1,40 @@ +** Emacs honors the Debian `x-www-browser' alternative. + On Debian systems, default commands can be customized using the + Debian alternatives system. This patch makes Emacs honor the + `x-www-browser' alternative when determining the default browser to + use. + + Provided by: Romain Francoise + +# Note: this patch voluntarily skips the x-www-browser alternative if +# the alternative is set to `auto'. This is because the browser +# priorities are set by the package maintainers and appear to be quite +# random; using Emacs's idea of a default browser is better than using +# whatever browser is pointed to by the automatic alternative. + +--- a/lisp/net/browse-url.el ++++ b/lisp/net/browse-url.el +@@ -551,7 +551,7 @@ + :type '(repeat (string :tag "Argument")) + :group 'browse-url) + +-(defcustom browse-url-generic-program nil ++(defcustom browse-url-generic-program "x-www-browser" + "The name of the browser program used by `browse-url-generic'." + :type '(choice string (const :tag "None" nil)) + :group 'browse-url) +@@ -884,6 +884,14 @@ + xterm, MMM, and then W3." + (apply + (cond ++ ((and browse-url-generic-program ++ (executable-find browse-url-generic-program) ++ (executable-find "/usr/sbin/update-alternatives") ++ (not (string-match ++ "status is auto" ++ (shell-command-to-string ++ "/usr/sbin/update-alternatives --display x-www-browser")))) ++ 'browse-url-generic) + ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) + ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) + ((executable-find browse-url-firefox-program) 'browse-url-firefox) --- emacs-snapshot-20080228.orig/debian/patches/debian-emacs-news.diff +++ emacs-snapshot-20080228/debian/patches/debian-emacs-news.diff @@ -0,0 +1,17 @@ +** Mention Debian-specific changes in the Emacs NEWS file. + Provided by: Rob Browning + +--- emacs-snapshot-20070902.orig/etc/NEWS ++++ emacs-snapshot-20070902/etc/NEWS +@@ -21,6 +21,11 @@ + so we will look at it and add it to the manual. + + ++* Debian specific changes to Emacs ++ ++Please see /usr/share/doc/emacs-snapshot-common/README.Debian. ++ ++ + * About external Lisp packages + + --- emacs-snapshot-20080228.orig/debian/patches/fix-font-lock-tty.diff +++ emacs-snapshot-20080228/debian/patches/fix-font-lock-tty.diff @@ -0,0 +1,26 @@ +** Comment text is font-locked on 8-color ttys. + This patch undoes an upstream change and makes emacs-snapshot + behave as emacs21 did on 8-color ttys: comment text is + font-locked by default. + + Upstream decided to make comment text appear as regular text and + only fontify comment delimiters, which would probably trigger + numerous bug reports about comments not being font-locked on + ttys. + + Provided by: Romain Francoise + +--- emacs-snapshot-20070902.orig/lisp/font-lock.el ++++ emacs-snapshot-20070902/lisp/font-lock.el +@@ -1822,9 +1822,9 @@ + (((class color) (min-colors 16) (background dark)) + (:foreground "red1")) + (((class color) (min-colors 8) (background light)) +- ) ++ (:foreground "red")) + (((class color) (min-colors 8) (background dark)) +- ) ++ (:foreground "red1")) + (t (:weight bold :slant italic))) + "Font Lock mode face used to highlight comments." + :group 'font-lock-faces) --- emacs-snapshot-20080228.orig/debian/bug.script.in +++ emacs-snapshot-20080228/debian/bug.script.in @@ -0,0 +1,32 @@ +#!/bin/sh + +exec >&3 + +echo "-- Emacs odds and ends:" +TMP=`mktemp` +cat >$TMP <&1 +rm -f $TMP +echo + +echo "-- /usr/share/@BIN_NAME@/:" +ls --format=long --almost-all --recursive /usr/share/@BIN_NAME@ +echo + +echo "-- /usr/share/emacs/site-lisp/:" +ls --format=long --almost-all --recursive /usr/share/emacs/site-lisp +echo + +echo "-- /var/lib/emacs-snapshot/:" +ls --format=long --almost-all --recursive /var/lib/emacs-snapshot +echo + +# If grep-dctrl is installed, get more info +if test -x /usr/bin/grep-status; then + echo "-- Packages related to Emacs:" + grep-status -FDepends emacs -sPackage,Version,Status + echo +fi --- emacs-snapshot-20080228.orig/debian/copyright +++ emacs-snapshot-20080228/debian/copyright @@ -0,0 +1,36 @@ +-*-text-*- + +This package was debianized by Rob Browning +on Tue, 16 Dec 1997 00:05:45 -0600 and is now maintained by +Romain Francoise . + +The Debian source is based on a CVS checkout of the GNU Emacs CVS trunk, +which can be obtained with: + + cvs -z3 -d :pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs co emacs + +For more details, see . + +Please see /usr/share/doc/emacs-snapshot-common/README.Debian for a +description of the Debian specific differences from the upstream +version. + +Copyright: + + GNU Emacs is Copyright (C) 1985, 1986, 1987, 1993-2007 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA and is covered under the terms of the GPL. See the file + /usr/share/common-licenses/GPL for more information. + + The GNU Emacs Manual is Copyright (C) 1985, 1986, 1987, 1993-2007 Free + Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. It is covered under the terms of the GNU Free + Documentation License, version 1.2 or later. See node `GNU Free + Documentation License' in the Info manual (emacs) for details. + + The GNU Emacs Manual and related manuals in /usr/share/info/emacs-snapshot + are Copyright (C) 1985, 1986, 1987, 1993-2007 Free Software + Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA. They are covered under the terms of the GNU Free Documentation + License, version 1.2 or later. See node `GNU Free Documentation + License' in the Info manual (emacs) for details. --- emacs-snapshot-20080228.orig/debian/emacs-common.docs +++ emacs-snapshot-20080228/debian/emacs-common.docs @@ -0,0 +1,3 @@ +README +BUGS +README.add-on-package-maintainers --- emacs-snapshot-20080228.orig/debian/emacs-el.overrides.linda +++ emacs-snapshot-20080228/debian/emacs-el.overrides.linda @@ -0,0 +1,2 @@ +# linda is stupid, copyright.el.gz isn't a copyright file +Tag: compressed-copyright --- emacs-snapshot-20080228.orig/debian/emacs.postinst +++ emacs-snapshot-20080228/debian/emacs.postinst @@ -0,0 +1,51 @@ +#!/bin/sh + +set -e + +# Register ourselves as the flavor alternative +update-alternatives \ + --install /usr/bin/@BIN_NAME@ @BIN_NAME@ \ + /usr/bin/@BIN_NAME@-@X_SUPPORT@ 0 + +# emacsen-common registration: if a subflavor package is already +# installed, don't call `emacs-install'. +F=`ls /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-* 2>/dev/null || true` +if [ -z "$F" ]; then + # Set up the emacs alternative for @BIN_NAME@ + update-alternatives \ + --install /usr/bin/emacs emacs \ + /usr/bin/@BIN_NAME@ @BIN_PRIORITY@ \ + --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \ + /usr/share/man/man1/emacs.1@BIN_NAME@.gz + + # ... then set up the editor alternative... + update-alternatives \ + --install /usr/bin/editor editor \ + /usr/bin/@BIN_NAME@ 0 \ + --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ + /usr/share/man/man1/emacs.1@BIN_NAME@.gz + + # ... then call `emacs-install'. + INSTLOG=`mktemp /tmp/@BIN_NAME@.XXXXXX` + echo -n "Byte-compiling add-on packages, please wait..." + if /usr/lib/emacsen-common/emacs-install @BIN_NAME@ >$INSTLOG 2>&1; then + echo " done." + [ -z "$EMACS_DEBUG" ] && rm -f $INSTLOG + else + echo " failed." + echo + echo "!! Byte-compilation for @BIN_NAME@ failed!" + echo "!! This indicates a bug in one of the add-on packages" + echo "!! installed on your system, or a bug in Emacs itself." + echo "!! Please file a bug report against @BIN_NAME@" + echo "!! and attach the file $INSTLOG" + exit 1 + fi +fi + +# Register ourselves as a subflavor of this flavor +touch /var/lib/@BIN_NAME@/installed-subflavors/@BIN_NAME@-@X_SUPPORT@ + +#DEBHELPER# + +exit 0