xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++--
debian/control | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 4c96b490a601d5b94c54f18e1521ae97a836d826
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 18:09:41 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index b72b020..09ad810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.10.2-2) UNRELEASED; urgency=low
+xorg-server (2:1.10.2-2) unstable; urgency=low
* Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the
odds of having a server built against multiarched mesa, installed
@@ -8,7 +8,7 @@ xorg-server (2:1.10.2-2) UNRELEASED; urgency=low
early, add a Breaks against pre-multiarch libgl1-mesa-dri and
libgl1-mesa-dri-experimental.
- -- Cyril Brulebois <kibi@debian.org> Thu, 16 Jun 2011 03:39:16 +0200
+ -- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 18:09:36 +0200
xorg-server (2:1.10.2-1) unstable; urgency=low
commit 9217a81d3fd5f40fc563dcbeba2d19a56a431cb8
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 18:09:11 2011 +0200
Add Breaks against pre-multiarch libgl1-mesa-dri* packages.
diff --git a/debian/changelog b/debian/changelog
index 0ab21e0..b72b020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xorg-server (2:1.10.2-2) UNRELEASED; urgency=low
odds of having a server built against multiarched mesa, installed
along a pre-multiarch mesa. The Breaks in mesa packages take care of
the other way round already.
+ * And since the server's binNMU managed to migrate to testing way too
+ early, add a Breaks against pre-multiarch libgl1-mesa-dri and
+ libgl1-mesa-dri-experimental.
-- Cyril Brulebois <kibi@debian.org> Thu, 16 Jun 2011 03:39:16 +0200
diff --git a/debian/control b/debian/control
index 25c6cfa..a164787 100644
--- a/debian/control
+++ b/debian/control
@@ -111,6 +111,8 @@ Breaks:
xserver-xorg-input-tslib (<= 0.0.6-3),
xserver-xorg-input-vmmouse (<= 1:12.6.5-4),
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
+ libgl1-mesa-dri (<< 7.10.2-4),
+ libgl1-mesa-dri-experimental (<< 7.10.2-4),
Provides:
${videoabi},
${inputabi},
Reply to: