xorg: Changes to 'ubuntu-trusty'
debian/changelog | 6 ++++++
debian/control | 18 +++++++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)
New commits:
commit 3f3595e88120b0a1f4ca11152190df597c656766
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Oct 9 11:54:59 2014 +0200
Fixup the xorg packages to work correctly with the renamed utopic stack.
diff --git a/debian/changelog b/debian/changelog
index d2198da..a77530f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+1ubuntu8.1) UNRELEASED; urgency=medium
+
+ * Fixup the xorg packages to work correctly with the renamed utopic stack.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 09 Oct 2014 11:46:23 +0200
+
xorg (1:7.7+1ubuntu8) trusty; urgency=low
[ Bryce Harrington ]
diff --git a/debian/control b/debian/control
index 272ab8e..d95bc6f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,9 +34,9 @@ Package: xserver-xorg
Architecture: any
Depends:
xserver-xorg-core (>= 2:1.11) | xserver-xorg-core-omap-revert [armhf],
- xserver-xorg-video-all | xserver-xorg-video-omap-revert [armhf] | xorg-driver-video,
- xserver-xorg-input-all | xorg-driver-input,
- xserver-xorg-input-evdev [linux-any],
+ xserver-xorg-video-all (>= 0~) | xorg-driver-video,
+ xserver-xorg-input-all (>= 0~) | xorg-driver-input,
+ xserver-xorg-input-evdev (>= 0~) [linux-any],
hal (>= 0.5.14-4~) [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
@@ -44,7 +44,15 @@ Depends:
x11-xkb-utils
Recommends:
libgl1-mesa-dri,
-Provides: xserver
+Provides:
+ xserver-xorg-renamed,
+ xserver,
+Replaces:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Conflicts:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
Description: X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server. It does not provide the actual server itself.
@@ -78,7 +86,7 @@ Description: X.Org X server -- input driver metapackage
Package: xorg
Architecture: any
Depends:
- xserver-xorg (>= ${binary:Version}),
+ xserver-xorg (>= ${binary:Version}) | xserver-xorg-renamed,
libgl1-mesa-glx | libgl1 [!armhf],
libgl1-mesa-dri [!armhf],
libglu1-mesa [!armhf],
Reply to: