From c54701549f2f78ba0197a57dd243ec1a5e00f653 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Sun, 10 Jul 2011 01:16:58 +0200
Subject: [PATCH 3/8] Support upgrades from squeeze and to wheezy.
---
debian/changelog | 4 ++++
debian/control | 18 +++---------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4a839e6..3984743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ mesa (7.11.2~bpo-1+1) UNRELEASED; urgency=low
updates), making it just delete “/$(DEB_HOST_MULTIARCH)”.
- Remove Multi-Arch and Pre-Depends fields.
- Revert debhelper version bump accordingly.
+ * Support upgrades from squeeze and to wheezy:
+ - Remove all Breaks, only needed when multiarch support got added.
+ - Add Provides: libgl1-mesa-*-no-multiarch to handle upgrades to
+ wheezy (which has multiarch support).
-- Anisse Astier <anisse@astier.eu> Fri, 30 Mar 2012 12:08:10 +0200
diff --git a/debian/control b/debian/control
index 7aaff94..ae0d12f 100644
--- a/debian/control
+++ b/debian/control
@@ -463,10 +463,7 @@ Depends:
Recommends: libgl1-mesa-dri (>= 7.2)
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Provides: libgl1
-Breaks:
- libgl1-nvidia-alternatives (<= 275.09.07-1),
- fglrx-glx (<< 1:11-6-1),
+Provides: libgl1, libgl1-mesa-glx-no-multiarch
Description: free implementation of the OpenGL API -- GLX runtime
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -530,12 +527,7 @@ Depends:
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1)
-Breaks:
- xserver-xorg-core (<< 2:1.10.2-2),
- xserver-xorg-core-no-multiarch,
- libgl1-mesa-glx (<< 7.10.2-4),
- libgl1-mesa-glx-no-multiarch,
- libgl1-mesa-dri-experimental (<< 7.11.1),
+Provides: libgl1-mesa-dri-no-multiarch
Description: free implementation of the OpenGL API -- DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -577,11 +569,7 @@ Depends:
${shlibs:Depends},
libgl1-mesa-dri (>= 7.11.1) [linux-any],
${misc:Depends},
-Breaks:
- xserver-xorg-core (<< 2:1.10.2-2),
- xserver-xorg-core-no-multiarch,
- libgl1-mesa-glx (<< 7.11.1),
- libgl1-mesa-glx-no-multiarch,
+Provides: libgl1-mesa-dri-no-multiarch
Description: free implementation of the OpenGL API -- Extra DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
--
1.7.9.4