xorg: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/control | 4 ++--
debian/local/dexconf | 17 +++++++----------
3 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit 98819298107a43d95ae18b99e947d94f877b746c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 6 09:43:34 2007 +0100
dexconf: Use xorg.conf/xserver-xorg instead of $REALCONFIG/$XSERVERPKG.
Thanks, Timo Aaltonen!
diff --git a/debian/changelog b/debian/changelog
index 61a212a..41c6c71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
* Make xorg Architecture: any. Depend on sparc-utils [sparc] instead of
sparc-utils | not+sparc.
+ * dexconf: Use xorg.conf/xserver-xorg instead of $REALCONFIG/$XSERVERPKG.
+ Thanks, Timo Aaltonen!
- -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 09:15:27 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 09:42:42 +0100
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 25d20a8..f93c654 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -55,10 +55,7 @@ fetch () {
if [ -z "$RET" ]; then
ERRMSG="cannot generate configuration file; $1 not set. Aborting."
ERRMSG="$ERRMSG Reconfigure the X server with \"dpkg-reconfigure"
- if [ -n "$XSERVERPKG" ]; then
- ERRMSG="$ERRMSG $XSERVERPKG"
- fi
- ERRMSG="$ERRMSG\" to correct this problem."
+ ERRMSG="$ERRMSG xserver-xorg\" to correct this problem."
bomb "$ERRMSG"
fi
}
@@ -160,21 +157,21 @@ fi
exec 4>"$DEXCONFTMPDIR/Header"
cat >&4 <<SECTION
-# $REALCONFIG ($SERVER X Window System server configuration file)
+# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
-# Edit this file with caution, and see the $REALCONFIG manual page.
-# (Type "man $REALCONFIG" at the shell prompt.)
+# Edit this file with caution, and see the xorg.conf manual page.
+# (Type "man xorg.conf" at the shell prompt.)
#
-# This file is automatically updated on $XSERVERPKG package upgrades *only*
-# if it has not been modified since the last upgrade of the $XSERVERPKG
+# This file is automatically updated on xserver-xorg package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
-# sudo dpkg-reconfigure -phigh $XSERVERPKG
+# sudo dpkg-reconfigure -phigh xserver-xorg
SECTION
### KEYBOARD / INPUTDEVICE
commit fbb17c6c3f67f3978c919d01a7fa0cf2a0cc3d1e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 6 09:18:20 2007 +0100
Make xorg Architecture: any.
Depend on sparc-utils [sparc] instead of sparc-utils | not+sparc.
diff --git a/debian/changelog b/debian/changelog
index dfc3473..61a212a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+8) UNRELEASED; urgency=low
+
+ * Make xorg Architecture: any. Depend on sparc-utils [sparc] instead of
+ sparc-utils | not+sparc.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 09:15:27 +0100
+
xorg (1:7.3+7) unstable; urgency=low
* Don't set driver-specific depths in xserver postinst
diff --git a/debian/control b/debian/control
index 4ae800c..da53109 100644
--- a/debian/control
+++ b/debian/control
@@ -109,8 +109,8 @@ Description: the X.Org X server -- input driver metapackage
to only have certain drivers installed.
Package: xorg
-Architecture: all
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc
+Architecture: any
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils [sparc]
Recommends: xorg-docs
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
Reply to: