mesa: Changes to 'debian-unstable'
debian/changelog | 13 +++++++++++--
debian/control | 34 +++++++++++++++++++++++++---------
2 files changed, 36 insertions(+), 11 deletions(-)
New commits:
commit 6ea68e0bdf6f3868e00c2773a7af0998fdafeac1
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 14 12:21:08 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 13083dd..cb134aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.2-4) UNRELEASED; urgency=low
+mesa (7.10.2-4) unstable; urgency=low
[ Steve Langasek ]
* Build for multiarch.
@@ -12,7 +12,7 @@ mesa (7.10.2-4) UNRELEASED; urgency=low
* Update Uploaders list. Thanks, David and Brice!
* Wrap Build-Depends.
- -- Julien Cristau <jcristau@debian.org> Sun, 12 Jun 2011 17:49:06 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 14 Jun 2011 12:19:33 +0200
mesa (7.10.2-3) unstable; urgency=low
commit fb938f971d4048dca3593aae41e41f58f2723914
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 14 12:18:56 2011 +0200
Wrap Build-Depends.
diff --git a/debian/changelog b/debian/changelog
index a2b9c9b..13083dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mesa (7.10.2-4) UNRELEASED; urgency=low
take care of getting the server ready.
* Many thanks for multiarch, Steve!
* Update Uploaders list. Thanks, David and Brice!
+ * Wrap Build-Depends.
-- Julien Cristau <jcristau@debian.org> Sun, 12 Jun 2011 17:49:06 +0200
diff --git a/debian/control b/debian/control
index 2b6828f..12706bc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,29 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config,
- libdrm-dev (>= 2.4.24) [!hurd-i386], libx11-dev, xutils-dev,
- x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
- libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.15.6), libxfixes-dev,
- libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1),
+Build-Depends:
+ debhelper (>= 8.1.3),
+ quilt (>= 0.40),
+ pkg-config,
+ libdrm-dev (>= 2.4.24) [!hurd-i386],
+ libx11-dev,
+ xutils-dev,
+ x11proto-gl-dev (>= 1.4.11),
+ libxxf86vm-dev,
+ libexpat1-dev,
+ lesstif2-dev,
+ dpkg-dev (>= 1.15.6),
+ libxfixes-dev,
+ libxdamage-dev,
+ libxext-dev,
+ autoconf,
+ automake,
+ x11proto-dri2-dev (>= 2.1),
linux-libc-dev (>= 2.6.31) [linux-any],
- libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
+ libx11-xcb-dev,
+ libxcb-dri2-0-dev,
+ libxcb-xfixes0-dev,
+ python-libxml2,
libudev-dev [linux-any],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
commit dde7959466198aa8cc0b5ca5d379a3eaa8684412
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 14 12:16:09 2011 +0200
Update Uploaders list. Thanks, David and Brice!
diff --git a/debian/changelog b/debian/changelog
index 939fc54..a2b9c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ mesa (7.10.2-4) UNRELEASED; urgency=low
changed for multiarch, so the server needs be rebuilt; a binNMU will
take care of getting the server ready.
* Many thanks for multiarch, Steve!
+ * Update Uploaders list. Thanks, David and Brice!
-- Julien Cristau <jcristau@debian.org> Sun, 12 Jun 2011 17:49:06 +0200
diff --git a/debian/control b/debian/control
index a4f3251..2b6828f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mesa
Section: graphics
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.4.24) [!hurd-i386], libx11-dev, xutils-dev,
commit f681ce44e16bcb1824b8720f1d07ce6865d40e2c
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 14 12:15:38 2011 +0200
Many thanks for multiarch, Steve!
diff --git a/debian/changelog b/debian/changelog
index 552704e..939fc54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (7.10.2-4) UNRELEASED; urgency=low
server queries the DRI driver path at build time, which is getting
changed for multiarch, so the server needs be rebuilt; a binNMU will
take care of getting the server ready.
+ * Many thanks for multiarch, Steve!
-- Julien Cristau <jcristau@debian.org> Sun, 12 Jun 2011 17:49:06 +0200
commit bafef15d40757228fef5cd5231fb6dc69455bb18
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 14 11:38:49 2011 +0200
Document the Breaks.
diff --git a/debian/changelog b/debian/changelog
index 561d45a..552704e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ mesa (7.10.2-4) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Cyril Brulebois ]
+ * Explanation of the “Breaks: xserver-xorg-core” part for our users: the
+ server queries the DRI driver path at build time, which is getting
+ changed for multiarch, so the server needs be rebuilt; a binNMU will
+ take care of getting the server ready.
+
-- Julien Cristau <jcristau@debian.org> Sun, 12 Jun 2011 17:49:06 +0200
mesa (7.10.2-3) unstable; urgency=low
commit 1b0834a0c7388b9c1b8207652efe08330fc768b6
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 14 11:34:26 2011 +0200
Adjust Breaks on xserver-xorg-core again.
Apparently, a binNMU is sufficient to get the server fixed.
diff --git a/debian/control b/debian/control
index 0c15837..a4f3251 100644
--- a/debian/control
+++ b/debian/control
@@ -454,7 +454,7 @@ Depends:
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0)
-Breaks: xserver-xorg-core (<< 2:1.10.2-2), libgl1-mesa-glx (<< 7.10.2-4)
+Breaks: xserver-xorg-core (<= 2:1.10.2-1), libgl1-mesa-glx (<< 7.10.2-4)
Multi-Arch: same
Description: free implementation of the OpenGL API -- DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -496,7 +496,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
-Breaks: xserver-xorg-core (<< 2:1.10.2-2), libgl1-mesa-glx (<< 7.10.2-4)
+Breaks: xserver-xorg-core (<= 2:1.10.2-1), libgl1-mesa-glx (<< 7.10.2-4)
Multi-Arch: same
Description: free implementation of the OpenGL API -- Extra DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
Reply to: