debian/changelog | 8 ++++++++
debian/control | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 72d2896d01ea0ad8161397ea856355ea038fdbd2
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Jun 30 19:26:08 2009 +0300
control: Add Conflicts/Replaces hal (<= 0.5.12+git20090626-0ubuntu1)
because xserver-xorg ships the callout script now (and the fdi file too).
diff --git a/debian/changelog b/debian/changelog
index 8b5ce7a..d427447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.4+3ubuntu2) karmic; urgency=low
+
+ * control: Add Conflicts/Replaces hal (<= 0.5.12+git20090626-0ubuntu1)
+ because xserver-xorg ships the callout script now (and the fdi file
+ too).
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Jun 2009 19:22:08 +0300
+
xorg (1:7.4+3ubuntu1) karmic; urgency=low
* Merge from Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index c4a5a24..086d7c7 100644
--- a/debian/control
+++ b/debian/control
@@ -81,8 +81,8 @@ Description: X Window System (X.Org) infrastructure
Package: xserver-xorg
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)
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7),
x11-common (<< 1:7.3+11), hal (<= 0.5.12+git20090626-0ubuntu1)
+Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11), hal (<=
0.5.12+git20090626-0ubuntu1)
Depends:
xserver-xorg-core (>= 2:1.5.99.901),
xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia
m32r m68k mips mipsel powerpc sparc],
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
