debian/changelog | 3 ++- debian/control | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit dfeb8b43652acf7ca92eee0001a288efba810bcd Author: Robert Hooker <[email protected]> Date: Sun Jun 6 21:11:20 2010 -0400 Depend on xserver 1.8, bump video and input ABI's. diff --git a/debian/changelog b/debian/changelog index 2df55a7..7b6b821 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xorg (1:7.5+6ubuntu1) maverick; urgency=low * Merge from Debian unstable. + * Depend on xserver 1.8, bump video and input ABI's. - -- Robert Hooker <[email protected]> Fri, 04 Jun 2010 20:23:22 -0400 + -- Robert Hooker <[email protected]> Sun, 06 Jun 2010 21:11:01 -0400 xorg (1:7.5+6) unstable; urgency=medium diff --git a/debian/control b/debian/control index 0d586ac..4499706 100644 --- a/debian/control +++ b/debian/control @@ -85,9 +85,9 @@ Architecture: any Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-common (<< 1:7.3+11) Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11) Depends: - xserver-xorg-core (>= 2:1.7), - xserver-xorg-video-all | xserver-xorg-video-6, - xserver-xorg-input-all | xserver-xorg-input-7, + xserver-xorg-core (>= 2:1.8), + xserver-xorg-video-all | xserver-xorg-video-7, + xserver-xorg-input-all | xserver-xorg-input-9, xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc], hal (>= 0.5.12~git20090406) [kfreebsd-any], ${shlibs:Depends}, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
