debian/changelog | 6 ++++++
debian/control | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 36e347779852ff821bb372d578ca02c09d2e5026
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Mon Mar 16 15:55:52 2015 +0100
Use conflicts/replaces on modesetting.
Irony, as of this writing I will have to add a new
xserver-xorg-video-modesetting and undo this commit.
diff --git a/debian/changelog b/debian/changelog
index 071545d..bfa06d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
+
+ * Use conflicts/replaces on modesetting.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 12 Mar 2015
16:56:38 +0100
+
xorg-server (2:1.17.1-0ubuntu1) vivid; urgency=medium
* Merge with 1.17 branch.
diff --git a/debian/control b/debian/control
index 908135f..1f23b0c 100644
--- a/debian/control
+++ b/debian/control
@@ -143,10 +143,10 @@ Breaks:
xserver-xorg-video-vga (<= 1:4.1.0-8),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
- xserver-xorg-video-modesetting (<< 0.10),
Replaces:
- xserver-xorg-video-modesetting (<< 0.10),
+ xserver-xorg-video-modesetting,
Conflicts:
+ xserver-xorg-video-modesetting,
xserver-xorg-input-evtouch,
Provides:
${videoabi},
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yxwrq-0004je...@moszumanska.debian.org
