xorg: Changes to 'debian-unstable'
debian/changelog | 38 +++++++++
debian/control | 36 ++++++++-
debian/rules | 6 -
debian/xserver-xorg.postinst.in | 154 +++++++++++++---------------------------
debian/xsfbs/xsfbs.sh | 7 -
5 files changed, 122 insertions(+), 119 deletions(-)
New commits:
commit 1447ae39da5cfc2b4f983aed9526a068cd46ddee
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 16:24:03 2007 -0400
* Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e3d71bb..5ad2fc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.3+2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 16:23:45 -0400
+
xorg (1:7.3+1) experimental; urgency=low
[ Brice Goglin ]
commit 4c78709f4ca4afa4a2e9e7af279e7add7fae1e13
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 10 16:49:09 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 36ebc14..e3d71bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+1) UNRELEASED; urgency=low
+xorg (1:7.3+1) experimental; urgency=low
[ Brice Goglin ]
* Use laptop-detect in our postinst code instead of requiring xsfbs
@@ -7,7 +7,7 @@ xorg (1:7.3+1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Bump video and input ABIs to 2 for xserver 1.4.
- -- Julien Cristau <jcristau@debian.org> Thu, 06 Sep 2007 18:56:49 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 10 Sep 2007 16:45:38 +0200
xorg (1:7.3~rc1) experimental; urgency=low
commit 7188562edcbece4f76f46da78b6b438bd1fd73c6
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 6 18:57:39 2007 +0200
Bump video and input ABIs for xserver 1.4.
diff --git a/debian/changelog b/debian/changelog
index 48ddcb4..36ebc14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xorg (1:7.3~rc2) UNRELEASED; urgency=low
+xorg (1:7.3+1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Use laptop-detect in our postinst code instead of requiring xsfbs
to call it in all maintainer scripts of many packages.
- -- Brice Goglin <bgoglin@debian.org> Wed, 29 Aug 2007 09:41:50 +0200
+ [ Julien Cristau ]
+ * Bump video and input ABIs to 2 for xserver 1.4.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Sep 2007 18:56:49 +0200
xorg (1:7.3~rc1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 07df310..3dfeae9 100644
--- a/debian/control
+++ b/debian/control
@@ -82,15 +82,13 @@ Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core (>= 2:1.3.99.0), xserver-xorg-video-all | xserver-xorg-video-1.9, xserver-xorg-input-all | xserver-xorg-input-0.9, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+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
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
xorg.conf. It does not provide the actual server itself, but removing it
is strongly discouraged.
-# versioned dependency on xserver-xorg-core needed because xserver-xorg
-# contains a patch to allow in-server module defaults in 2:1.2.99.905-3
Package: xserver-xorg-video-all
Architecture: any
commit d32b4dbb61ffaca1f6a9eaa2c88bf1b5ae547005
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:43:26 2007 +0200
Use laptop-detect in our postinst code instead of requiring xsfbs to call it
diff --git a/debian/changelog b/debian/changelog
index 7dbd466..48ddcb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3~rc2) UNRELEASED; urgency=low
+
+ * Use laptop-detect in our postinst code instead of requiring xsfbs
+ to call it in all maintainer scripts of many packages.
+
+ -- Brice Goglin <bgoglin@debian.org> Wed, 29 Aug 2007 09:41:50 +0200
+
xorg (1:7.3~rc1) experimental; urgency=low
* Bump driver ABI for xserver 1.3.99.0.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index b9fdea4..887f76c 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -14,6 +14,13 @@ set -e
THIS_PACKAGE=xserver-xorg
THIS_SCRIPT=postinst
+LAPTOP=""
+if [ -n "$(which laptop-detect)" ]; then
+ if laptop-detect >/dev/null; then
+ LAPTOP=true
+ fi
+fi
+
#INCLUDE_SHELL_LIB#
if [ -e /etc/default/xorg ]; then
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 9db1cd098522055e86015320595618281f099452
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 18 20:10:35 2007 +0200
Bump driver ABI in xserver-xorg's Depends.
Also stop Recommending the -all driver packages in xserver-xorg.
The Depends on xserver-xorg-*-all | xserver-xorg-*-${abi} should be enough.
diff --git a/debian/changelog b/debian/changelog
index fff1b0b..7dbd466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3~rc1) experimental; urgency=low
+
+ * Bump driver ABI for xserver 1.3.99.0.
+ * xserver-xorg doesn't recommend the drivers anymore, the Depends should be
+ enough.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 18 Aug 2007 20:08:31 +0200
+
xorg (1:7.2.ds3-1) experimental; urgency=low
* Add xutils and xbase-clients transitional packages
diff --git a/debian/control b/debian/control
index 84663a3..07df310 100644
--- a/debian/control
+++ b/debian/control
@@ -82,8 +82,8 @@ Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core (>= 2:1.3.0.0.dfsg-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: xserver-xorg-video-all, xserver-xorg-input-all, libgl1-mesa-dri, laptop-detect, xresprobe, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
+Depends: xserver-xorg-core (>= 2:1.3.99.0), xserver-xorg-video-all | xserver-xorg-video-1.9, xserver-xorg-input-all | xserver-xorg-input-0.9, ${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
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
commit b80a65f26c2c67c21ae043ee696534d2908d9803
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 27 00:42:25 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index c9b7e15..5beac75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
+xorg (1:7.2.ds3-1) experimental; urgency=low
* Add xutils and xbase-clients transitional packages
+ xbase-clients is now split (closes: #151613).
@@ -9,7 +9,7 @@ xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
* xserver-xorg.postinst: drop code to detect the X server; we haven't had
more than one since XFree86 4.0.
- -- Julien Cristau <jcristau@debian.org> Wed, 25 Jul 2007 06:09:22 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 26 Jul 2007 19:16:00 +0200
xorg (1:7.2-6) UNRELEASED; urgency=low
commit bd5728bdad706a33f1ee99bb3a8f9193bb89ca7d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 25 06:12:44 2007 +0200
xserver-xorg.postinst: drop code to detect the X server.
Since XFree86 4.0, everyone uses the same server, so there's no point
in keeping that code.
diff --git a/debian/changelog b/debian/changelog
index 43e4b3b..c9b7e15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
* Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
version.
* Remove unused code from debian/rules.
+ * xserver-xorg.postinst: drop code to detect the X server; we haven't had
+ more than one since XFree86 4.0.
- -- Julien Cristau <jcristau@debian.org> Fri, 20 Jul 2007 18:52:45 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 25 Jul 2007 06:09:22 +0200
xorg (1:7.2-6) UNRELEASED; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index a2eb7c1..b9fdea4 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -92,7 +92,7 @@ validate_monitor_frequency_expr () {
# syntax: validate_monitor_frequency_expr expression
#
# Confirm that the given expression is a valid monitor frequency expression
- # per XF86Config-4(5x). Note that this does *not* handle (comma-delimited)
+ # per xorg.conf(5). Note that this does *not* handle (comma-delimited)
# tuples. We expect a single value or range with an optional unit suffix.
#
# Note: We don't check to see if the latter value in a range is actually
@@ -151,7 +151,7 @@ validate_monitor_frequency_db_input () {
# do. We force the first character to be a number to avoid hideous problems
# in the debconf dialog frontend in 0.3.83 (it needs to be one anyway). We
# need to handle multiple expressions, delimited by commas. See
- # XF86Config-4(5x) for more information.
+ # xorg.conf(5) for more information.
if expr "$RET" : ".*,.*" >/dev/null 2>&1; then
_expr_is_valid=true
echo "$RET" | tr -s ',' '\n' | while read _freq_expr; do
@@ -184,14 +184,11 @@ validate_monitor_frequency_db_input () {
CONFIG_DIR="/etc/X11"
CONFIG_AUX_DIR=/var/lib/x11
SERVER_SYMLINK="$CONFIG_DIR/X"
-XF86CONFIG="$CONFIG_DIR/XF86Config-4"
XORGCONFIG="$CONFIG_DIR/xorg.conf"
CONFIG_AUX_DIR="/var/lib/x11"
SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
-XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum"
XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum"
-XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.roster"
THIS_SERVER=/usr/bin/Xorg
@@ -740,11 +737,8 @@ if which $DISCOVER_PROG > /dev/null 2>&1; then
fi
fi
-# set a failsafe default answer for shared/default-x-server
-DEFAULT=$THIS_PACKAGE
-
-if which $DISCOVER_PROG > /dev/null 2>&1; then
- if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
+if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
+ if which $DISCOVER_PROG > /dev/null 2>&1; then
PRIORITY="medium"
if [ -n "$RECONFIGURE" ]; then
PRIORITY="high"
@@ -758,106 +752,53 @@ if which $DISCOVER_PROG > /dev/null 2>&1; then
db_reset xserver-xorg/config/device/$param
done
- if [ $NSERVERS -eq 0 ]; then
- debug_echo "could not autodetect X server: no video card detected," \
- "or no server known for it"
- db_input "$(priority_ceil medium)" shared/no_known_x-server || debug_report_status "db_input $(priority_ceil medium) shared/no_known_x-server" "$?"
- db_go
- elif [ $NSERVERS -eq 1 ]; then
- debug_echo "autodetected X server: $SERVERS"
- if [ "$SERVERS" = "${THIS_SERVER##*/}" ] || [ "$SERVERS" = "XFree86" ]; then
- # the autodetected X server is the only one on the system, and the one
- # we're currently configuring; it's unlikely the user will want to use
- # something else
- PRIORITY=low
- else
- debug_echo "X server autodetected, but does not correspond to this package"
- # we do not set shared/default-x-server here, because the
- # autodetected X server might not be getting installed
- fi
- elif [ $NSERVERS -gt 1 ]; then
- debug_echo "could not autodetect X server: multiple servers for video cards"
- VIDEOCARD_SERVER_REPORT=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t"; printf " %-40s%20s\n .\n", "Detected Video Card", "Suggested X server" } { printf " %-50s%10s\n", $1, $2 } END { printf " .\n" }')
- # can't do this until there is a way to embed newlines into debconf command streams :(
- #db_subst shared/multiple_possible_x-servers detected_cards "$VIDEOCARD_SERVER_REPORT"
- debug_echo "$VIDEOCARD_SERVER_REPORT"
- db_input "$(priority_ceil high)" shared/multiple_possible_x-servers || debug_report_status "db_input $(priority_ceil high) shared/multiple_possible_x-servers" "$?"
- db_go
+ # priority of xserver-xorg/config/device/driver
+ PRIORITY=medium
+ if [ -n "$RECONFIGURE" ]; then
+ PRIORITY=high
fi
- else
- debug_echo "user declined video card autodetection"
- fi
- else
- debug_echo "upgrading package; not running autodetection script"
- fi
-else
- debug_echo "could not autodetect X server: $DISCOVER_PROG not found"
-fi
-# now the default-x-server question may be asked
-db_fget shared/default-x-server seen
-debug_echo "seen flag of shared/default-x-server is $RET"
-debug_echo "db_input $(priority_ceil $PRIORITY) shared/default-x-server"
-auto_answer db_input $(priority_ceil $PRIORITY) shared/default-x-server "$DEFAULT"
-
-# is this the selected X server?
-db_get shared/default-x-server
-if [ "$RET" != "$THIS_PACKAGE" ]; then
- # nothing else to do in this script
- debug_echo "Skipping further configuration of $THIS_PACKAGE, because it is not the default X server package."
- exit 0
-fi
-
-# priority of xserver-xorg/config/device/driver
-PRIORITY=medium
-if [ -n "$RECONFIGURE" ]; then
- PRIORITY=high
-fi
-
-DRIVER_DIRS="/usr/X11R6/lib/modules/drivers /usr/lib/xorg/modules/drivers"
-for i in $DRIVER_DIRS; do
- if [ -d $i ]; then
- REAL_DRIVER_DIRS="$REAL_DRIVER_DIRS $i "
- fi
-done
+ DRIVER_DIRS="/usr/lib/xorg/modules/drivers"
+ for i in $DRIVER_DIRS; do
+ if [ -d $i ]; then
+ REAL_DRIVER_DIRS="$REAL_DRIVER_DIRS $i "
+ fi
+ done
-if [ -n "$REAL_DRIVER_DIRS" ]; then
- # Build list of available video drivers, omitting the atimisc, r128, and
- # radeon sub-modules (the ati driver knows when and how to load these).
- # v4l is not a display driver, and dummy is for advanced users.
- DRIVER_LIST="$(find $REAL_DRIVER_DIRS -name '*_drv.*' \
- | sed 's|^.*/\([^/]*\)_drv\.[^\._]*|\1|g' \
- | egrep -v '(atimisc|dummy|r128|radeon|v4l)' | sort -u | xargs \
- | sed 's/ /, /g' 2>/dev/null) "
-fi
+ if [ -n "$REAL_DRIVER_DIRS" ]; then
+ # Build list of available video drivers, omitting the atimisc, r128, and
+ # radeon sub-modules (the ati driver knows when and how to load these).
+ # v4l is not a display driver, and dummy is for advanced users.
+ DRIVER_LIST="$(find $REAL_DRIVER_DIRS -name '*_drv.*' \
+ | sed 's|^.*/\([^/]*\)_drv\.[^\._]*|\1|g' \
+ | egrep -v '(atimisc|dummy|r128|radeon|v4l)' | sort -u | xargs \
+ | sed 's/ /, /g' 2>/dev/null) "
+ fi
-# Set a hard-coded module list (if necessary) and default driver module on an
-# architecture-specific basis.
-case "$ARCH" in
- alpha)
- DEFAULT_DRIVER=vga
- ;;
- amd64|hurd-i386|i386)
- DEFAULT_DRIVER=vesa
- ;;
- sparc)
- DEFAULT_DRIVER=sunffb
- ;;
- *)
- DEFAULT_DRIVER=fbdev
- ;;
-esac
+ # Set a hard-coded module list (if necessary) and default driver module on an
+ # architecture-specific basis.
+ case "$ARCH" in
+ alpha)
+ DEFAULT_DRIVER=vga
+ ;;
+ amd64|hurd-i386|i386)
+ DEFAULT_DRIVER=vesa
+ ;;
+ sparc)
+ DEFAULT_DRIVER=sunffb
+ ;;
+ *)
+ DEFAULT_DRIVER=fbdev
+ ;;
+ esac
-if [ -z "$DRIVER_LIST" ]; then
- observe "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
- DRIVER_LIST="$DEFAULT_DRIVER"
-fi
+ if [ -z "$DRIVER_LIST" ]; then
+ observe "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
+ DRIVER_LIST="$DEFAULT_DRIVER"
+ fi
-observe "available video driver list set to \"$DRIVER_LIST\""
+ observe "available video driver list set to \"$DRIVER_LIST\""
-if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
- if which $DISCOVER_PROG >/dev/null 2>&1; then
- if [ "$AUTODETECT_VIDEO_CARD" = "true" ]; then
if [ $NDRIVERS -eq 0 ]; then
observe "could not autodetect X server driver: no video card" \
"detected, or no driver known for it"
commit 078c4776c4265a2d7b4c76a51db815f32f775952
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 20 18:54:13 2007 +0200
Add closer for the xutils split.
diff --git a/debian/changelog b/debian/changelog
index 05ca41a..43e4b3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
* Add xutils and xbase-clients transitional packages
- + this completes the xbase-clients split and thus closes: #151613.
+ + xbase-clients is now split (closes: #151613).
+ + ditto xutils (closes: #330751).
* Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
version.
* Remove unused code from debian/rules.
- -- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 19:14:11 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Jul 2007 18:52:45 +0200
xorg (1:7.2-6) UNRELEASED; urgency=low
commit 076846438f1fc8a8eb519d07c0b816451b059e8c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 19:36:17 2007 +0200
Remove unused code from debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 0cb3b2a..05ca41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
+ this completes the xbase-clients split and thus closes: #151613.
* Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
version.
+ * Remove unused code from debian/rules.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 19:14:11 +0200
diff --git a/debian/rules b/debian/rules
index 39db7fa..c81241f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,6 @@
# debhelper
export DH_OPTIONS
-# latest ABI is 7.0 final
-SERVERABIBUMP = 7.1.0
-
# Default list of detection packages
XSERVER_XORG_DETECT_DEPENDS = ""
@@ -119,8 +116,7 @@ binary-arch: build install
dh_installdeb
dh_shlibdeps
dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
- -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \
- -VServer-ABI-Version=$(SERVERABIBUMP)
+ -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS)
dh_md5sums
dh_builddeb
touch stamp-$@
commit 8a3479e2371e5472219326bdfac4bcf918699e24
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 19:33:51 2007 +0200
Add xutils and xbase-clients transitional packages.
Bump version number to be higher than the current xbase-clients version.
diff --git a/debian/changelog b/debian/changelog
index 7a941c3..0cb3b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
+
+ * Add xutils and xbase-clients transitional packages
+ + this completes the xbase-clients split and thus closes: #151613.
+ * Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
+ version.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 19:14:11 +0200
+
xorg (1:7.2-6) UNRELEASED; urgency=low
[ Brice Goglin ]
diff --git a/debian/control b/debian/control
index e590222..14af353 100644
--- a/debian/control
+++ b/debian/control
@@ -200,3 +200,33 @@ Depends: libglu1-mesa-dev
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
+
+Package: xbase-clients
+Section: x11
+Architecture: all
+Depends: x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils,
+ x11-xserver-utils, xauth, xinit
+Description: miscellaneous X clients - metapackage
+ An X client is a program that interfaces with an X server (almost always via
+ the X libraries), and thus with some input and output hardware like a
+ graphics card, monitor, keyboard, and pointing device (such as a mouse).
+ .
+ This package provides a miscellaneous assortment of several dozen X clients
+ that ship with the X Window System.
+ .
+ This package is provided for transition from earlier Debian releases, the
+ programs formerly in xutils and xbase-clients having been split out in smaller
+ packages.
+
+Package: xutils
+Section: x11
+Architecture: all
+Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils, xutils-dev
+Description: X Window System utility programs metapackage
+ xutils provides a set of utility programs shipped with the X Window System.
+ Many of these programs are useful even on a system that does not have any X
+ clients or X servers installed.
+ .
+ This package is provided for transition from earlier Debian releases, the
+ programs formerly in xutils and xbase-clients having been split out in smaller
+ packages.
commit 0a5113f2c743c1955b39b2326b3663ebca97fbcc
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 11 22:31:02 2007 -0400
Don't write out the font section to xorg.conf by default
diff --git a/debian/changelog b/debian/changelog
index 15c379d..4131303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,12 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
write a single "Display" subsection for the screen, and it will contain
the modes. This is functionally equivalent to what we were doing anyway,
and it cuts down the number of lines in our xorg.conf considerably.
+ * Don't write out the font section to xorg.conf by default
[ Julien Cristau ]
* xorg recommends libgl1-mesa-dri instead of depending on it.
- -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:13:24 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:30:24 -0400
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index b7c1f39..a89c3de 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -60,7 +60,7 @@ _Description: Desired default X server:
Template: xserver-xorg/config/write_files_section
Type: boolean
-Default: true
+Default: false
_Description: Write default Files section to configuration file?
The Files section of the X server configuration file tells the X server where
to find server modules, the RGB color database, and font files. This option
commit 48f729040615d868f16b3e060e91b23deadbf101
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 11 22:29:47 2007 -0400
Slim down the modes we write out by default
The /config/display/modes now has no default (blank). As a result of this,
under normal conditions, this multi-select field will be empty. The
debconfage and dexconf will not fill in this section at all. The server
will then choose the highest resolution that it can probe with DDC. This
should work for most people, who are probably choosing their best
resolution anyway. If xresprobe is available and used, the resolutions it
finds will be selected. Until there is a good way for the server to store
this information by itself, we should leave this as it is. Most people can
get by without this section, but it'll help some of those with broken
hardware.
If the user does select a mode or modes for this question, dexconf no
longer iterates through a set of depths and puts the mode list in for
each. Instead, if dexconf does find a set of specified modes, it will
write a single "Display" subsection for the screen, and it will contain
the modes. This is functionally equivalent to what we were doing anyway,
and it cuts down the number of lines in our xorg.conf considerably.
diff --git a/debian/changelog b/debian/changelog
index 4a8bca5..15c379d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,29 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
* Don't write the DRI section to xorg.conf. We now ship a default mode in
libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
override the default mode in their xorg.conf's if they choose
+ * Get rid of all the explicit modes by default. They just bloated the
+ default config for no reason.
+ + The /config/display/modes now has no default (blank). As a result of
+ this, under normal conditions, this multi-select field will be empty.
+ The debconfage and dexconf will not fill in this section at all. The
+ server will then choose the highest resolution that it can probe with
+ DDC. This should work for most people, who are probably choosing their
+ best resolution anyway. If xresprobe is available and used, the
+ resolutions it finds will be selected. Until there is a good way for the
+ server to store this information by itself, we should leave this as it
+ is. Most people can get by without this section, but it'll help some of
+ those with broken hardware.
+ + If the user does select a mode or modes for this question, dexconf no
+ longer iterates through a set of depths and puts the mode list in for
+ each. Instead, if dexconf does find a set of specified modes, it will
+ write a single "Display" subsection for the screen, and it will contain
+ the modes. This is functionally equivalent to what we were doing anyway,
+ and it cuts down the number of lines in our xorg.conf considerably.
[ Julien Cristau ]
* xorg recommends libgl1-mesa-dri instead of depending on it.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2007 23:13:17 +0200
+ -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:13:24 -0400
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 48e0b27..801ec31 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -374,14 +374,11 @@ Section "Screen"
Monitor "$MONITOR_IDENTIFIER"
DefaultDepth $DISPLAY_DEFAULT_DEPTH
SECTION
-for DEPTH in 1 4 8 15 16 24; do
- printf "\tSubSection \"Display\"\n" >&4
- printf "\t\tDepth\t\t$DEPTH\n" >&4
if [ -n "$DISPLAY_MODES" ]; then
+ printf "\tSubSection \"Display\"\n" >&4
printf "\t\tModes\t\t$DISPLAY_MODES\n" >&4
+ printf "\tEndSubSection\n" >&4
fi
- printf "\tEndSubSection\n" >&4
-done
printf "EndSection\n" >&4
### SERVERLAYOUT
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 32d4c8d..b7c1f39 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -3,7 +3,6 @@
Template: xserver-xorg/config/display/modes
Type: multiselect
Choices: 1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480
-Default: 1024x768, 800x600, 640x480
_Description: Video modes to be used by the X server:
Please keep only the resolutions you would like the X server to use. Removing
all of them is the same as removing none, since in both cases the
Reply to: