debian/changelog | 7 +++++++ debian/control | 2 ++ 2 files changed, 9 insertions(+)
New commits: commit b15db4ee1224819f2d1f23f2d6d4d713fb13068a Author: Timo Aaltonen <tjaal...@debian.org> Date: Tue Jul 5 01:54:11 2016 +0300 control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl. (LP: #1574320) diff --git a/debian/changelog b/debian/changelog index b31bc7c..429139c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium + + * control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl. + (LP: #1574320) + + -- Timo Aaltonen <tjaal...@debian.org> Tue, 05 Jul 2016 01:53:51 +0300 + xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium * debian/patches/xmir.patch: diff --git a/debian/control b/debian/control index 629be03..9f5e9f0 100644 --- a/debian/control +++ b/debian/control @@ -156,10 +156,12 @@ Breaks: xserver-xorg (<< 1:7.7+10~), systemd (<< 226-4~), Replaces: + xserver-xorg-video-glamoregl, xserver-xorg-video-modesetting, xserver-xorg (<< 1:7.7+10~), Conflicts: xserver-xorg-input-evtouch, + xserver-xorg-video-glamoregl, xserver-xorg-video-modesetting, Provides: ${videoabi},