debian/changelog | 10 +++++++++- debian/control | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 6d5792f641fa606aa11b0a1b61af0d920561ad89 Author: Maarten Lankhorst <[email protected]> Date: Tue Sep 24 10:19:27 2013 +0200 Import xorg package from saucy. diff --git a/debian/changelog b/debian/changelog index 45b24b3..95151ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg (1:7.7+1ubuntu5) raring; urgency=low + + * Allow xserver-xorg-core-omap-revert and xserver-xorg-video-omap-revert to + satisfy depends on armhf. + - Allows building a custom armhf server there. + + -- Maarten Lankhorst <[email protected]> Tue, 07 May 2013 16:29:10 +0200 + xorg (1:7.7+1ubuntu4) quantal; urgency=low [ Maarten Lankhorst ] diff --git a/debian/control b/debian/control index 04fe8e0..b699c03 100644 --- a/debian/control +++ b/debian/control @@ -33,8 +33,8 @@ Description: X Window System (X.Org) infrastructure Package: xserver-xorg Architecture: any Depends: - xserver-xorg-core (>= 2:1.11), - xserver-xorg-video-all | xorg-driver-video, + 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], hal (>= 0.5.14-4~) [kfreebsd-any], -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]

