debian/changelog | 6 ++++++
debian/rules | 5 ++++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit fad1ef84b49bf683a133de67feddd90f6282bde0
Author: Samuel Thibault <sthiba...@debian.org>
Date: Sat Jun 12 14:18:04 2010 +0200
Remove vt7 option on hurd-i386
hurd-i386 doesn't (yet) have vt switching, so the vt7 option makes xdm
fail to start
diff --git a/debian/changelog b/debian/changelog
index c7d75df..d429cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xdm (1:1.1.10-3) UNRELEASED; urgency=low
+
+ * Remove vt7 option on hurd-i386 (closes: #584829).
+
+ -- Samuel Thibault <sthiba...@debian.org> Sat, 12 Jun 2010 14:17:26 +0200
+
xdm (1:1.1.10-2) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 1e7e376..57b33e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ confflags += --with-pam \
--with-xdmconfigdir=/etc/X11/xdm \
--with-xdmscriptdir=\$${xdmconfigdir} \
--with-authdir=/var/lib/xdm \
- --with-default-vt=vt7 \
--with-pixmapdir=/usr/share/X11/xdm/pixmaps \
--with-color-pixmap=debian.xpm \
--with-bw-pixmap=debianbw.xpm \
@@ -51,6 +50,10 @@ ifeq ($(DEB_BUILD_ARCH_OS), linux)
confflags += --with-selinux
endif
+ifneq ($(DEB_BUILD_ARCH_OS), hurd)
+ confflags += --with-default-vt=vt7
+endif
+
BUILD_DIR := build
stampdir_targets+=config
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1onpgr-00038k...@alioth.debian.org
