xorg: Changes to 'debian-experimental'
debian/changelog | 8 ++
debian/control | 2
debian/local/dexconf | 5 -
debian/rules | 5 -
debian/scripts/vars.amd64 | 2
debian/scripts/vars.hppa | 2
debian/scripts/vars.i386 | 3
debian/scripts/vars.ia64 | 3
debian/xserver-xorg.postinst.in | 126 +---------------------------------------
debian/xserver-xorg.templates | 10 ---
10 files changed, 14 insertions(+), 152 deletions(-)
New commits:
commit 363e6cd7cc151d302bfaa224b35e5eadb6e8a77b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 9 15:12:12 2009 +0100
Drop Recommends on hw detection programs
We don't use dmidecode and fbset anymore (they were used for hardware
detection), so stop adding Recommends on them.
diff --git a/debian/changelog b/debian/changelog
index 0844a4e..43449ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* As a result of the previous change, remove the
xserver-xorg/config/device/driver debconf template, and unregister it on
upgrade.
+ * We don't use dmidecode and fbset anymore (they were used for hardware
+ detection), so stop adding Recommends on them.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/control b/debian/control
index 6744b56..65aabef 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Depends:
${misc:Depends},
xkb-data (>= 1.4),
x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
+Recommends: libgl1-mesa-dri, udev
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/rules b/debian/rules
index b6595c8..ec81418 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,6 @@ endif
# debhelper
export DH_OPTIONS
-# Default list of detection packages
-XSERVER_XORG_DETECT_DEPENDS = ""
-
include debian/xsfbs/xsfbs.mk
# Get package version info.
@@ -99,7 +96,7 @@ binary-indep: build install
chown root:root debian/x11-common/etc/X11/Xsession
chmod 755 debian/x11-common/etc/X11/Xsession
dh_installdeb
- dh_gencontrol -- -VF:XServer-Xorg-Detect-Depends=$(XSERVER_XORG_DETECT_DEPENDS)
+ dh_gencontrol
dh_md5sums
dh_builddeb
touch stamp-$@
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index b5d11a9..e14e7f1 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -35,5 +35,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
-
-XSERVER_XORG_DETECT_DEPENDS="dmidecode"
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index e98103d..10a92a5 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -20,5 +20,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
-
-XSERVER_XORG_DETECT_DEPENDS="fbset"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 56af7e0..791c6c6 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -37,6 +37,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
-
-XSERVER_XORG_DETECT_DEPENDS="dmidecode"
-
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 327f885..8afff0b 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -30,6 +30,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
-
-XSERVER_XORG_DETECT_DEPENDS="dmidecode"
-
commit e5536fd8b24a835866ba81e1b27ea30bc563d8d4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 20:00:47 2009 +0100
Stop configuring a driver on sparc
* xserver-xorg.postinst: drop the code to pick a driver on sparc. The
server now autoconfigures sbus devices.
* As a result of the previous change, remove the
xserver-xorg/config/device/driver debconf template, and unregister it on
upgrade.
diff --git a/debian/changelog b/debian/changelog
index a7adc76..0844a4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,11 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* xserver-xorg.postinst: drop duplicate definitions of the debug_echo and
validate_string_db_input shell functions.
* dexconf: don't try to get the driver from debconf.
+ * xserver-xorg.postinst: drop the code to pick a driver on sparc. The
+ server now autoconfigures sbus devices.
+ * As a result of the previous change, remove the
+ xserver-xorg/config/device/driver debconf template, and unregister it on
+ upgrade.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 7b540b7..484e4ec 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -51,10 +51,6 @@ XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum"
XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.roster"
THIS_SERVER=/usr/bin/Xorg
-NCARDS=0
-NSERVERS=0
-NDRIVERS=0
-DRIVERS_LIST=
MULTIHEAD=
# get machine architecture
@@ -65,89 +61,6 @@ debug_report_status () {
debug_echo "$1 exited with status $2"
}
-discover_sparc_video () {
- # Detect video cards on sparc by parsing prtconf output
- prtconf -p -v | awk '
- BEGIN {
- display_node = 0;
- model = "";
- name = "";
- }
- /Node/ {
- if(display_node == 1) {
- printf "model=\"%s\" name=\"%s\"\n", model, name
- display_node = 0;
- };
- model = "";
- name = ""
- }
- /device_type:/ {
- if(index($2, "display") != 0) {
- display_node = 1
- }
- }
- /model:/ { l=length($2); model = substr($2, 2, l-2) }
- /name:/ { l=length($2); name = substr($2, 2, l-2) }
- END{
- if(display_node == 1) {
- printf "model=\"%s\" name=\"%s\"\n", model, name
- };
- }' | \
- while read line
- do
- eval "${line}"
-# Match the name and the model to the driver.
- test -z "${name}" && continue
-# The model stored in the prom is usually not too
-# informative, so that we need to provide some
-# sensible human-readable card identification as well.
- server='XFree86'
- case "${name}" in
- 'cgsix' )
- card='Sun CG6 framebuffer'
- driver='suncg6'
- ;;
- 'SUNW,sx' )
- card='Sun CG14 framebuffer'
- driver='suncg14'
- ;;
- 'SUNW,leo' )
- card='Sun LEO framebuffer'
- driver='sunleo'
- ;;
- 'SUNW,tcx' )
- card='Sun TCX framebuffer'
- driver='suntcx'
- ;;
- 'SUNW,m64B' )
- card='ATI Technologies 3D Rage Pro or similar'
- driver='ati'
- ;;
- 'SUNW,ffb' )
- card='Sun Creator3D framebuffer or similar'
- driver='sunffb'
- ;;
- 'SUNW,afb' )
- card='Sun Elite3D framebuffer or similar'
- driver='sunffb'
- ;;
- 'TSI,gfxp' )
- card='PGX32 framebuffer or similar'
- driver='glint'
- ;;
- * )
- card='Unknown'
- server='unknown'
- driver='unknown'
- ;;
- esac
- if [ -n "${model}" ]; then
- card="${card} (${model})"
- fi
- printf "${card}\t${server}\t${driver}\n"
- done
-}
-
validate_string_db_input () {
# Syntax: validate_string_db_input priority template
#
@@ -463,41 +376,6 @@ fi
debug_echo "Configuring $THIS_PACKAGE."
-# collect information about installed video card(s), if possible
-if [ "$ARCH" = "sparc" ]; then
- DISCOVER_PROG='prtconf'
- DISCOVER_FUNC='discover_sparc_video'
-
- if which $DISCOVER_PROG > /dev/null 2>&1; then
- DISCOVERED_VIDEO=$($DISCOVER_FUNC)
- MULTIHEAD=$(echo "$DISCOVERED_VIDEO" | wc -l)
- if [ -n "$DISCOVERED_VIDEO" ]; then
- NCARDS=$(echo "$DISCOVERED_VIDEO" | wc -l)
- SERVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $2}' | grep -v unknown | sort | uniq)
- if [ -n "$SERVERS" ]; then
- NSERVERS=$(echo "$SERVERS" | wc -l)
- fi
- DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' | grep -v unknown | sort | uniq)
- if [ -n "$DRIVERS" ]; then
- NDRIVERS=$(echo "$DRIVERS" | wc -l)
- DRIVERS_LIST=$(echo "$DRIVERS" | awk 'BEGIN {ORS="";FS="\t"} {if(NR > 1){print last ","};last=$0} END {print last}')
- fi
- if [ $MULTIHEAD -gt 1 ]; then
- MULTIHEAD=yes
- fi
- DISCOVERED_VIDEO=$(echo "$DRIVERS" | head -n 1)
- else
- DISCOVERED_VIDEO=""
- fi
- else
- DISCOVERED_VIDEO=""
- fi
-else
- DISCOVERED_VIDEO=""
-fi
-db_subst xserver-xorg/config/device/driver choices "$DRIVERS_LIST"
-auto_answer db_input low xserver-xorg/config/device/driver "$DISCOVERED_VIDEO"
-
if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# BusID
PRIORITY=low
@@ -867,6 +745,10 @@ if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
done
fi
+if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" lt 1:7.4+6; then
+ db_unregister xserver-xorg/config/device/driver || true
+fi
+
# no debconf interaction should be done after this point
# (the dexconf call below invokes db_stop)
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 098824e..6701c29 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -4,16 +4,6 @@
# Please consider interacting with the team if you intend
# to modify the templates or add new templates
-Template: xserver-xorg/config/device/driver
-Type: select
-Choices: ${choices}
-_Description: X server driver:
- For the X Window System graphical user interface to operate correctly, it is
- necessary to select a video card driver for the X server.
- .
- Drivers are typically named for the video card or chipset manufacturer, or
- for a specific model or family of chipsets.
-
Template: xserver-xorg/config/device/use_fbdev
Type: boolean
_Description: Use kernel framebuffer device interface?
commit a48b60ae436667941dda0d68efe98f43ba30ffb9
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 20:02:19 2009 +0100
dexconf: don't try to get the driver from debconf.
The driver should be auto-detected by the server.
diff --git a/debian/changelog b/debian/changelog
index f1b6347..a7adc76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
xorg.conf. Use the C locale to make sure this works as expected.
* xserver-xorg.postinst: drop duplicate definitions of the debug_echo and
validate_string_db_input shell functions.
+ * dexconf: don't try to get the driver from debconf.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 9f2f258..1552a4b 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -218,8 +218,6 @@ SECTION
### DEVICE
-db_get xserver-$SERVER/config/device/driver
-DEVICE_DRIVER="$RET"
db_get xserver-$SERVER/config/device/bus_id
DEVICE_BUSID="$RET"
db_get xserver-$SERVER/config/device/use_fbdev
@@ -229,9 +227,6 @@ cat >&4 <<SECTION
Section "Device"
Identifier "Configured Video Device"
SECTION
-if [ -n "$DEVICE_DRIVER" ]; then
- printf "\tDriver\t\t\"$DEVICE_DRIVER\"\n" >&4
-fi
if [ -n "$DEVICE_BUSID" ]; then
printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >&4
fi
Reply to: