xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++--
debian/xserver-xorg.prerm.in | 19 -------------------
2 files changed, 6 insertions(+), 21 deletions(-)
New commits:
commit 578913bb4f7d60fa3f18d39a59aa85e93f7b1416
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 12 20:36:30 2007 +0100
Really drop shared/default-x-server
It was still used in prerm; drop this code.
diff --git a/debian/changelog b/debian/changelog
index 5862fca..9b19245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ xorg (1:7.3+5) unstable; urgency=low
[ Julien Cristau ]
* Reupload, because 1:7.3+4 seems to have been lost in the ftp-master crash.
+ * Drop code related to shared/default-x-server from xserver-xorg.prerm.
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Nov 2007 10:57:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Nov 2007 23:01:22 +0100
xorg (1:7.3+4) unstable; urgency=low
diff --git a/debian/xserver-xorg.prerm.in b/debian/xserver-xorg.prerm.in
index 7ccf61c..55ad9b2 100644
--- a/debian/xserver-xorg.prerm.in
+++ b/debian/xserver-xorg.prerm.in
@@ -66,25 +66,6 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
fi
fi
fi
-
- if [ -n "$HAVE_DEBCONF" ]; then
- # disown this question
- db_unregister shared/default-x-server
- # does the question still exist?
- if db_get shared/default-x-server; then
- db_metaget shared/default-x-server owners
- db_subst shared/default-x-server choices "$RET"
- db_metaget shared/default-x-server value
- if [ "$THIS_PACKAGE" = "$RET" ]; then
- db_fset shared/default-x-server seen false
- db_input critical shared/default-x-server || true
- db_go
- db_get shared/default-x-server
- warn "run \"dpkg-reconfigure $RET\" before attempting to start the X" \
- "server again"
- fi
- fi
- fi
fi
#DEBHELPER#
commit 80664c114971b6bf27761d875a2983a57f39d068
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 12 10:57:55 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index ebd4d3c..5862fca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+5) UNRELEASED; urgency=low
+xorg (1:7.3+5) unstable; urgency=low
[ David Nusinow ]
* Change xlibs-static-dev transitional package from the libs to oldlibs
@@ -10,7 +10,10 @@ xorg (1:7.3+5) UNRELEASED; urgency=low
* Replace xserver-xorg dependency on xbase-clients with x11-xkb-utils
(for xkbcomp).
- -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 13:11:05 +0100
+ [ Julien Cristau ]
+ * Reupload, because 1:7.3+4 seems to have been lost in the ftp-master crash.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Nov 2007 10:57:02 +0100
xorg (1:7.3+4) unstable; urgency=low
Reply to: