xorg: Changes to 'debian-lenny'
debian/changelog|7 +++
debian/xserver-xorg.postinst.in |5 -
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 89b8ea3587eafe48c80740a8912d390702e6b02d
Author: Maximiliano Curia
Date: Wed Jul 22 16:26:29 2009 -0300
Fix stupid bug in xserver-xorg.postinst
Shell scripting fail.
``||'' and ``&&'' have the same precedence in shell, so we ended up with
an empty xorg.conf after installing 1:7.3+19.
Debian bug#535624.
Signed-off-by: Julien Cristau
diff --git a/debian/changelog b/debian/changelog
index 18477f8..c44450e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+20) stable; urgency=low
+
+ * Non-maintainer upload, supervised by Julien Cristau.
+ * xserver-xorg.postinst: fix for the previous patch. Closes: #535624
+
+ -- Maximiliano Curia Wed, 22 Jul 2009 16:26:29 -0300
+
xorg (1:7.3+19) stable; urgency=low
* xserver-xorg.postinst: default to the fbdev driver on sparc, even when we
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 5beb891..8aef64a 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -932,7 +932,10 @@ fi
# Don't touch the config on upgrades except to deal with known issues with old
# configs.
if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14" || \
- [ "$ARCHITECTURE" = sparc ] && dpkg --compare-versions "$2" lt-nl 1:7.3+19;
then
+ { [ "$ARCHITECTURE" = sparc ] && \
+ dpkg --compare-versions "$2" lt-nl 1:7.3+19; } || \
+ { [ -n "$(find "$XORGCONFIG" -maxdepth 0 -size 0 2>/dev/null)" ] && \
+ [ "$2" = 1:7.3+19 ]; }; then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it. if we're reconfiguring, overwrite
# it regardless and back it up.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg: Changes to 'debian-lenny'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fd5cf77a5f6f2cce7f3d9624dba1f098b571db19 Author: Julien Cristau Date: Mon Jun 8 11:53:53 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 312e98f..18477f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg (1:7.3+19) UNRELEASED; urgency=low +xorg (1:7.3+19) stable; urgency=low * xserver-xorg.postinst: default to the fbdev driver on sparc, even when we find PCI devices, to work around #488669. - -- Julien Cristau Mon, 25 May 2009 14:58:42 +0200 + -- Julien Cristau Mon, 08 Jun 2009 11:53:46 +0200 xorg (1:7.3+18) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg: Changes to 'debian-lenny'
debian/xserver-xorg.postinst.in |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8f6c69e2e8907737e7ab72f077ecf635b04d0cf0
Author: Julien Cristau
Date: Wed Jun 3 21:28:50 2009 +0200
xserver-xorg.postinst: run dexconf on upgrade on sparc
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index a7432e5..5beb891 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -931,7 +931,8 @@ fi
# Don't touch the config on upgrades except to deal with known issues with old
# configs.
-if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14"; then
+if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14" || \
+ [ "$ARCHITECTURE" = sparc ] && dpkg --compare-versions "$2" lt-nl 1:7.3+19;
then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it. if we're reconfiguring, overwrite
# it regardless and back it up.
commit 4af536ab4e0540847c9beeaa3d9b5b54fa37e29f
Author: Julien Cristau
Date: Wed Jun 3 21:28:34 2009 +0200
xserver-xorg.postinst: put fbdev in the list of debconf driver choices
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 06b0b5c..a7432e5 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -539,6 +539,7 @@ if [ "$ARCH" = "sparc" ]; then
DRIVERS_LIST=$(echo "$DRIVERS" | awk 'BEGIN {ORS="";FS="\t"} {if(NR >
1){print last ","};last=$0} END {print last}')
else
DRIVERS=fbdev
+DRIVERS_LIST=fbdev
fi
if [ $MULTIHEAD -gt 1 ]; then
MULTIHEAD=yes
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg: Changes to 'debian-lenny'
New branch 'debian-lenny' available with the following commits: commit 76ee8b31feeeb5a522161f98353cf25394866eef Author: Julien Cristau Date: Mon May 25 15:03:02 2009 +0200 xserver-xorg.postinst: default to the fbdev driver on sparc PCI is broken in lenny, so this should work around #488669. Completely untested though. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
