[PATCH RFC 3/7] Support upgrades from squeeze and to wheezy.
Based on Cyril Brulebois's mesa 7.10 backport for squeeze.
---
debian/changelog | 4 ++++
debian/control | 18 +++---------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8046b19..f8963a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ mesa (8.0.4~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> Thu, 03 May 2012 15:50:15 +0200
diff --git a/debian/control b/debian/control
index 89b9c1a..7296cb8 100644
--- a/debian/control
+++ b/debian/control
@@ -505,10 +505,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
@@ -572,12 +569,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
@@ -619,11 +611,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.10.3
Reply to: