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

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

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

New commits:
commit 75fd7a13949466d5434a6fe12c91ca4c1273b65e
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 12:49:59 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 94a1e17..1dae1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-apm (1:1.1.1-7) UNRELEASED; urgency=low
+
+  * Replaces/Conflicts: xserver-xorg-driver-apm.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 12:46:13 +0300
+
 xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 224a1a7..ffc3ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-apm
 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-apm
+Conflicts: xserver-xorg-driver-apm
 Description: X.Org X server -- APM display driver
  This package provides the driver for the Alliance Pro Motion family
  of video cards; specifically, the 6420, 6422, AT24, AT25, and AT3D