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

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



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

New commits:
commit ccd4953790d9f0a01d9a121a7eb47717a9df25d3
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 13:18:37 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 071558d..4cdaa18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xserver-xorg-video-glint (1:1.1.1-6) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add patch to replace non-ascii character in glint(4) with the equivalent
     groff escape sequence.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 22 Apr 2007 05:19:34 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-glint.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 13:17:46 +0300
 
 xserver-xorg-video-glint (1:1.1.1-5) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 635ff4a..3ad068b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-glint
 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-glint
+Conflicts: xserver-xorg-driver-glint
 Description: X.Org X server -- Glint display driver
  This package provides the driver for the Texas Instruments/3DLabs Glint and
  Permedia series of video cards.



Reply to: