xorg: Changes to 'debian-unstable'
debian/changelog | 7 +++++--
debian/control | 2 +-
debian/xserver-xorg.preinst.in | 3 ---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4d8f88777fd5f80df8e461e6cabc0a35d239dcf2
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 28 13:42:50 2007 +0100
Don't source /usr/share/debconf/confmodule in xserver-xorg.preinst.
This script doesn't use debconf, so it doesn't need to source the confmodule.
Thanks lintian for noticing that a pre-dependency on debconf was missing :)
diff --git a/debian/changelog b/debian/changelog
index 79cbdda..058ec5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.1.0-13) unstable; urgency=high
Timo Aaltonen. This fixes CVE-2006-5214.
* Change versioned conflict on opera to << 9.00-20060616, per Edward
Welbourne <eddy@opera.com>.
+ * Don't source debconf stuff in xserver-xorg.preinst, thanks lintian.
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Feb 2007 11:51:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Feb 2007 13:41:12 +0100
xorg (1:7.1.0-12) unstable; urgency=high
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index 1a591e3..696537d 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -7,9 +7,6 @@ # /usr/share/common-licenses/GPL or <htt
set -e
-# source debconf library
-. /usr/share/debconf/confmodule
-
THIS_PACKAGE=xserver-xorg
THIS_SCRIPT=preinst
commit 6d563b2f9d012114ebadf54c19b23bb9ae077f8e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 28 13:18:47 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 91aeb4a..79cbdda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg (1:7.1.0-13) UNRELEASED; urgency=high
+xorg (1:7.1.0-13) unstable; urgency=high
* debian/local/Xsession: set temporary umask when creating $ERRFILE. Thanks
Timo Aaltonen. This fixes CVE-2006-5214.
* Change versioned conflict on opera to << 9.00-20060616, per Edward
Welbourne <eddy@opera.com>.
- -- Julien Cristau <jcristau@debian.org> Tue, 27 Feb 2007 21:05:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Feb 2007 11:51:02 +0100
xorg (1:7.1.0-12) unstable; urgency=high
commit ee24c4b49b0bc1a17542bb44ad929a854e2a886f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 28 11:29:47 2007 +0100
Fix opera conflict.
Change versioned conflict on opera to << 9.00-20060616, per Edward
Welbourne <eddy@opera.com>.
diff --git a/debian/changelog b/debian/changelog
index 63132b8..91aeb4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg (1:7.1.0-13) UNRELEASED; urgency=hi
* debian/local/Xsession: set temporary umask when creating $ERRFILE. Thanks
Timo Aaltonen. This fixes CVE-2006-5214.
+ * Change versioned conflict on opera to << 9.00-20060616, per Edward
+ Welbourne <eddy@opera.com>.
- -- Julien Cristau <jcristau@debian.org> Tue, 20 Feb 2007 10:08:56 +0100
+ -- Julien Cristau <jcristau@debian.org> Tue, 27 Feb 2007 21:05:02 +0100
xorg (1:7.1.0-12) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 02596fb..8e6293c 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Conflicts: xfree86-common, xorg-common,
xpmumon (<= 1.3.0), ivtools-dev (<= 1.1.3-5), ppxp (<= 0.2001080415-14),
guitar (<= 0.1.4-11), xftp, xext, xpaste, ghostview, xv (<= 3.10a-26),
xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4), xephem,
- opera (<< 9.10-20061214.6)
+ opera (<< 9.10-20060616)
Replaces: xfree86-common, xorg-common, xserver-common, x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
Reply to: