xorg: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/control | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit bd2319509b0ce3757b934365b13f1dbcf87e7955
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Jul 21 17:48:41 2011 -0700
Revert dependency on xdiagnose for kubuntu
diff --git a/debian/changelog b/debian/changelog
index a36f106..d6b1dbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.6+7ubuntu5) oneiric; urgency=low
+
+ * debian/control: Move xdiagnose dependency to ubuntu-desktop.
+ xdiagnose has a gtk dependency, which would pull in gtk3 to kubuntu.
+ (LP: #814346)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 21 Jul 2011 17:47:16 -0700
+
xorg (1:7.6+7ubuntu4) oneiric; urgency=low
* debian/control: Add Depends on xdiagnose, to ensure it always gets
diff --git a/debian/control b/debian/control
index 9e77e5d..2e69ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
Package: x11-common
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2), xdiagnose
+Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
+Recommends: xdiagnose
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
Reply to: