xorg: Changes to 'ubuntu'
debian/changelog | 8 ++++++--
debian/control | 6 +++---
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit b3fe2c2306e142604d06de25359ffb6230179dcc
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Nov 2 14:22:47 2010 -0700
Committing raof's last changes (appear to have not gotten to git)
diff --git a/debian/changelog b/debian/changelog
index 046b61b..7207b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
+xorg (1:7.5+6ubuntu3) maverick; urgency=low
+ [ Bryce Harrington ]
* debian/apport/source_xorg.py:
+ Include .drirc if present
+ Include gconf's /desktop/gnome/peripherals data
@@ -8,7 +9,10 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
+ Add source package apport hook for xorg-server. Otherwise,
apport-collect fails when used on bugs against xorg-server package.
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 13 Jul 2010 06:16:10 -0700
+ [ Christopher James Halse Rogers ]
+ * Depend on xserver 1.9RC5, bump video and input ABI's
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 09 Aug 2010 20:34:00 +1000
xorg (1:7.5+6ubuntu2) maverick; urgency=low
diff --git a/debian/control b/debian/control
index 4499706..fa14a4a 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.8),
- xserver-xorg-video-all | xserver-xorg-video-7,
- xserver-xorg-input-all | xserver-xorg-input-9,
+ xserver-xorg-core (>= 2:1.8.99.905),
+ xserver-xorg-video-all | xserver-xorg-video-8,
+ xserver-xorg-input-all | xserver-xorg-input-11,
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},
Reply to: