xinit: Changes to 'debian-unstable'
debian/changelog | 1 +
debian/rules | 1 +
debian/xinit.install | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5a23c90de3b0c602eb42d04bbbdfb7838352bde3
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 5 19:53:48 2010 +0200
Fix xinit.install for --with-xinitdir change
diff --git a/debian/xinit.install b/debian/xinit.install
index ac0f952..5cc7644 100644
--- a/debian/xinit.install
+++ b/debian/xinit.install
@@ -1,4 +1,4 @@
usr/bin/*
usr/share/man/man1/*
-usr/lib/X11/xinit/xinitrc etc/X11/xinit
+etc/X11/xinit/xinitrc
etc/X11/xinit/xserverrc
commit 56e7b7a821a8ab26eec2a2f20d55feeb14f637f5
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 5 19:51:57 2010 +0200
Pass --with-xterm=/usr/bin/xterm to configure (closes: #557138).
Otherwise we call 'xinit xterm foo', which doesn't work.
diff --git a/debian/changelog b/debian/changelog
index 6ac1924..499ce6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xinit (1.2.0-2) UNRELEASED; urgency=low
(closes: #526843).
* Drop 05_use_bash.diff. This was working around a bashism fixed 4 years
ago.
+ * Pass --with-xterm=/usr/bin/xterm to configure (closes: #557138).
[ Sven Joachim ]
* Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option
diff --git a/debian/rules b/debian/rules
index fa60525..44b4151 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-xinitdir=/etc/X11/xinit \
+ --with-xterm=/usr/bin/xterm \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE) || exit 1
>$@
Reply to: