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

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



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

New commits:
commit ea3af12fc9b4d0cb9f34f9d86e581abc92b4f90f
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Fri May 4 18:14:15 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 1606fc8..7830e83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ xserver-xorg-video-suncg14 (1:1.1.0-4) UNRELEASED; urgency=low
   * Remove Fabio from uploaders with his permission. He's always welcome back.
   * Pull upstream manpage fix e37c03efea954f675961f2b1babbfb0787f4d3c9
 
- -- Brice Goglin <Brice.Goglin@ens-lyon.org>  Tue, 01 May 2007 14:00:20 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-suncg14.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Fri,  4 May 2007 18:13:35 +0300
 
 xserver-xorg-video-suncg14 (1:1.1.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9db174c..391fd5e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-suncg14
 Architecture: sparc
 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-suncg14
+Conflicts: xserver-xorg-driver-suncg14
 Description: X.Org X server -- Sun CG14 display driver
  This package provides the driver for Sun CG14 video devices.
  .



Reply to: