debian/changelog | 9 +++++++--
debian/control | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 39135d00ecc9c9fd9594823db79387a31227f20d
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Apr 3 12:56:21 2007 +0200
Add x11-common conflict with ucbmpeg-play << 2.3p-13.
diff --git a/debian/changelog b/debian/changelog
index 3348122..1aef5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-xorg (1:7.1.0-16) UNRELEASED; urgency=low
+xorg (1:7.1.0-16) unstable; urgency=high
+ [ Christian Perrier ]
* Debconf translations:
- Norwegian Nynorsk added (sent privately)
- Marathi added. Closes: #416799
* Configure Romanian keymap when the system is installed in
Romanian. Closes: #416544
- -- Christian Perrier <[EMAIL PROTECTED]> Sun, 01 Apr 2007 16:13:08 +0200
+ [ Julien Cristau ]
+ * Add x11-common conflict with ucbmpeg-play << 2.3p-13.
+ * Urgency high to get this into etch.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 03 Apr 2007 12:54:35 +0200
xorg (1:7.1.0-15) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f57ea79..7e481d9 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,8 @@ Conflicts: xfree86-common, xorg-common, xserver-common,
x-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-20060616), hamsoft (<< 0.2.3-1), phototk, tkworld
+ opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), phototk, tkworld,
+ ucbmpeg-play (<< 2.3p-13)
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
