diff -Nru xorg-7.7+1ubuntu8/debian/changelog xorg-7.7+1ubuntu8.1/debian/changelog --- xorg-7.7+1ubuntu8/debian/changelog 2014-01-29 15:07:46.000000000 +0000 +++ xorg-7.7+1ubuntu8.1/debian/changelog 2014-12-09 09:46:45.000000000 +0000 @@ -1,3 +1,9 @@ +xorg (1:7.7+1ubuntu8.1) trusty-proposed; urgency=medium + + * Fixup the xorg packages to work correctly with the renamed lts stack. + + -- Maarten Lankhorst Thu, 09 Oct 2014 11:55:01 +0200 + xorg (1:7.7+1ubuntu8) trusty; urgency=low [ Bryce Harrington ] diff -Nru xorg-7.7+1ubuntu8/debian/control xorg-7.7+1ubuntu8.1/debian/control --- xorg-7.7+1ubuntu8/debian/control 2014-01-29 15:07:24.000000000 +0000 +++ xorg-7.7+1ubuntu8.1/debian/control 2014-10-09 09:46:05.000000000 +0000 @@ -34,9 +34,9 @@ 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 @@ 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 @@ 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],