Hi SRMs,
I broke the xserver-xorg package's postinst script in the lenny r2
update. Maximiliano was kind enough to fix my mistake and test the
updated package, which is sitting in p-u-new. Please accept for 5.0.3
(sooner is probably better, so people with b0rked installs can get the
fix from p-u in the meantime). The diff from 1:7.3+19 follows.
TIA,
Julien
On Thu, Jul 30, 2009 at 20:20:32 +0000, Julien Cristau wrote:
> debian/changelog | 7 +++++++
> debian/xserver-xorg.postinst.in | 5 ++++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> New commits:
> commit 89b8ea3587eafe48c80740a8912d390702e6b02d
> Author: Maximiliano Curia <m...@debian.org>
> 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 <jcris...@debian.org>
>
> 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 <m...@debian.org> 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-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
