debian/changelog |    6 +++++-
 debian/control   |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit acf6b453bf96256921d58f3a87b6ad5b994bac3d
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Tue Apr 24 14:01:12 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 9b701e9..99234c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xserver-xorg-video-newport (1:0.2.1-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add patch to replace non-ascii character in newport(4) with equivalent
     groff escape sequence.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Sun, 22 Apr 2007 04:13:58 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-newport.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 14:00:49 +0300
 
 xserver-xorg-video-newport (1:0.2.1-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 38c0bc4..0ee096a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-newport
 Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips 
mipsel netbsd-i386 powerpc
 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-newport
+Conflicts: xserver-xorg-driver-newport
 Description: X.Org X server -- Newport display driver
  This package provides the driver for the Newport family of chipsets integrated
  in SGI Indy and Indy2 machines.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to