xserver-xorg-video-nsc: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/control | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 87fdb12a8368a4322fd9001631716c996e17bd1d
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 14:06:27 2007 +0300
Err, make sure to conflict/replace -nsc.
diff --git a/debian/control b/debian/control
index a5e60bf..5d0fe8e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Package: xserver-xorg-video-nsc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-newport
-Conflicts: xserver-xorg-driver-newport
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-nsc
+Conflicts: xserver-xorg-driver-nsc
Description: X.Org X server -- NSC display driver
This package provides the driver for the National Semiconductor Geode chipsets.
.
commit d9715fcbdd39fd695e4f11986810d19905ccfea3
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 14:04:20 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-nsc.
diff --git a/debian/changelog b/debian/changelog
index 97206ee..65912d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-nsc (1:2.8.1-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
the user's config and log files.
* Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
versions don't have the bug script.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:30:42 +0100
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-nsc.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:02:24 +0300
xserver-xorg-video-nsc (1:2.8.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ef5f876..a5e60bf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-nsc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
Provides: xserver-xorg-video-1.0
-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 -- NSC display driver
This package provides the driver for the National Semiconductor Geode chipsets.
.
Reply to: