xterm: Changes to 'debian-unstable'
INSTALL | 15
Imakefile | 6
MANIFEST | 4
Makefile.in | 8
Tekproc.c | 61
button.c | 328 ++--
cachedGCs.c | 50
charproc.c | 607 ++++---
configure | 2401 +++++++++++++++---------------
configure.in | 25
ctlseqs.ms | 4
ctlseqs.txt | 2
cursor.c | 23
data.c | 4
data.h | 4
debian/README | 96 -
debian/README.source | 73
debian/changelog | 20
debian/compat | 2
debian/control | 6
debian/patches/900_debian_xterm.diff | 26
debian/patches/901_xterm_manpage.diff | 2
debian/patches/902_pointermode_never.diff | 2
debian/patches/903_windowops.diff | 8
debian/patches/904_fontops.diff | 6
debian/rules | 112 -
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 293 +++
debian/xsfbs/xsfbs.sh | 853 ++++++++++
debian/xterm.postinst | 45
debian/xterm.postinst.in | 41
debian/xterm.preinst | 41
debian/xterm.prerm | 23
debian/xterm.prerm.in | 28
doublechr.c | 72
error.h | 10
fontutils.c | 125 -
fontutils.h | 30
input.c | 11
linedata.c | 251 +++
main.c | 32
menu.c | 39
menu.h | 3
misc.c | 194 +-
os2main.c | 6
print.c | 217 +-
ptydata.c | 76
ptyx.h | 318 ++-
resize.c | 12
resize.man | 17
screen.c | 1779 ++++++++++++++--------
scrollback.c | 118 +
scrollbar.c | 36
tabs.c | 10
termcap | 27
testxmc.c | 27
trace.c | 192 +-
trace.h | 7
util.c | 658 ++++----
version.h | 4
xterm.h | 130 -
xterm.log.html | 80
xterm.man | 663 ++++----
xtermcfg.hin | 12
64 files changed, 6406 insertions(+), 4001 deletions(-)
New commits:
commit 41623fe3aae8b7e9bc5e6fa09d05d8f3c5a45f6a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 16:31:12 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 43a54dd..4566b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (244-1) UNRELEASED; urgency=low
+xterm (244-1) unstable; urgency=low
* New upstream release
+ remove a limit-check in ptydata.c, allowing Unicode values past 64k to
@@ -16,7 +16,7 @@ xterm (244-1) UNRELEASED; urgency=low
* Bump debian/compat to 5, as compatibility level 4 has been deprecated.
* Remove obsolete debian/README.
- -- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 16:30:29 +0200
xterm (243-1) unstable; urgency=low
commit 4d579e8f27a74aad5191f99d894e74cab44cc303
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 16:25:56 2009 +0200
Remove obsolete debian/README.
diff --git a/debian/README b/debian/README
deleted file mode 100644
index 3cafea1..0000000
--- a/debian/README
+++ /dev/null
@@ -1,96 +0,0 @@
-$Id$
-
-This file attempts to explain some of the oddities of the xterm Debian
-source package by describing the files and directories not usually found in
-a (debhelperized) source package.
-
-This package uses quilt to manage patches. A basic description of how to use
-this is below.
-
-Interesting targets supported by the debian/rules file include:
- debian/rules setup Unpacks and patches the source.
- debian/rules patch-audit Unpacks and patches the source, and
- verifies that there are no offsets or
- fuzz in the patches. If you are
- contributing a patch, please verify that
- this target works before submitting it;
- it can save the package maintainers a
- considerable amount of time.
- debian/rules clean Unpatches the source and removes stampdir,
- build-tree, and various patch-related items
- debian/rules patch Patches the source with all patches
- debian/rules unpatch Unpatches the source with all patches
- debian/rules prepare Sets up the directory so you can begin
- editing patches. VERY IMPORTANT.
-
-Editing and creating patches:
- The first thing you need to do is become familiar with the basics of quilt.
- It comes with a pdf tutorial in /usr/share/doc/quilt as well as an excellent
- manpage.
-
- To start, you should be in the top level directory, containing the debian
- directory and the xc directory. First, run debian/rules prepare. This will
- set up the proper symlinks so that quilt can find the patches it needs to
- apply. Once this is done, you will see a symlink named "patches" that will
- point to debian/patches. This is because quilt expects the patches directory
- to be located at the top level by default. It will set up a ".pc" link as
- well, which quilt uses internally to store info (this is why you'll want to
- use debian/rules clean to clean up, rather than just rm -rf'ing what you see,
- the hidden .pc is easy to forget). It will also create a stampdir that is
- used to store stamps so debian/rules knows what its done, as well as logs.
-
- Now that the directory is set up, you're going to want to do your thing.
- Let's start with editing a patch. You'll want to run "quilt push
- yourpatchname.diff". You're going to want to make your edits now. If you're
- editing a file that wasn't previously included in the patch, be sure to let
- quilt know you're doing it by using "quilt add" or "quilt edit". If you're
- not sure if you need this, you can run "quilt files" to see if your file is
- already in there, or "quilt patches filename" to see if the current patch
- edits the specified file. Once you're done editing, run "quilt refresh" to
- update your patch. All documentation in the patch header will be retained by
- quilt automatically. If you have made a serious edit, you may want to
- document it in the header of the patch.
-
- Alternately, you could be creating a new patch. As above, you'll want to set
- up the tree by running debian/rules prepare. You need to decide where your
- patch belongs according to the number series specified below. Once you do
- this, run "quilt push patch-before-yours" specifying the patch that will be
- the last one applied before your new patch. Then run "quilt new patchname"
- using the name of the patch (including the appropriate number). Make your
- edits to the files. As described above, you'll want to be sure quilt knows
- which files you are editing. When you are finished, run "quilt refresh -u -p
- 0". This will create a unified diff patch with a strip number of 0. You
- should then go in to the patches directory and document your patch.
-
- You may have a patch that you stole from some other source that you just want
- to apply and you don't want to deal with adding files by hand. You can use
- "quilt import -n internal-patch-name file-name" where the internal-patch-name
- is what you want to call your patch. You'll want to push the patch before
- yours, as described above, before doing the import, in order to make sure it
- applies in the right sequence.
-
- Once you're all done with patch work, you'll want to run debian/rules clean
- to get rid of the things that had to be set up.
-
-patches:
- Directory containing patches applied in ASCIIbetical order.
- numeric prefix indicates disposition of patch
- 000 patches FROM upstream
-
- 001-899 patches that should be sent upstream
-
- 001-099 general-purpose patches
- 100-199 architecture-specific patches
- 800-899 OS flavour patches
-
- 900-999 patches that should not be sent upstream
-
- 900-998 Debian-specific behavior and enhancements
- 999 experimental or debugging patches (should not
- generally be present in a production release)
-
-local:
- This contains Debian-specific programs and documentation that we include
- in our xterm binary packages; for instance, our UTF-8 wrapper.
-
-vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/changelog b/debian/changelog
index 75f699b..43a54dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xterm (244-1) UNRELEASED; urgency=low
* Remove from postinst some code to fix pre-etch non-released versions.
* Refresh/update patches.
* Bump debian/compat to 5, as compatibility level 4 has been deprecated.
+ * Remove obsolete debian/README.
-- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
commit d0e163364d2e5b79ddadc399bc13ef9c21217e0b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 16:17:19 2009 +0200
Bump debian/compat to 5, as compatibility level 4 has been deprecated.
diff --git a/debian/changelog b/debian/changelog
index 7316661..75f699b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xterm (244-1) UNRELEASED; urgency=low
* Remove preinst dealing with upgrades from pre-etch versions.
* Remove from postinst some code to fix pre-etch non-released versions.
* Refresh/update patches.
+ * Bump debian/compat to 5, as compatibility level 4 has been deprecated.
-- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index d2c6aa0..ced09ed 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
-Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), libxaw7-dev, debhelper (>= 4.1.16), quilt, lynx
+Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), libxaw7-dev, debhelper (>= 5), quilt, lynx
# Reasons for Build-Depends:
#
@@ -82,7 +82,7 @@ Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2), libxrend
# Tekproc.c:#include <X11/Xaw/Form.h>
# Tekproc.c:#include <X11/Xaw3d/Form.h>
# Tekproc.c:#include <X11/XawPlus/Form.h>
-# debhelper (>= 4.1.16) po-debconf support
+# debhelper (>= 5) debian/compat = 5
# dpkg-dev (>= 1.10.14) (1.10.11) comment support in debian/control;
# (1.10.14) architecture-specific binary
# package dependencies
commit 9714fda1d8e7ee215144347a5eac23260bd36866
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 15:55:11 2009 +0200
Refresh/update patches.
diff --git a/debian/changelog b/debian/changelog
index ab64cba..7316661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xterm (244-1) UNRELEASED; urgency=low
README.source, and allows us to bump Standards-Version to 3.8.2.
* Remove preinst dealing with upgrades from pre-etch versions.
* Remove from postinst some code to fix pre-etch non-released versions.
+ * Refresh/update patches.
-- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
diff --git a/debian/patches/900_debian_xterm.diff b/debian/patches/900_debian_xterm.diff
index 8c8b14a..bddcc80 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -23,10 +23,10 @@ Make Debian-specific tweaks to xterm:
This patch by Branden Robinson.
-Index: xterm-242/termcap
+Index: xterm/termcap
===================================================================
---- xterm-242.orig/termcap
-+++ xterm-242/termcap
+--- xterm.orig/termcap
++++ xterm/termcap
@@ -71,6 +71,14 @@
:so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
@@ -42,7 +42,7 @@ Index: xterm-242/termcap
# The xterm-new description has all of the features, but is not completely
# compatible with vt220. If you are using a Sun or PC keyboard, set the
# sunKeyboard resource to true:
-@@ -232,5 +240,6 @@
+@@ -233,5 +241,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
v0|xterm|X11 terminal emulator:\
@@ -50,10 +50,10 @@ Index: xterm-242/termcap
+ :tc=xterm-debian:
+# :tc=xterm-new:
# :tc=xterm-r6:
-Index: xterm-242/terminfo
+Index: xterm/terminfo
===================================================================
---- xterm-242.orig/terminfo
-+++ xterm-242/terminfo
+--- xterm.orig/terminfo
++++ xterm/terminfo
@@ -955,6 +955,13 @@
u8=\E[?1;2c,
u9=\E[c,
@@ -76,10 +76,10 @@ Index: xterm-242/terminfo
+ use=xterm-debian,
+# use=xterm-new,
# use=xterm-r6,
-Index: xterm-242/XTerm.ad
+Index: xterm/XTerm.ad
===================================================================
---- xterm-242.orig/XTerm.ad
-+++ xterm-242/XTerm.ad
+--- xterm.orig/XTerm.ad
++++ xterm/XTerm.ad
@@ -121,6 +121,10 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
@@ -91,10 +91,10 @@ Index: xterm-242/XTerm.ad
! If xterm is built with a toolbar, the widget hierarchy looks like this,
! showing widget name / class names. The complete menu hierarchy is built
! at startup because it is needed to make the layout work for the menubar:
-Index: xterm-242/XTerm-col.ad
+Index: xterm/XTerm-col.ad
===================================================================
---- xterm-242.orig/XTerm-col.ad
-+++ xterm-242/XTerm-col.ad
+--- xterm.orig/XTerm-col.ad
++++ xterm/XTerm-col.ad
@@ -7,9 +7,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
diff --git a/debian/patches/901_xterm_manpage.diff b/debian/patches/901_xterm_manpage.diff
index 7f12d81..f60aa24 100644
--- a/debian/patches/901_xterm_manpage.diff
+++ b/debian/patches/901_xterm_manpage.diff
@@ -9,7 +9,7 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -5008,10 +5008,10 @@
+@@ -5051,10 +5051,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
diff --git a/debian/patches/902_pointermode_never.diff b/debian/patches/902_pointermode_never.diff
index 8e1199d..e529489 100644
--- a/debian/patches/902_pointermode_never.diff
+++ b/debian/patches/902_pointermode_never.diff
@@ -5,7 +5,7 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -2663,11 +2663,11 @@
+@@ -2691,11 +2691,11 @@
.RS
.TP 3
0
diff --git a/debian/patches/903_windowops.diff b/debian/patches/903_windowops.diff
index de1e195..771a5ff 100644
--- a/debian/patches/903_windowops.diff
+++ b/debian/patches/903_windowops.diff
@@ -2,12 +2,12 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -1516,7 +1516,7 @@
+@@ -1536,7 +1536,7 @@
.B "allowWindowOps (\fPclass\fB AllowWindowOps)"
Specifies whether extended window control sequences (as used in dtterm)
should be allowed.
--The default is ``true.''
-+The default is ``false.''
+-The default is \*(``true.\*(''
++The default is \*(``false.\*(''
.TP 8
.B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)"
- If ``true'', treat the Alt-key as if it were the Meta-key.
+ If \*(``true\*('', treat the Alt-key as if it were the Meta-key.
diff --git a/debian/patches/904_fontops.diff b/debian/patches/904_fontops.diff
index 9d20e03..db35cb1 100644
--- a/debian/patches/904_fontops.diff
+++ b/debian/patches/904_fontops.diff
@@ -2,12 +2,12 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -1474,7 +1474,7 @@
+@@ -1494,7 +1494,7 @@
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
--The default is ``true.''
-+The default is ``false.''
+-The default is \*(``true.\*(''
++The default is \*(``false.\*(''
.TP 8
.B "allowSendEvents (\fPclass\fB AllowSendEvents)"
Specifies whether or not synthetic key and button events (generated using
commit dc3a378c95e592e43a62ae288510f0267490aa0a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 15:48:28 2009 +0200
Remove from postinst some code to fix pre-etch non-released versions.
diff --git a/debian/changelog b/debian/changelog
index 961f5ed..ab64cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xterm (244-1) UNRELEASED; urgency=low
version of) it (closes: #538594). Incidentally, this provides
README.source, and allows us to bump Standards-Version to 3.8.2.
* Remove preinst dealing with upgrades from pre-etch versions.
+ * Remove from postinst some code to fix pre-etch non-released versions.
-- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
diff --git a/debian/xterm.postinst.in b/debian/xterm.postinst.in
index 3adfcbd..a7f3c97 100644
--- a/debian/xterm.postinst.in
+++ b/debian/xterm.postinst.in
@@ -34,15 +34,6 @@ update-alternatives --install /usr/bin/x-terminal-emulator \
/usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
/usr/share/man/man1/lxterm.1.gz
-# in xterm versions from 204-0pre1 to 222-1, the manpage alternative was
-# set incorrectly to x-terminal-emulator.1x.gz. In some cases, this can lead
-# to the absence of the x-terminal-emulator.1.gz symbolic link after the
-# upgrade, so we check for this situation and add it back if necessary.
-# This can be removed after the release of etch.
-if ! [ -L /usr/share/man/man1/x-terminal-emulator.1.gz ]; then
- ln -s /etc/alternatives/x-terminal-emulator.1.gz /usr/share/man/man1
-fi
-
#DEBHELPER#
exit 0
commit ecd3ec4beba1aa90321048b2335134bfa2a7bfe3
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 15:47:11 2009 +0200
Remove preinst dealing with upgrades from pre-etch versions.
diff --git a/debian/changelog b/debian/changelog
index 234175d..961f5ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xterm (244-1) UNRELEASED; urgency=low
* Switch debian/rules to xsfbs instead of copying half of (an outdated
version of) it (closes: #538594). Incidentally, this provides
README.source, and allows us to bump Standards-Version to 3.8.2.
+ * Remove preinst dealing with upgrades from pre-etch versions.
-- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
diff --git a/debian/xterm.preinst.in b/debian/xterm.preinst.in
deleted file mode 100644
index 5ae3e8a..0000000
--- a/debian/xterm.preinst.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# Debian xterm package pre-installation script
-# Copyright 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xterm
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
- if dpkg --compare-versions "$2" lt "4.0.1-1"; then
- # Clean up after older alternative that used different path.
- if update-alternatives --display x-terminal-emulator |
- fgrep -q /usr/bin/X11/xterm; then
- update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
- fi
- fi
-
- if dpkg --compare-versions "$2" lt "204"; then
- # Clean up after older alternative that used different path.
- if update-alternatives --display x-terminal-emulator |
- fgrep -q /usr/X11R6/bin/xterm; then
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/koi8rxterm
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/uxterm
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/xterm
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/lxterm
- fi
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=4 ts=4 tw=80:
commit ebd1dbab7d6a6e21905509347bc3f097a1e4c442
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 10 15:44:30 2009 +0200
Switch debian/rules to xsfbs
Instead of copying half of an outdated version of it into debian/rules,
use it directly (closes: #538594). Incidentally, this provides
README.source, and allows us to bump Standards-Version to 3.8.2.
diff --git a/debian/changelog b/debian/changelog
index 793a283..234175d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ xterm (244-1) UNRELEASED; urgency=low
ifdef'd out as EXP_BOGUS_FG (closes: #522141)
+ work around groff mapping of ASCII quotes using macros (requested by
Reuben Thomas based on Colin Watson advice (closes: #378700)
+ * Switch debian/rules to xsfbs instead of copying half of (an outdated
+ version of) it (closes: #538594). Incidentally, this provides
+ README.source, and allows us to bump Standards-Version to 3.8.2.
-- Julien Cristau <jcristau@debian.org> Mon, 10 Aug 2009 10:55:18 +0200
diff --git a/debian/control b/debian/control
index ebcafab..d2c6aa0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Martínez Moreno <ender@debian.org>, David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
diff --git a/debian/rules b/debian/rules
index 2df28a2..4782a6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,11 @@
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+include debian/xsfbs/xsfbs.mk
+
# debhelper
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
-
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -36,20 +33,10 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
-# Figure out who's building this package.
-BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
-
-# Set some Imake variables for the regular and server-debugging builds.
-TIMESTAMP:=$(shell env TZ=UTC date +%Y%m%d%H%M%S)
-
HTML2TEXT:=lynx -dump -nolist
-STAMP_DIR:=stampdir
-
-DEBINSTALLTREE:=$(CURDIR)/debian/tmp
-
DESKTOP_FLAGS = --vendor debian \
- --dir=$(DEBINSTALLTREE)/usr/share/applications
+ --dir=$(DEBTREEDIR)/usr/share/applications
# by default, never hide the cursor
CFLAGS += -DDEF_POINTER_MODE=pNever
@@ -59,58 +46,6 @@ CFLAGS += \
-DDEF_ALLOW_FONT=False \
-DDEF_ALLOW_TCAP=False
-# Set up the $(STAMP_DIR) directory.
-.PHONY: stampdir
-stampdir: $(STAMP_DIR)/stampdir
-$(STAMP_DIR)/stampdir:
- mkdir $(STAMP_DIR)
- >$@
-
-# Set up the package build directory as quilt expects to find it.
-.PHONY: prepare
-prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- mkdir $(STAMP_DIR)/patches $(STAMP_DIR)/log
- echo 2 >$(STAMP_DIR)/patches/.version
- ln -s debian/patches patches
- ln -s $(STAMP_DIR)/patches .pc
- >$@
-
-# Apply all patches to the upstream source.
-.PHONY: patch
-patch: $(STAMP_DIR)/patch
-$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
- if $(QUILT) next >/dev/null 2>&1; then \
- echo -n "Applying patches... "; \
- if $(QUILT) push -a -v > $(STAMP_DIR)/log/patch 2>&1; then \
- cat $(STAMP_DIR)/log/patch; \
- echo "successful."; \
- else \
- cat $(STAMP_DIR)/log/patch; \
- echo "failed! (Check $(STAMP_DIR)/log/patch for details)"; \
- exit 1; \
- fi; \
- else \
- echo "No patches to apply"; \
- fi
- >$@
-
-# Revert all patches to the upstream source.
-.PHONY: unpatch
-unpatch:
- rm -f $(STAMP_DIR)/patch
- @if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- echo -n "Unapplying patches... "; \
- if $(QUILT) pop -a -v > $(STAMP_DIR)/log/unpatch 2>&1; then \
- cat $(STAMP_DIR)/log/unpatch; \
- echo " successful."; \
- else \
- cat $(STAMP_DIR)/log/unpatch; \
- echo " failed! (Check $(STAMP_DIR)/log/unpatch for details)"; \
- exit 1; \
- fi; \
- fi
-
.PHONY: configure
configure: $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(STAMP_DIR)/patch
@@ -146,10 +81,9 @@ $(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq.gz
touch $@
.PHONY: clean
-clean: unpatch
+clean: xsfclean
dh_testdir
dh_testroot
- rm -f .pc patches
rm -rf $(STAMP_DIR)
rm -rf obj-$(DEB_BUILD_GNU_TYPE)
dh_clean debian/local/xterm.faq.gz
@@ -162,15 +96,15 @@ install: build
dh_installdirs
# General installation
cd obj-$(DEB_BUILD_GNU_TYPE) && \
- $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBINSTALLTREE)
+ $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBTREEDIR)
## Install lxterm command and manual page.
- install -m 755 debian/local/lxterm $(DEBINSTALLTREE)/usr/bin
- install -m 755 debian/local/lxterm.1 $(DEBINSTALLTREE)/usr/share/man/man1
+ install -m 755 debian/local/lxterm $(DEBTREEDIR)/usr/bin
+ install -m 755 debian/local/lxterm.1 $(DEBTREEDIR)/usr/share/man/man1
## Install terminfo and termcap precompiled definitions.
- install -d $(DEBINSTALLTREE)/usr/lib
- install -m 644 termcap $(DEBINSTALLTREE)/usr/lib/xterm.termcap
- install -m 644 terminfo $(DEBINSTALLTREE)/usr/lib/xterm.terminfo
+ install -d $(DEBTREEDIR)/usr/lib
+ install -m 644 termcap $(DEBTREEDIR)/usr/lib/xterm.termcap
+ install -m 644 terminfo $(DEBTREEDIR)/usr/lib/xterm.terminfo
dh_installdocs
dh_installchangelogs
dh_installmenu
@@ -207,30 +141,4 @@ binary-arch: install
.PHONY: binary-indep
binary-indep:
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-.PHONY: patch-audit
-patch-audit: prepare unpatch
- touch stampdir/log/patch; \
- FUZZY=no; \
- while [ -n "`$(QUILT) next`" ]; do \
- RESULT=`$(QUILT) push -v | tee -a stampdir/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/'`;\
- case "$$RESULT" in \
- succeeded) \
- echo "The patch is fuzzy: `$(QUILT) top`"; \
- echo "The patch is fuzzy: `$(QUILT) top`" > stampdir/log/`$(QUILT) top`; \
- FUZZY=yes; \
- ;; \
- FAILED) \
- echo "The patch is broken: `$(QUILT) next`"; \
- echo "The patch is fuzzy: `$(QUILT) next`" > stampdir/log/`$(QUILT) next`; \
- exit 1; \
- ;; \
- esac; \
- done; \
- if [ $$FUZZY = "yes" ]; then \
- echo "There were fuzzy patches. Please Fix."; \
- exit 1; \
- fi
-
# vim:set ai noet sw=8 ts=8 tw=0:
diff --git a/debian/xterm.postinst b/debian/xterm.postinst
deleted file mode 100644
index e7eba49..0000000
--- a/debian/xterm.postinst
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Debian xterm package post-installation script
-# Copyright 1998-2001, 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/xterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
- /usr/share/man/man1/xterm.1.gz
-
-update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/uxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
- /usr/share/man/man1/uxterm.1.gz
-
-update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
- /usr/share/man/man1/koi8rxterm.1.gz
-
-update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/lxterm 30 --slave \
- /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
- /usr/share/man/man1/lxterm.1.gz
-
-# in xterm versions from 204-0pre1 to 222-1, the manpage alternative was
-# set incorrectly to x-terminal-emulator.1x.gz. In some cases, this can lead
-# to the absence of the x-terminal-emulator.1.gz symbolic link after the
-# upgrade, so we check for this situation and add it back if necessary.
-# This can be removed after the release of etch.
-if ! [ -L /usr/share/man/man1/x-terminal-emulator.1.gz ]; then
- ln -s /etc/alternatives/x-terminal-emulator.1.gz /usr/share/man/man1
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xterm.postinst.in b/debian/xterm.postinst.in
new file mode 100644
index 0000000..3adfcbd
--- /dev/null
+++ b/debian/xterm.postinst.in
@@ -0,0 +1,50 @@
+#!/bin/sh
+# Debian xterm package post-installation script
+# Copyright 1998-2001, 2003, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xterm
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/bin/xterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/xterm.1.gz
+
+update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/bin/uxterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/uxterm.1.gz
+
+update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/koi8rxterm.1.gz
+
+update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/bin/lxterm 30 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/lxterm.1.gz
+
+# in xterm versions from 204-0pre1 to 222-1, the manpage alternative was
+# set incorrectly to x-terminal-emulator.1x.gz. In some cases, this can lead
+# to the absence of the x-terminal-emulator.1.gz symbolic link after the
+# upgrade, so we check for this situation and add it back if necessary.
+# This can be removed after the release of etch.
+if ! [ -L /usr/share/man/man1/x-terminal-emulator.1.gz ]; then
+ ln -s /etc/alternatives/x-terminal-emulator.1.gz /usr/share/man/man1
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xterm.preinst b/debian/xterm.preinst
deleted file mode 100644
index 4494822..0000000
--- a/debian/xterm.preinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Debian xterm package pre-installation script
-# Copyright 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
- if dpkg --compare-versions "$2" lt "4.0.1-1"; then
- # Clean up after older alternative that used different path.
- if update-alternatives --display x-terminal-emulator |
- fgrep -q /usr/bin/X11/xterm; then
- update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
- fi
- fi
-
- if dpkg --compare-versions "$2" lt "204"; then
- # Clean up after older alternative that used different path.
- if update-alternatives --display x-terminal-emulator |
- fgrep -q /usr/X11R6/bin/xterm; then
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/koi8rxterm
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/uxterm
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/xterm
- update-alternatives --remove x-terminal-emulator \
- /usr/X11R6/bin/lxterm
- fi
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xterm.preinst.in b/debian/xterm.preinst.in
new file mode 100644
index 0000000..5ae3e8a
--- /dev/null
+++ b/debian/xterm.preinst.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Debian xterm package pre-installation script
+# Copyright 2003, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xterm
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+ if dpkg --compare-versions "$2" lt "4.0.1-1"; then
+ # Clean up after older alternative that used different path.
+ if update-alternatives --display x-terminal-emulator |
+ fgrep -q /usr/bin/X11/xterm; then
+ update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
+ fi
+ fi
+
+ if dpkg --compare-versions "$2" lt "204"; then
+ # Clean up after older alternative that used different path.
+ if update-alternatives --display x-terminal-emulator |
+ fgrep -q /usr/X11R6/bin/xterm; then
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/koi8rxterm
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/uxterm
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/xterm
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/lxterm
+ fi
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xterm.prerm b/debian/xterm.prerm
deleted file mode 100644
index 5963a23..0000000
--- a/debian/xterm.prerm
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Debian xterm package pre-removal script
-# Copyright 1998, 1999, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
- update-alternatives --remove x-terminal-emulator /usr/bin/koi8rxterm
- update-alternatives --remove x-terminal-emulator /usr/bin/uxterm
- update-alternatives --remove x-terminal-emulator /usr/bin/xterm
- update-alternatives --remove x-terminal-emulator /usr/bin/lxterm
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xterm.prerm.in b/debian/xterm.prerm.in
new file mode 100644
index 0000000..29f54e0
--- /dev/null
+++ b/debian/xterm.prerm.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Debian xterm package pre-removal script
+# Copyright 1998, 1999, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xterm
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+ update-alternatives --remove x-terminal-emulator /usr/bin/koi8rxterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/uxterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/xterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/lxterm
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=4 ts=4 tw=80:
Reply to: