xorg: Changes to 'debian-unstable'
debian/changelog | 10 +++++++++-
debian/control | 2 +-
debian/local/dexconf | 35 -----------------------------------
debian/xserver-xorg.templates | 12 ------------
4 files changed, 10 insertions(+), 49 deletions(-)
New commits:
commit cee3cbec372517e5ec6fc4a8686062fea580bcea
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 24 19:26:48 2007 +0200
dexconf: don't generate two mouse sections.
Touchpads will be handled through input-hotplug.
diff --git a/debian/changelog b/debian/changelog
index c348b85..2da4fcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,8 +40,10 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
* debian/control: xserver-xorg depends on x11-common >= 1:7.3+3 for the
above change.
* debian/xserver-xorg.templates: drop the default-x-server question.
+ * dexconf: don't generate two mouse sections. Touchpads will be handled
+ through input-hotplug.
- -- Julien Cristau <jcristau@debian.org> Wed, 24 Oct 2007 14:23:34 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 24 Oct 2007 19:25:59 +0200
xorg (1:7.3+2) unstable; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 02dd271..7768718 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -105,13 +105,6 @@ if [ -n "$EARLYEXIT" ]; then
exit 0
fi
-
-if which laptop-detect >/dev/null 2>&1; then
- if laptop-detect > /dev/null ; then
- LAPTOP=true
- fi
-fi
-
DEXCONFTMPDIR=
trap 'if [ -e "$DEXCONFTMPDIR/backup" ] && [ -n "$XF86CONFIG" ]; then \
@@ -257,7 +250,6 @@ cat >&4 <<SECTION
Section "InputDevice"
Identifier "Configured Mouse"
Driver "mouse"
- Option "CorePointer"
Option "Device" "$MOUSE_PORT"
Option "Protocol" "$MOUSE_PROTOCOL"
SECTION
@@ -266,20 +258,6 @@ if [ -n "$DO_EMULATE3BUTTONS" ]; then
fi
printf "EndSection\n" >&4
-if [ -n "$LAPTOP" ]; then
- cat >&4 <<SECTION
-
-Section "InputDevice"
- Identifier "Synaptics Touchpad"
- Driver "synaptics"
- Option "SendCoreEvents" "true"
- Option "Device" "/dev/psaux"
- Option "Protocol" "auto-dev"
- Option "HorizEdgeScroll" "0"
-EndSection
-SECTION
-fi
-
### DEVICE
fetch xserver-$SERVER/config/device/identifier
commit 16fcb9494635b7505226558e095026711dbb173b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 24 14:23:57 2007 +0200
Fix the shared/default-x-server mess (bug #443004)
* dexconf: don't use the shared/default-x-server template (closes: #443004).
* debian/control: xserver-xorg depends on x11-common >= 1:7.3+3 for the
above change.
* debian/xserver-xorg.templates: drop the default-x-server question.
diff --git a/debian/changelog b/debian/changelog
index 99b324e..c348b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,7 +35,13 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
* dexconf: Fix problem preventing touchpad scrolling from being able to be
enabled by switching HorizEdgeDelta for HorizEdgeScroll.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Mon, 22 Oct 2007 01:15:09 +0300
+ [ Julien Cristau ]
+ * dexconf: don't use the shared/default-x-server template (closes: #443004).
+ * debian/control: xserver-xorg depends on x11-common >= 1:7.3+3 for the
+ above change.
+ * debian/xserver-xorg.templates: drop the default-x-server question.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 24 Oct 2007 14:23:34 +0200
xorg (1:7.3+2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3dfeae9..7f2a6ed 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Package: xserver-xorg
Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
-Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
+Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4), xserver-xorg-video-all | xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
Recommends: libgl1-mesa-dri, laptop-detect, xresprobe, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 968957e..02dd271 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -121,19 +121,6 @@ trap 'if [ -e "$DEXCONFTMPDIR/backup" ] && [ -n "$XF86CONFIG" ]; then \
rm -rf "$DEXCONFTMPDIR"; \
bomb "received signal; aborting"' HUP INT QUIT TERM
-# Ensure we know how to write a configuation file for the X server in use.
-fetch shared/default-x-server
-XSERVERPKG="$RET"
-case "$XSERVERPKG" in
- xserver-xorg|xserver-xorg-dbg|xserver-xorg-core)
- : ${XF86CONFIG:=/etc/X11/xorg.conf}
- REALCONFIG="xorg.conf"
- SERVER="xorg"
- ;;
- *)
- bomb "this program does not know how to configure the \"$XSERVERPKG\" X" \
- "server"
-esac
# Set up a temporary directory for the files we'll be writing.
TDIR_PARENT="${TMPDIR:-/tmp}"
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 03d6f55..a6e51f4 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -52,18 +52,6 @@ _Description: Multiple potential default X servers for your hardware
however, the X server configuration files can be edited later to support a
multi-head configuration.
-Template: shared/default-x-server
-Type: select
-Choices: ${choices}
-_Description: Desired default X server:
- The X server is the hardware interface of the X Window System. It
- communicates with the video display and input devices, providing a foundation for
- the chosen Graphical User Interface (GUI).
- .
- Several X servers may be available; the default is selected via the
- /etc/X11/X symbolic link. Some X servers may not work with some particular
- graphics hardware.
-
Template: xserver-xorg/config/write_files_section
Type: boolean
Default: false
Reply to: