xorg: Changes to 'ubuntu'
debian/changelog | 84 ++++++++++++++++++++++++
debian/local/Failsafe/failsafeDexconf | 24 +-----
debian/local/Xsession | 21 ------
debian/local/Xsession.5 | 7 ++
debian/local/Xsession.d/40x11-common_xsessionrc | 6 +
debian/local/dexconf | 1
debian/x11-common.NEWS | 12 +++
debian/xserver-xorg.postinst.in | 16 ----
8 files changed, 118 insertions(+), 53 deletions(-)
New commits:
commit c41a60f49603277af9238b778e29da631314926e
Author: Timo Aaltonen <tjaalton@luthien.hima>
Date: Sat Jan 5 00:57:17 2008 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 34068df..b6c4238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+9ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.3+9ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
- apport/xorg-server.py, debian/x11-common.install:
@@ -44,7 +44,7 @@ xorg (1:7.3+9ubuntu1) UNRELEASED; urgency=low
* failsafeDexconf: Don't try to fetch() default-x-server, which is no more.
Just use xorg/xserver-xorg where appropriate, and fix variables.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 05 Jan 2008 00:25:53 +0200
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 05 Jan 2008 00:56:50 +0200
xorg (1:7.3+9) unstable; urgency=low
commit cbebf5c319812af27c59c05bd3fc1d72570aff77
Author: Timo Aaltonen <tjaalton@luthien.hima>
Date: Sat Jan 5 00:32:56 2008 +0200
failsafeDexconf: Don't try to fetch() default-x-server, which is no more.
diff --git a/debian/changelog b/debian/changelog
index a8669ea..34068df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,8 +41,10 @@ xorg (1:7.3+9ubuntu1) UNRELEASED; urgency=low
cards still require weird overrides (ati -> fbdev) that are not
100% known in all combinations.
+ Skip video card autodetection if xforcevesa is set.
+ * failsafeDexconf: Don't try to fetch() default-x-server, which is no more.
+ Just use xorg/xserver-xorg where appropriate, and fix variables.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 18 Dec 2007 01:19:37 +0200
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 05 Jan 2008 00:25:53 +0200
xorg (1:7.3+9) unstable; urgency=low
diff --git a/debian/local/Failsafe/failsafeDexconf b/debian/local/Failsafe/failsafeDexconf
index 774de5f..31297c1 100755
--- a/debian/local/Failsafe/failsafeDexconf
+++ b/debian/local/Failsafe/failsafeDexconf
@@ -30,6 +30,7 @@
DEVICE_DRIVER=${1:-"vesa"}
OUTFILE=${2:-"/etc/X11/xorg.conf.failsafe"}
+SERVER="xorg"
# source debconf library
. /usr/share/debconf/confmodule
@@ -47,10 +48,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
}
@@ -70,20 +68,6 @@ if which laptop-detect >/dev/null 2>&1; then
fi
fi
-# 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
-
### HEADER
# Because debconf hijacks standard output and its confmodule uses file
@@ -91,14 +75,14 @@ esac
# 4 instead of standard output.
cat <<SECTION >> ${OUTFILE}
-# $REALCONFIG ($SERVER X Window System server configuration file)
+# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by failsafeDexconf, using
# values from the debconf database and some overrides to use vesa mode.
#
# You should use dexconf or another such tool for creating a "real" xorg.conf
# For example:
-# sudo dpkg-reconfigure -phigh $XSERVERPKG
+# sudo dpkg-reconfigure -phigh xserver-xorg
SECTION
### FILES
commit db54e3e1a5b9f37a8170e51bdd06eb53a39e911d
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Dec 30 23:17:01 2007 -0500
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9f0f812..9d01c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+9) UNRELEASED; urgency=low
+xorg (1:7.3+9) unstable; urgency=low
[ Julien Cristau ]
* Deregister old debconf questions before calling dexconf. dexconf calls
@@ -29,10 +29,10 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
+ Add a NEWS.Debian entry about it
+ Modifies /etc/X11/Xsession to declare the location of ~/.xsessionrc.
Custom versions of Xsession (like gdm's) will need an update
- * Use run-parts --list instead of a custom run_parts function.
+ * Use run-parts --list instead of a custom run_parts function.
Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606
- -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:52:58 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 23:01:52 -0500
xorg (1:7.3+8) unstable; urgency=low
commit 0a1518be0c3a32c5d970422ba7f569214862178f
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Dec 30 23:00:15 2007 -0500
Add a note about xsessionrc for the gdm maintainers and users
diff --git a/debian/changelog b/debian/changelog
index 410a309..9f0f812 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
+ Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
+ Document this in Xsession.5 manpage
+ Add a NEWS.Debian entry about it
+ + Modifies /etc/X11/Xsession to declare the location of ~/.xsessionrc.
+ Custom versions of Xsession (like gdm's) will need an update
* Use run-parts --list instead of a custom run_parts function.
Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606
commit 01a7eb250bfcf9d4535959bfd186316fa3207cc6
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Dec 30 22:57:38 2007 -0500
* Use run-parts --list instead of a custom run_parts function.
Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606
diff --git a/debian/changelog b/debian/changelog
index c2cd2b5..410a309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
+ Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
+ Document this in Xsession.5 manpage
+ Add a NEWS.Debian entry about it
+ * Use run-parts --list instead of a custom run_parts function.
+ Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606
- -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:23:39 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:52:58 -0500
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/local/Xsession b/debian/local/Xsession
index 246ee90..6ad7d6e 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -47,24 +47,6 @@ internal_errormsg () {
"<debian-x@lists.debian.org>."
}
-run_parts () {
- # until run-parts --noexec is implemented
- if [ -z "$1" ]; then
- internal_errormsg "run_parts() called without an argument."
- fi
- if [ ! -d "$1" ]; then
- internal_errormsg "run_parts() called, but \"$1\" does not exist or is" \
- "not a directory."
- fi
- for F in $(/bin/ls $1); do
- if expr "$F" : '[[:alnum:]_-]\+$' > /dev/null 2>&1; then
- if [ -f "$1/$F" ]; then
- echo "$1/$F"
- fi
- fi
- done
-}
-
# initialize variables for use by all session scripts
OPTIONFILE=/etc/X11/Xsession.options
@@ -117,7 +99,7 @@ rm -f "$WRITE_TEST"
# instead of executing so that the variables and functions defined above
# are available to the scripts, and so that they can pass variables to each
# other
-SESSIONFILES=$(run_parts $SYSSESSIONDIR)
+SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
if [ -n "$SESSIONFILES" ]; then
set +e
for SESSIONFILE in $SESSIONFILES; do
commit 751aa513804ba924daa9d3773ac08281d922bdb3
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Dec 30 22:48:03 2007 -0500
* Add support for $HOME/.xsessionrc. Closes: #411639
This file, if present, will get sourced during the start of your X
session. This allows you to set session-wide environment variables easily
for things like locale information. Patch adapted from one by Yves-Alexis
Perez. Thanks also to Holger Levsen and Osamu Aoki for advice.
+ Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
+ Document this in Xsession.5 manpage
+ Add a NEWS.Debian entry about it
diff --git a/debian/changelog b/debian/changelog
index ade1d5c..c2cd2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,16 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
[ David Nusinow ]
* Don't force fbdev on mac mini ppc any more. The ati driver no longer uses
fbdev, and it has been reported to work on mac minis without it.
-
- -- David Nusinow <dnusinow@debian.org> Sun, 23 Dec 2007 17:05:01 -0500
+ * Add support for $HOME/.xsessionrc. Closes: #411639
+ This file, if present, will get sourced during the start of your X
+ session. This allows you to set session-wide environment variables easily
+ for things like locale information. Patch adapted from one by Yves-Alexis
+ Perez. Thanks also to Holger Levsen and Osamu Aoki for advice.
+ + Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
+ + Document this in Xsession.5 manpage
+ + Add a NEWS.Debian entry about it
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:23:39 -0500
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/local/Xsession b/debian/local/Xsession
index e818342..246ee90 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -74,6 +74,7 @@ USRRESOURCES=$HOME/.Xresources
SYSSESSIONDIR=/etc/X11/Xsession.d
USERXSESSION=$HOME/.xsession
+USERXSESSIONRC=$HOME/.xsessionrc
ALTUSERXSESSION=$HOME/.Xsession
ERRFILE=$HOME/.xsession-errors
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index a3268b7..16b617e 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -186,6 +186,13 @@ the user's
.I $HOME/.Xresources
file is merged in the same way.
.TP
+.I /etc/X11/Xsession.d/40x11\-common_xsessionrc
+Source global environment variables.
+This script will source anything in
+.IR $HOME/.xsessionrc
+if the file is present. This allows the user to set global environment
+variables for their X session, such as locale information.
+.TP
.I /etc/X11/Xsession.d/50x11\-common_determine\-startup
Determine startup program.
The X client to launch as the controlling process (the one that, upon
diff --git a/debian/local/Xsession.d/40x11-common_xsessionrc b/debian/local/Xsession.d/40x11-common_xsessionrc
new file mode 100644
index 0000000..305f363
--- /dev/null
+++ b/debian/local/Xsession.d/40x11-common_xsessionrc
@@ -0,0 +1,6 @@
+# This file is sourced by Xsession(5), not executed.
+
+#Source user defined xsessionrc (locales and other environment variables)
+if [ -r "$USERXSESSIONRC" ]; then
+ . "$USERXSESSIONRC"
+fi
diff --git a/debian/x11-common.NEWS b/debian/x11-common.NEWS
index 13922c4..9b178e3 100644
--- a/debian/x11-common.NEWS
+++ b/debian/x11-common.NEWS
@@ -1,3 +1,15 @@
+x11-common (1:7.3+9) unstable; urgency=low
+
+ * This release provides the ability to set session-wide environment
+ variables easily. If you have the file ".xsessionrc" in your home
+ directory it will be read (sourced) by the X session scripts during
+ login. This allows you to easily set environment variables in this file
+ that apply to all apps. This is most immediately useful for setting
+ locale information. Remember that for most shells you will have to
+ explicitly export the variable for it to take effect in your session.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:14:30 -0500
+
x11-common (1:7.0.11) unstable; urgency=low
* With the change to X11R7, various paths have been changed, including
commit a2bcba3aadc4f36a540fd3041775a7ee4f11fdff
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Dec 23 17:05:40 2007 -0500
* Don't force fbdev on mac mini ppc any more. The ati driver no longer uses
fbdev, and it has been reported to work on mac minis without it.
diff --git a/debian/changelog b/debian/changelog
index 7c9401c..ade1d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,11 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
* Fix dexconf to write in /etc/X11/xorg.conf by default again,
closes: #456925.
- -- Brice Goglin <bgoglin@debian.org> Sat, 22 Dec 2007 18:48:34 +0100
+ [ David Nusinow ]
+ * Don't force fbdev on mac mini ppc any more. The ati driver no longer uses
+ fbdev, and it has been reported to work on mac minis without it.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 23 Dec 2007 17:05:01 -0500
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index c04fc05..c91e6e8 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -797,18 +797,6 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
USE_FBDEV=false
fi
- # it looks like Mac Mini need an extra kick. Make sure to give it to it.
-
- if [ "$ARCH" = powerpc ] && [ "$USE_FBDEV" = "false" ]; then
- # it looks like Mac Mini need an extra kick. Make sure to give it to it.
- if [ -e /proc/cpuinfo ]; then
- if [ -n "$(cat /proc/cpuinfo | grep "^machine.*PowerMac10,1")" ] && \
- [ -n "$(cat /proc/cpuinfo | grep "^platform.*PowerMac")" ]; then
- USE_FBDEV=true
- fi
- fi
- fi
-
if [ -n "$XORG_USE_FBDEV" ] && [ "$XORG_USE_FBDEV" = "no" ]; then
USE_FBDEV=false
fi
commit 25f7934dea2d56280114a0b8456a0f1af8824166
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Dec 22 18:49:52 2007 +0100
Fix dexconf to write in /etc/X11/xorg.conf by default again
diff --git a/debian/changelog b/debian/changelog
index edbf9ec..7c9401c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
[ Brice Goglin ]
* Fix "no video driver modules found" message, thanks Robert Millan,
closes: #453930.
+ * Fix dexconf to write in /etc/X11/xorg.conf by default again,
+ closes: #456925.
- -- Brice Goglin <bgoglin@debian.org> Sat, 22 Dec 2007 17:44:30 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sat, 22 Dec 2007 18:48:34 +0100
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index c53636e..9f669fb 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -66,6 +66,7 @@ list_convert () {
}
SERVER="xorg"
+XF86CONFIG=/etc/X11/xorg.conf
PROGNAME=${0##*/}
SHOWHELP=
EARLYEXIT=
commit 194afccc000ed55d9d7971edb6b06565370c9d34
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Dec 22 17:46:25 2007 +0100
Fix "no video driver modules found" message
diff --git a/debian/changelog b/debian/changelog
index aeec2e5..edbf9ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,14 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
to prevent future mistakes. Thanks, Michael Vogt!
[ Timo Aaltonen ]
- * dexconf: Remove reference to xserver-xorg/config/display/modes,
+ * dexconf: Remove reference to xserver-xorg/config/display/modes,
which is no longer used.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 20 Dec 2007 20:41:15 +0200
+ [ Brice Goglin ]
+ * Fix "no video driver modules found" message, thanks Robert Millan,
+ closes: #453930.
+
+ -- Brice Goglin <bgoglin@debian.org> Sat, 22 Dec 2007 17:44:30 +0100
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 83ac0b4..c04fc05 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -652,8 +652,8 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
;;
esac
- if [ -z "$DRIVER_LIST" ]; then
- observe "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
+ if [ -z "$DRIVER_LIST" ] || [ "$DRIVER_LIST" = " " ]; then
+ warn "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
DRIVER_LIST="$DEFAULT_DRIVER"
fi
commit c8e867b6e44f476da4efa2410243a947aff18171
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Thu Dec 20 20:43:41 2007 +0200
dexconf: Remove reference to xserver-xorg/config/display/modes, which is no longer used.
diff --git a/debian/changelog b/debian/changelog
index 0f8611d..aeec2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
xorg (1:7.3+9) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Deregister old debconf questions before calling dexconf. dexconf calls
db_stop, and we can't use debconf after that. Add a comment to that
effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
to prevent future mistakes. Thanks, Michael Vogt!
- -- Julien Cristau <jcristau@debian.org> Mon, 17 Dec 2007 23:21:35 +0100
+ [ Timo Aaltonen ]
+ * dexconf: Remove reference to xserver-xorg/config/display/modes,
+ which is no longer used.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 20 Dec 2007 20:41:15 +0200
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 92d11df..c53636e 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -262,9 +262,6 @@ printf "EndSection\n" >&4
### SCREEN
-db_get xserver-$SERVER/config/display/modes
-DISPLAY_MODES="$(list_convert $RET)"
-
exec 4>"$DEXCONFTMPDIR/Screen"
cat >&4 <<SECTION
Section "Screen"
Reply to: