xserver-xorg-video-neomagic: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 7ae09696144f2b705889a9cf7d14a5a70f5edbe4
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:53:44 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-neomagic.
diff --git a/debian/changelog b/debian/changelog
index e693280..e877c4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.1.1-6) UNRELEASED; urgency=low
+
+ * Replaces/Conflicts: xserver-xorg-driver-neomagic.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:53:09 +0300
+
xserver-xorg-video-neomagic (1:1.1.1-5) unstable; urgency=high
* Add link to xserver-xorg-core bug script, so that bugreports contain
diff --git a/debian/control b/debian/control
index 1b01ec3..ddb5271 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-neomagic
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-neomagic
+Conflicts: xserver-xorg-driver-neomagic
Description: X.Org X server -- Neomagic display driver
This package provides the driver for Neomagic MagicGraph chipsets, which are
commonly found in laptops.
Reply to: