summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Brulebois <kibi@debian.org>2011-07-09 12:32:43 +0200
committerCyril Brulebois <kibi@debian.org>2011-07-09 12:32:43 +0200
commit1aa2c1564a80f2e13ba03ab2d5b0c173209c9c1d (patch)
tree614de8974460b81513d618b59d12d474bf181733
parent1af7dd506e6a785d865a65fce682ae5025643175 (diff)
Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from squeeze-backports (without multiarch) to wheezy (with multiarch).
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d4d9fdb57..4d744bbaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.10.3-1) UNRELEASED; urgency=low
* New upstream release (with just a version bump).
* Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
+ * Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from
+ squeeze-backports (without multiarch) to wheezy (with multiarch).
-- Cyril Brulebois <kibi@debian.org> Sat, 09 Jul 2011 12:16:29 +0200
diff --git a/debian/control b/debian/control
index 8d520be22..1ea69565c 100644
--- a/debian/control
+++ b/debian/control
@@ -113,6 +113,7 @@ Breaks:
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
+ libgl1-mesa-dri-no-multiarch,
Provides:
${videoabi},
${inputabi},