xorg: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++--
debian/control | 5 +++--
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit b453c54793bf98b62f0e2189fa2bc4c8f11ac3fa
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 13 08:24:24 2007 +0100
Make x11-common conflict with opera (<< 9.10-20061214.6).
diff --git a/debian/changelog b/debian/changelog
index 41f55f2..118cfdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-xorg (1:7.1.0-12) UNRELEASED; urgency=low
+xorg (1:7.1.0-12) unstable; urgency=high
+ [ Christian Perrier ]
* Map French Canadian console keymap to "ca" X keymap in the postinst
Closes: #408482
- -- Christian Perrier <bubulle@debian.org> Fri, 26 Jan 2007 08:49:47 +0100
+ [ Julien Cristau ]
+ * High urgency upload for RC bugfix.
+ * x11-common Conflicts with opera (<< 9.10-20061214.6), to provide an
+ upgrade path for users with this third-party package installed. Thanks to
+ Steve Langasek (closes: #410740).
+ * Change my email address in debian/control.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 13 Feb 2007 08:23:07 +0100
xorg (1:7.1.0-11) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 952f31e..02596fb 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>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
Standards-Version: 3.7.2.0
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
@@ -59,7 +59,8 @@ Conflicts: xfree86-common, xorg-common,
beaver (<= 0.2.5-2), lsb-core (<= 3.1-4), yank (<=0.2.1-7.2),
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
+ xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4), xephem,
+ opera (<< 9.10-20061214.6)
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: