[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-mga: Changes to 'debian-unstable'



 debian/changelog |    6 ++++++
 debian/control   |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8c4a7df16d4d10d96a3641a218479961b905500c
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 13:51:36 2007 +0300

    Replaces/Conflicts: xserver-xorg-driver-mga.

diff --git a/debian/changelog b/debian/changelog
index 652b492..fac9232 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) UNRELEASED; urgency=low
+
+  * Replaces/Conflicts: xserver-xorg-driver-mga.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 13:40:18 +0300
+
 xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-2) unstable; urgency=low
 
   * Build package non-native.
diff --git a/debian/control b/debian/control
index fab4d1e..3bdba08 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-mga
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-mga
+Conflicts: xserver-xorg-driver-mga
 Description: X.Org X server -- MGA display driver
  This package provides the driver for the Matrox MGA family of chipsets,
  including Matrox Millennium and Mystique cards.



Reply to: