mesa: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/control | 7 ++++---
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit f5137326912d800d3684ab25f2608e2dfd67765c
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Fri Jun 24 12:21:54 2011 +0200
Release 7.10.3-0ubuntu4
diff --git a/debian/changelog b/debian/changelog
index 9d0860a..d78bb4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-mesa (7.10.3-0ubuntu4) UNRELEASED; urgency=low
+mesa (7.10.3-0ubuntu4) oneiric; urgency=low
- *
+ * debian/control:
+ - Make the Breaks against the proprietary drivers versioned again now that
+ the proprietary drivers work well with multi-arch mesa. (LP: #798049)
- -- Alberto Milone <alberto.milone@canonical.com> Fri, 24 Jun 2011 12:08:21 +0200
+ -- Alberto Milone <alberto.milone@canonical.com> Fri, 24 Jun 2011 12:18:53 +0200
mesa (7.10.3-0ubuntu3) oneiric; urgency=low
commit 606eb684f987df70e2578bc14992e31d5423cc61
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Fri Jun 24 12:17:28 2011 +0200
Set versioned Breaks on fglrx and on the nvidia flavours
diff --git a/debian/control b/debian/control
index eebf3db..8597c39 100644
--- a/debian/control
+++ b/debian/control
@@ -394,9 +394,10 @@ Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
Breaks:
- nvidia-current,
- nvidia-173,
- fglrx,
+ nvidia-current (<= 275.09.07-0ubuntu1),
+ nvidia-96 (<= 96.43.19-0ubuntu8),
+ nvidia-173 (<= 173.14.30-0ubuntu2),
+ fglrx (<= 2:8.850-0ubuntu1),
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX runtime
commit 1e82b0ff59aabc1ce6f38ca5298cabb060164dc2
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Fri Jun 24 12:10:05 2011 +0200
Start work on 7.10.3-0ubuntu4
diff --git a/debian/changelog b/debian/changelog
index d51ff74..9d0860a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.10.3-0ubuntu4) UNRELEASED; urgency=low
+
+ *
+
+ -- Alberto Milone <alberto.milone@canonical.com> Fri, 24 Jun 2011 12:08:21 +0200
+
mesa (7.10.3-0ubuntu3) oneiric; urgency=low
* debian/rules:
Reply to: