debian/changelog | 32 ++++++++++++++++++++++++++++++++ debian/xserver-xorg.postinst.in | 5 ++--- 2 files changed, 34 insertions(+), 3 deletions(-)
New commits: commit 2044c44b745e292cbc24986126fa7b6a514e8730 Author: Timo Aaltonen <[email protected]> Date: Fri Jan 20 18:52:24 2012 +0200 drop the psb-to-vesa mangling of xorg.conf, we're well past the previous LTS->LTS upgrade path diff --git a/debian/changelog b/debian/changelog index 2b5a65a..999b38c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,6 @@ xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo from xserver-xorg-video-all dependencies. They are unmaintained and obsolete. - - debian/xserver-xorg.postinst.in: - Also migrate users from psb → vesa. - debian/x11-common.{preinst,postinst,postrm}.in: Clean up the old failsafe-x files. diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index 3f37d4c..e595e94 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -117,15 +117,14 @@ if [ -n "$UPGRADE" ]; then fi fi -if dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu1"; then +if dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then # We're upgrading from pre-7.4. We need to replace i810 with intel, and - # via with openchrome, and psb with vesa. + # via with openchrome. if [ -e "$XORGCONFIG" ]; then LC_ALL=C sed -e' /^[[:space:]]*Section[[:space:]]\+"Device"[[:space:]]*$/I,/^[[:space:]]*EndSection[[:space:]]*$/I { /^[[:space:]]*Driver[[:space:]]\+"i810"/I s/i810/intel/I /^[[:space:]]*Driver[[:space:]]\+"via"/I s/via/openchrome/I - /^[[:space:]]*Driver[[:space:]]\+"psb"/s/psb/vesa/ } ' $XORGCONFIG > ${XORGCONFIG}.madwizard-new if ! cmp -s $XORGCONFIG ${XORGCONFIG}.madwizard-new; then commit 37c2a719c8b7e50476ce53873d11d5e045623b17 Author: Timo Aaltonen <[email protected]> Date: Fri Jan 20 18:47:32 2012 +0200 update the merge changelog diff --git a/debian/changelog b/debian/changelog index d74ab2f..2b5a65a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add apport hook + - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to + Recommends. + - debian/local/Xsession: + Truncate xsession-errors on startup if too big + - debian/local/Xsession.d/20x11-common_process-args: + Add support for session command containing args. + - debian/local/Xsession.d/60x11-common_localhost: + Authorise all processes running with the user's credentials to connect + to the server. + - debian/local/Xsession.d/60x11-common_xdg_path: + Add session script to set xdg path depending on the selected session. + - debian/rules, debian/control: + Add dependencies on x11-common, since pkgbinarymangler moves the docs + there to save some space on the image. + - debian/scripts/vars.*: + + Don't drop wacom from input-all. + + Add -vmmouse to input-all for amd64 and i386. + + Add -qxl to video-all for amd64 and i386. + + Add -geode to video-all for i386. + + Drop video drivers that are likely irrelevant for ARM. + + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo + from xserver-xorg-video-all dependencies. They are unmaintained and + obsolete. + - debian/xserver-xorg.postinst.in: + Also migrate users from psb → vesa. + - debian/x11-common.{preinst,postinst,postrm}.in: + Clean up the old failsafe-x files. + + -- Timo Aaltonen <[email protected]> Fri, 20 Jan 2012 16:56:59 +0200 + xorg (1:7.6+10) unstable; urgency=high * Fixes for xserver-wrapper: -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
