xterm: Changes to 'debian-unstable'
debian/README.source | 2 +-
debian/changelog | 12 ++++++++++++
debian/control | 9 +++------
debian/rules | 9 +++------
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
debian/xterm.README.Debian | 6 +++---
debian/xterm.dirs | 4 ----
debian/xterm.docs | 2 +-
8 files changed, 45 insertions(+), 34 deletions(-)
New commits:
commit 8d4dd176b48c4cbd3255fc704ad7bbbe9ca73cf5
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 14:48:25 2010 +0100
Let dh_compress deal with xterm.faq
The comment in debian/rules that dh_compress would not recognize the
file name extension was rather misleading, because dh_compress gzips
everything except for a few known extensions.
diff --git a/debian/changelog b/debian/changelog
index 21025dc..768992c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xterm (266-2) UNRELEASED; urgency=low
* Drop useless debian/xterm.dirs.
* Stop recommending the transitional xutils package.
* Mention ncurses-base in README.Debian (Closes: #373139).
+ * Do not manually gzip the text version of the FAQ, dh_compress can take
+ care of that.
-- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
diff --git a/debian/rules b/debian/rules
index d92b017..2879066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
.PHONY: build
build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq.gz
+$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq
dh_testdir
cd build && $(MAKE)
touch $@
@@ -83,7 +83,7 @@ clean: xsfclean
dh_testroot
rm -rf $(STAMP_DIR)
rm -rf build
- dh_clean debian/local/xterm.faq.gz
+ dh_clean debian/local/xterm.faq
.PHONY: install
install: build
@@ -108,11 +108,8 @@ install: build
dh_install --sourcedir=debian/tmp --list-missing
# Generate plain text XTerm FAQ from HTML.
-debian/local/xterm.faq.gz: debian/local/xterm.faq.html
+debian/local/xterm.faq: debian/local/xterm.faq.html
$(HTML2TEXT) $< >debian/local/xterm.faq
- # dh_compress doesn't recognize this file extension, so we must
- # compress it manually.
- gzip -9f debian/local/xterm.faq
.PHONY: binary
binary: binary-arch
diff --git a/debian/xterm.docs b/debian/xterm.docs
index a4b2c19..4e67b55 100644
--- a/debian/xterm.docs
+++ b/debian/xterm.docs
@@ -3,6 +3,6 @@ ctlseqs.ms
ctlseqs.txt
xterm.log.html
debian/local/xterm.faq.html
-debian/local/xterm.faq.gz
+debian/local/xterm.faq
debian/tmp/usr/lib/xterm.termcap
debian/tmp/usr/lib/xterm.terminfo
commit c611342d649a26c5072155320125d104d66264f3
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 14:06:01 2010 +0100
Mention ncurses-base in README.Debian
diff --git a/debian/changelog b/debian/changelog
index d083479..21025dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xterm (266-2) UNRELEASED; urgency=low
* Update xsfbs.
* Drop useless debian/xterm.dirs.
* Stop recommending the transitional xutils package.
+ * Mention ncurses-base in README.Debian (Closes: #373139).
-- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
diff --git a/debian/xterm.README.Debian b/debian/xterm.README.Debian
index df8ea6b..d37ab86 100644
--- a/debian/xterm.README.Debian
+++ b/debian/xterm.README.Debian
@@ -17,9 +17,9 @@ numeric keypad, the one with Page Up, Page Down, etc. on a PC keyboard).
DEC VT100's, the text terminal wich xterm was designed to emulate, had no
keypad delete key. ^[[3~ is also what the Linux console terminal type
generates for the keypad delete key. Note that the terminal definitions
-that a Debian system uses are in the ncurses-term package, not in the xterm
-package itself, though the (pre-compiled) terminfo and termcap files that
-Debian uses may be found in the xterm documentation directory,
+that a Debian system uses are in the ncurses-base and ncurses-term
+packages, not in the xterm package itself, though the terminfo and termcap
+files that Debian uses may be found in the xterm documentation directory,
/usr/share/doc/xterm. People interested in reading further to stock up
ammo for their backspace/delete and terminal type wars should consult Tom
Dickey's (current maintainer of the xterm source code) FAQ, available in
commit a9b17443ca7dc3869f39a6eb685798d93bafef06
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 13:43:09 2010 +0100
Drop OR'ed recommendation on xutils
It has been a transitional package since Lenny.
diff --git a/debian/changelog b/debian/changelog
index 0aa96e3..d083479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (266-2) UNRELEASED; urgency=low
* Prefer lynx-cur over lynx in Build-Depends.
* Update xsfbs.
* Drop useless debian/xterm.dirs.
+ * Stop recommending the transitional xutils package.
-- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
diff --git a/debian/control b/debian/control
index de1449c..eddd9af 100644
--- a/debian/control
+++ b/debian/control
@@ -107,7 +107,7 @@ Depends:
xbitmaps,
${shlibs:Depends},
${misc:Depends},
-Recommends: x11-utils | xutils
+Recommends: x11-utils
Suggests: xfonts-cyrillic
Provides: x-terminal-emulator
Description: X terminal emulator
commit 5cf2761023fd0cae5558bc83bff6a58e1ce269f6
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 13:37:42 2010 +0100
Drop xterm.dirs
Since debhelper is smart enough to include non-empty directories and
we don't need any empty ones, this file is entirely superfluous.
diff --git a/debian/changelog b/debian/changelog
index 9dd7ce3..0aa96e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (266-2) UNRELEASED; urgency=low
* Prefer lynx-cur over lynx in Build-Depends.
* Update xsfbs.
+ * Drop useless debian/xterm.dirs.
-- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
diff --git a/debian/xterm.dirs b/debian/xterm.dirs
deleted file mode 100644
index 8961a4e..0000000
--- a/debian/xterm.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/man/man1
-etc/X11/app-defaults
-usr/share/lintian/overrides
commit dff8b720cd35c947de1ce4d3e507105fd095c6bf
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 13:05:29 2010 +0100
debian/control: Remove obsolete comment about dpkg-dev
diff --git a/debian/control b/debian/control
index 41c25b2..de1449c 100644
--- a/debian/control
+++ b/debian/control
@@ -98,9 +98,6 @@ Build-Depends:
# xorg-docs-core provides X(7) which minstall.sh tries to
# detect
# 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
# quilt patch management system
# lynx-cur | lynx generates plain-text version of Debian X FAQ
commit 0912a9cfebe39f66e0ff8a38bde732324b5c05ee
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 13:02:47 2010 +0100
Prefer lynx-cur over lynx as build dependency
diff --git a/debian/changelog b/debian/changelog
index bac1dcd..9dd7ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xterm (266-2) UNRELEASED; urgency=low
+ * Prefer lynx-cur over lynx in Build-Depends.
* Update xsfbs.
-- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
diff --git a/debian/control b/debian/control
index e31daf0..41c25b2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
libutempter-dev,
debhelper (>= 5),
quilt,
- lynx,
+ lynx-cur | lynx,
xorg-docs-core,
# Reasons for Build-Depends:
@@ -102,7 +102,7 @@ Build-Depends:
# (1.10.14) architecture-specific binary
# package dependencies
# quilt patch management system
-# lynx generates plain-text version of Debian X FAQ
+# lynx-cur | lynx generates plain-text version of Debian X FAQ
Package: xterm
Architecture: any
commit c1c23fe6eeb5cdf5316119d9cbc7b2ba5e9827b8
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 20 13:16:48 2010 +0100
debian/changelog entry for xsfbs update
Needed commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff to avoid
useless rebuilds in binary-arch target.
diff --git a/debian/changelog b/debian/changelog
index 01328b7..bac1dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (266-2) UNRELEASED; urgency=low
+
+ * Update xsfbs.
+
+ -- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
+
xterm (266-1) unstable; urgency=low
* New upstream release (Closes: #601103, yay for patience…):
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
Reply to: