xorg: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor:
commit 6efa646a04f7e004bf2842393fccad3c9d08f738
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 15:23:28 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 9fb5018..7fc1152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+1) UNRELEASED; urgency=low
+xorg (1:7.6+1) unstable; urgency=low
[ Julien Cristau ]
* x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
@@ -17,7 +17,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
* Update Uploaders list. Thanks, David & Brice!
* Bump Standards-Version to 3.9.1 (no changes needed).
- -- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 15:23:23 +0100
xorg (1:7.6~2) experimental; urgency=low
commit 2686b6b0a9978dbf2e11897bb2697295d13324ff
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 07:23:30 2011 +0100
Bump Standards-Version to 3.9.1 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 9317cd3..9fb5018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
xserver-xorg-video-all from being installable.
* xserver-wrapper.c: Fix compilation warnings.
* Update Uploaders list. Thanks, David & Brice!
+ * Bump Standards-Version to 3.9.1 (no changes needed).
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
diff --git a/debian/control b/debian/control
index 404c5fb..397828a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Build-Depends: po-debconf, debhelper (>= 7)
Package: x11-common
commit 8f0b2078dacaffb7818cccb552f8f86befd855d1
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 07:07:34 2011 +0100
Update Uploaders list. Thanks, David & Brice!
diff --git a/debian/changelog b/debian/changelog
index 773ea79..9317cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
maintained by the X Strike Force, and that shouldn't prevent
xserver-xorg-video-all from being installable.
* xserver-wrapper.c: Fix compilation warnings.
+ * Update Uploaders list. Thanks, David & Brice!
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
diff --git a/debian/control b/debian/control
index 6a23ba5..404c5fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.4
Build-Depends: po-debconf, debhelper (>= 7)
commit 8e24e455289b2f29b0ff05355999dd6458208ba3
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 07:04:25 2011 +0100
xserver-wrapper.c: Fix compilation warnings.
diff --git a/debian/changelog b/debian/changelog
index 456a1c4..773ea79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
* Make xserver-xorg-video-geode a recommended package. It's not
maintained by the X Strike Force, and that shouldn't prevent
xserver-xorg-video-all from being installable.
+ * xserver-wrapper.c: Fix compilation warnings.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index de040d6..db503b5 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -213,7 +213,6 @@ main(int argc, char **argv)
char value[257];
int length;
int i;
- int intval;
char *val;
mode_t mask;
SecurityLevel level = RootOnly;
commit 0bc4965fd055b4fa5e8dcd5b1ccedc11d808badf
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:59:52 2011 +0100
Make xserver-xorg-video-geode a recommended package.
It's not maintained by the X Strike Force, and that shouldn't prevent
xserver-xorg-video-all from being installable.
diff --git a/debian/changelog b/debian/changelog
index 0d6f116..456a1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Make xserver-xorg-video-nouveau a dependency again.
+ * Make xserver-xorg-video-geode a recommended package. It's not
+ maintained by the X Strike Force, and that shouldn't prevent
+ xserver-xorg-video-all from being installable.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 367471b..0870f4f 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-geode, \
xserver-xorg-video-i128, \
xserver-xorg-video-i740, \
xserver-xorg-video-intel, \
@@ -33,7 +32,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
"
-XSERVER_XORG_VIDEO_RECOMMENDS=""
+XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-geode"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
commit 49bc6cd652689cd8eab202b0a129035c4ab33eaa
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:51:44 2011 +0100
Put xserver-xorg-video-openchrome into place.
Keeping entries in alphabetical order makes the Depends list easier to read,
and -openchrome replaced -via. Re-order accordingly.
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 80fbe22..9912a14 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -14,6 +14,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
+ xserver-xorg-video-openchrome, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -25,7 +26,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware"
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 91ae07a..5251d3f 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -13,6 +13,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-openchrome, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -25,7 +26,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-vmware, \
- xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index b15e14a..367471b 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -16,6 +16,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
+ xserver-xorg-video-openchrome, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -27,7 +28,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
"
diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64
index 8ae146e..8d4084d 100755
--- a/debian/scripts/vars.kfreebsd-amd64
+++ b/debian/scripts/vars.kfreebsd-amd64
@@ -11,6 +11,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-i128, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-openchrome, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -21,7 +22,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo"
diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386
index cdc7c38..c1d1034 100755
--- a/debian/scripts/vars.kfreebsd-i386
+++ b/debian/scripts/vars.kfreebsd-i386
@@ -12,6 +12,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-openchrome, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -22,7 +23,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo"
# xserver-xorg-video-glide,
commit c4eac5c8f80818d5326259c91e55a84443d99def
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:49:24 2011 +0100
Make xserver-xorg-video-nouveau a dependency again.
diff --git a/debian/changelog b/debian/changelog
index 68fd00e..0d6f116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
allowed_users value from the file in the config script and preserve it.
Closes: #611271.
+ [ Cyril Brulebois ]
+ * Make xserver-xorg-video-nouveau a dependency again.
+
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
xorg (1:7.6~2) experimental; urgency=low
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 0d0c0bf..80fbe22 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -13,6 +13,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -29,7 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-vmware"
-XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
+XSERVER_XORG_VIDEO_RECOMMENDS=""
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index e31560e..b15e14a 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -15,6 +15,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -32,7 +33,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
"
-XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
+XSERVER_XORG_VIDEO_RECOMMENDS=""
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 2242497..65e45d7 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -7,6 +7,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
@@ -17,7 +18,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
"
-XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
+XSERVER_XORG_VIDEO_RECOMMENDS=""
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
commit 3aadbb010424280b23a16d365b2b20813b04ab81
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:47:21 2011 +0100
Bump version, X11R7.6 is out.
diff --git a/debian/changelog b/debian/changelog
index 9aa0a0b..68fd00e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg (1:7.6~3) UNRELEASED; urgency=low
+xorg (1:7.6+1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
Since sarge (I think), no other package has been handling
/etc/X11/Xwrapper.config, so assume we're the only owner, remove the state
@@ -7,7 +8,7 @@ xorg (1:7.6~3) UNRELEASED; urgency=low
allowed_users value from the file in the config script and preserve it.
Closes: #611271.
- -- Julien Cristau <jcristau@debian.org> Fri, 28 Jan 2011 12:40:27 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 06:37:59 +0100
xorg (1:7.6~2) experimental; urgency=low
commit e93304834e44bf1ad6c978185a8d4b2ce3ffff09
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jan 28 12:49:02 2011 +0100
x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
Since sarge (I think), no other package has been handling
/etc/X11/Xwrapper.config, so assume we're the only owner, remove the
state files on upgrade. The checksum is also not needed, we read the
allowed_users value from the file in the config script and preserve it.
diff --git a/debian/changelog b/debian/changelog
index ffa76a9..9aa0a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6~3) UNRELEASED; urgency=low
+
+ * x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
+ Since sarge (I think), no other package has been handling
+ /etc/X11/Xwrapper.config, so assume we're the only owner, remove the state
+ files on upgrade. The checksum is also not needed, we read the
+ allowed_users value from the file in the config script and preserve it.
+ Closes: #611271.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 28 Jan 2011 12:40:27 +0100
+
xorg (1:7.6~2) experimental; urgency=low
* Drop xserver-xorg-video-nv, it's no longer supported.
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index abe2301..323d56c 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -21,35 +21,17 @@ XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
#INCLUDE_SHELL_LIB#
-# register this package as a (potential) handler of the X server wrapper
-# config file
-if ! fgrep -qsx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER"; then
- echo "$THIS_PACKAGE" >> "$XWRAPPER_CONFIG_ROSTER"
-fi
-
-if ! [ -d "$CONFIG_AUX_DIR" ]; then
- mkdir --mode=755 --parents "$CONFIG_AUX_DIR"
-fi
-
# only mess with config file it exists; otherwise, assume that's the way the
# user wants it, but only if upgrading
if [ -e "$XWRAPPER_CONFIG" ] || [ -z "$UPGRADE" ]; then
- # similarly, check for the existence of the checksum file; if it doesn't
- # exist, assume that's the way the user wants it, but only if upgrading
- if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ] || [ -z "$UPGRADE" ]; then
- # next, compare the current and stored checksums; if they do not match,
- # assume that's the way the user wants it ... upgrading etc
- if [ "$(md5sum "$XWRAPPER_CONFIG" 2>/dev/null)" = \
- "$(cat "$XWRAPPER_CONFIG_CHECKSUM" 2>/dev/null)" ] || \
- [ -z "$UPGRADE" ]; then
- # they match; prepare a new version of the config file
- ALLOWED_USERS=
- if db_get x11-common/xwrapper/actual_allowed_users; then
- ALLOWED_USERS="$RET"
- fi
- if [ -n "$ALLOWED_USERS" ]; then
- NEW_XWRAPPER_CONFIG=$(tempfile)
- cat >>"$NEW_XWRAPPER_CONFIG" << EOF
+ ALLOWED_USERS=
+ if db_get x11-common/xwrapper/actual_allowed_users; then
+ ALLOWED_USERS="$RET"
+ fi
+ if [ -n "$ALLOWED_USERS" ]; then
+ NEW_XWRAPPER_CONFIG=$(tempfile)
+ if ! [ -e "$XWRAPPER_CONFIG" ]; then
+ cat >>"$NEW_XWRAPPER_CONFIG" << EOF
# Xwrapper.config (Debian X Window System server wrapper configuration file)
#
# This file was generated by the post-installation script of the x11-common
@@ -65,26 +47,30 @@ if [ -e "$XWRAPPER_CONFIG" ] || [ -z "$UPGRADE" ]; then
# dpkg-reconfigure x11-common
allowed_users=$ALLOWED_USERS
EOF
- if ! cmp -s "$XWRAPPER_CONFIG" "$NEW_XWRAPPER_CONFIG"; then
- cp "$NEW_XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-new"
- mv "$XWRAPPER_CONFIG.dpkg-new" "$XWRAPPER_CONFIG"
- md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
- fi
- rm -f "$NEW_XWRAPPER_CONFIG"
- else
- observe "not updating $XWRAPPER_CONFIG; problems communicating" \
- "with debconf database"
- fi
else
- observe "not updating $XWRAPPER_CONFIG; file has been customized"
+ sed -e '/^allowed_users.*/d' < "$XWRAPPER_CONFIG" > "$NEW_XWRAPPER_CONFIG"
+ echo "allowed_users=$ALLOWED_USERS" >> "$NEW_XWRAPPER_CONFIG"
+ if ! cmp -s "$XWRAPPER_CONFIG" "$NEW_XWRAPPER_CONFIG"; then
+ cp "$NEW_XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-new"
+ mv "$XWRAPPER_CONFIG.dpkg-new" "$XWRAPPER_CONFIG"
+ fi
fi
+ rm -f "$NEW_XWRAPPER_CONFIG"
else
- observe "not updating $XWRAPPER_CONFIG; no stored checksum available"
+ observe "not updating $XWRAPPER_CONFIG; problems communicating" \
+ "with debconf database"
fi
else
observe "not updating $XWRAPPER_CONFIG; file does not exist"
fi
+# get rid of obsolete X server wrapper config roster and checksum
+if dpkg --compare-versions "$2" lt-nl 1:7.6~3; then
+ rm -f "$XWRAPPER_CONFIG_ROSTER"
+ rm -f "$XWRAPPER_CONFIG_CHECKSUM"
+ rmdir "$CONFIG_AUX_DIR" 2>/dev/null || :
+fi
+
if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then
db_unregister x11-common/xwrapper/nice_value || :
db_unregister x11-common/xwrapper/nice_value/error || :
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index 22bf8b8..1202d23 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -20,41 +20,9 @@ XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
# clean up non-conffile configuration files and related materials on purge
if [ "$1" = "purge" ]; then
- # de-register this package as a handler of the X server wrapper config file
- if [ -e "$XWRAPPER_CONFIG_ROSTER" ]; then
- # check existing roster file for our package name
- if fgrep -qx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" 2>/dev/null; then
- # construct temporary roster file with our package name removed, ignoring
- # failure
- fgrep -vx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" > \
- "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp" 2>/dev/null || true
- # is there anything left?
- if [ -s "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp" ]; then
- # yes, replace the roster file
- mv "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp" "$XWRAPPER_CONFIG_ROSTER"
- else
- # no; remove both the roster and our temporary copy
- rm -f "$XWRAPPER_CONFIG_ROSTER" "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp"
- # remove X server wrapper config file if it was still managed by the
- # package
- if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
- # does it exist?
- if [ -e "$XWRAPPER_CONFIG" ]; then
- # does the current MD5 checksum match the stored checksum?
- if [ "$(md5sum "$XWRAPPER_CONFIG")" \
- = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
- # yes; remove the config file
- rm -f "$XWRAPPER_CONFIG"
- fi
- fi
- # remove the checksum file; any remaining X server wrapper config file
- # still on the system at this point is no longer being managed (local
- # user customization)
- rm -f "$XWRAPPER_CONFIG_CHECKSUM"
- fi
- fi
- fi
- fi
+ rm -f "$XWRAPPER_CONFIG_ROSTER"
+ rm -f "$XWRAPPER_CONFIG"
+ rm -f "$XWRAPPER_CONFIG_CHECKSUM"
for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do
rmdir "$DIR" 2> /dev/null || true
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
deleted file mode 100644
index cee5b13..0000000
--- a/debian/x11-common.preinst.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# Debian x11-common package pre-installation script
-# Copyright 1998--2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-THIS_PACKAGE=x11-common
-THIS_SCRIPT=preinst
-CONFIG_DIR=/etc/X11
-XWRAPPER_CONFIG="$CONFIG_DIR/Xwrapper.config"
-CONFIG_AUX_DIR=/var/lib/x11
-XWRAPPER_CONFIG_ROSTER_BASE="${XWRAPPER_CONFIG##*/}.roster"
-XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
-XWRAPPER_CONFIG_CHECKSUM_BASE="${XWRAPPER_CONFIG##*/}.md5sum"
-XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_CHECKSUM_BASE"
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
-
- # create the configuration files' main and auxiliary directories if they
- # don't exist
- for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do
- if ! [ -e "$DIR" ]; then
- observe "creating $DIR"
- mkdir --mode=755 --parents "$DIR"
- fi
- done
-
- # place config files under management if they do *not* already exist
- if ! [ -e "$XWRAPPER_CONFIG" ]; then
- touch "$XWRAPPER_CONFIG"
- md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
commit d6106e363de645813517ca08004f05bd2303f427
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 16:13:12 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index fd91027..ffa76a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6~2) UNRELEASED; urgency=low
+xorg (1:7.6~2) experimental; urgency=low
* Drop xserver-xorg-video-nv, it's no longer supported.
* Add variables to handle Recommends.
@@ -10,7 +10,7 @@ xorg (1:7.6~2) UNRELEASED; urgency=low
installable again. This input driver will probably be promoted to
Depends again when it is ready™.
- -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:12:14 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:13:06 +0100
xorg (1:7.6~1) experimental; urgency=low
commit 122e9a6de3c9ebcec330869651181c47acad38bd
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 16:09:30 2010 +0100
Downgrade xserver-xorg-input-wacom from Depends to Recommends.
This is only an interim measure aiming at making xserver-xorg-input-all
installable again. This input driver will probably be promoted to
Depends again when it is ready™.
diff --git a/debian/changelog b/debian/changelog
index 9a74ee6..fd91027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xorg (1:7.6~2) UNRELEASED; urgency=low
* Downgrade xserver-xorg-video-nouveau from Depends to Recommends. The
frequent ABI changes make it difficult to manage, but that shouldn't
stop people from using the xserver-xorg-video-all metapackage.
+ * Downgrade xserver-xorg-input-wacom from Depends to Recommends. This is
+ only an interim measure aiming at making xserver-xorg-input-all
+ installable again. This input driver will probably be promoted to
+ Depends again when it is ready™.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:12:14 +0100
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index b97f064..adfe8fe 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -31,5 +31,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# , xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 9d95aab..0d0c0bf 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -33,5 +33,7 @@ XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 36121db..87c6ba7 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 36121db..87c6ba7 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 36121db..87c6ba7 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index a8c85a4..506b340 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -16,5 +16,7 @@ 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-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 3eceeac..e31560e 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -36,5 +36,7 @@ XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 391a00e..393155d 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -26,5 +26,7 @@ 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-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 36121db..87c6ba7 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index e731073..e6c0f4d 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -31,5 +31,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index 36121db..87c6ba7 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 5a8aded..2242497 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -21,5 +21,7 @@ XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4
index 44b0d25..a2d2d06 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -33,5 +33,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-wacom"
+ xserver-xorg-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index b5088a5..cf8e0d1 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -29,5 +29,7 @@ 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-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64
index b5088a5..cf8e0d1 100644
--- a/debian/scripts/vars.sparc64
+++ b/debian/scripts/vars.sparc64
@@ -29,5 +29,7 @@ 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-input-synaptics"
+
+
+XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
commit c4280b71c48b66e52fd7e01ee64ed46017e70530
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 15:35:57 2010 +0100
Downgrade xserver-xorg-video-nouveau from Depends to Recommends.
The frequent ABI changes make it difficult to manage, but that shouldn't
stop people from using the xserver-xorg-video-all metapackage.
diff --git a/debian/changelog b/debian/changelog
index 5bcdd47..9a74ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg (1:7.6~2) UNRELEASED; urgency=low
* Drop xserver-xorg-video-nv, it's no longer supported.
* Add variables to handle Recommends.
+ * Downgrade xserver-xorg-video-nouveau from Depends to Recommends. The
+ frequent ABI changes make it difficult to manage, but that shouldn't
+ stop people from using the xserver-xorg-video-all metapackage.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:12:14 +0100
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 3b35fa9..9d95aab 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
- xserver-xorg-video-nouveau, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -30,6 +29,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-vmware"
+XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
+
+
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 427f883..3eceeac 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
- xserver-xorg-video-nouveau, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
@@ -32,7 +31,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-vmware, \
"
-# xserver-xorg-video-glide,
+
+XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
+
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 5845f53..5a8aded 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -7,7 +7,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
- xserver-xorg-video-nouveau, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
@@ -17,6 +16,10 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-trident, \
"
+
+XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau"
+
+
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
xserver-xorg-input-wacom"
commit aef6809d1ff445f4778cda9c40561fab5aee8226
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 15:29:38 2010 +0100
Add variables to handle Recommends.
diff --git a/debian/changelog b/debian/changelog
index ed2435b..5bcdd47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg (1:7.6~2) UNRELEASED; urgency=low
* Drop xserver-xorg-video-nv, it's no longer supported.
+ * Add variables to handle Recommends.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:12:14 +0100
diff --git a/debian/control b/debian/control
index e9a6cde..6a23ba5 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Architecture: any
Depends:
${F:XServer-Xorg-Video-Depends},
${misc:Depends},
+Recommends:
+ ${F:XServer-Xorg-Video-Recommends},
Replaces: xserver-xorg-driver-all
Conflicts: xserver-xorg-driver-all
Description: the X.Org X server -- output driver metapackage
@@ -56,6 +58,8 @@ Architecture: any
Depends:
${F:XServer-Xorg-Input-Depends},
Reply to: