debian/changelog | 8 ++++++++
debian/control | 6 ++++--
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 909afc5304a24499b64579122bcc07abdb5747a3
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 18 22:28:35 2009 +0200
Adjust libgl1-mesa-glx and libgl1-mesa-dri package relationships
Drop the dependency on libgl1-mesa-glx from -dri, and make -glx
recommend -dri instead. The dri drivers are also loaded by the X
server, which doesn't need libGL. On the other hand, libGL needs one of
the dri drivers for direct rendering (either software or hardware).
Mark libgl1-mesa-dri as breaking old xserver-xorg-core and
libgl1-mesa-glx, to avoid incompatibilities.
diff --git a/debian/changelog b/debian/changelog
index d17afc8..d4ca359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ mesa (7.4-3) UNRELEASED; urgency=low
* Install pkgconfig files for libGLU, libOSMesa and libGLw.
* Make libgl1-mesa-dri 'Architecture: any', as swrast_dri.so should get
built everywhere.
+ * Drop the dependency on libgl1-mesa-glx from -dri, and make -glx recommend
+ -dri instead. The dri drivers are also loaded by the X server, which
+ doesn't need libGL. On the other hand, libGL needs one of the dri drivers
+ for direct rendering (either software or hardware). Mark libgl1-mesa-dri
+ as breaking old xserver-xorg-core and libgl1-mesa-glx, to avoid
+ incompatibilities.
-- Julien Cristau <jcris...@debian.org> Wed, 15 Apr 2009 19:25:50 +0200
diff --git a/debian/control b/debian/control
index e012ca6..eeec53b 100644
--- a/debian/control
+++ b/debian/control
@@ -106,6 +106,7 @@ Package: libgl1-mesa-glx
Section: libs
Architecture: any
Depends: ${shlibs: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
@@ -164,10 +165,11 @@ Package: libgl1-mesa-dri
Section: libs
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
+Depends: ${shlibs:Depends}
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0)
+Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2)
Description: A 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
commit 4deb679b420fb97c80c2fb4a271f796ec256e119
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 18 22:27:47 2009 +0200
Make libgl1-mesa-dri 'Architecture: any'
swrast_dri.so should get built everywhere.
diff --git a/debian/changelog b/debian/changelog
index afdc88c..d17afc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (7.4-3) UNRELEASED; urgency=low
rid of uninstallability when a new upstream version isn't built on all
architectures, and allows us to ship potentially arch-specific .pc files.
* Install pkgconfig files for libGLU, libOSMesa and libGLw.
+ * Make libgl1-mesa-dri 'Architecture: any', as swrast_dri.so should get
+ built everywhere.
-- Julien Cristau <jcris...@debian.org> Wed, 15 Apr 2009 19:25:50 +0200
diff --git a/debian/control b/debian/control
index 97ef61e..e012ca6 100644
--- a/debian/control
+++ b/debian/control
@@ -163,7 +163,7 @@ Description: Debugging symbols for the Mesa GLX runtime
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 lpia m68k mips mipsel powerpc s390 sparc
+Architecture: any
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
