mesa: Changes to 'master'
configs/debian | 4 ++--
configs/debian-static | 4 ++--
debian/changelog | 24 ++++++++++++++++++++++++
debian/control | 2 +-
4 files changed, 29 insertions(+), 5 deletions(-)
New commits:
commit 6da132343758c4c02c3765ac59b2c4abdf00dbdb
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 3 16:59:06 2007 +0100
* Non-maintainer upload.
* Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
(closes: #394311). Thanks to Michel Dänzer for the fix, and to Ryan
Richter for the report and testing.
diff --git a/configs/debian b/configs/debian
index 793fb60..2af0d1f 100644
--- a/configs/debian
+++ b/configs/debian
@@ -7,9 +7,9 @@ CXX = c++
DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS `pkg-config --cflags x11 xext`
-DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fPIC
+DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fPIC -fno-strict-aliasing
-DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fPIC
+DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fPIC -fno-strict-aliasing
DEBIAN_OPT_CFLAGS = -O2
diff --git a/configs/debian-static b/configs/debian-static
index 0b5318e..95e4d69 100644
--- a/configs/debian-static
+++ b/configs/debian-static
@@ -7,9 +7,9 @@ CXX = c++
DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall
+DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fno-strict-aliasing
-DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall
+DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fno-strict-aliasing
DEBIAN_OPT_CFLAGS = -O2
diff --git a/debian/changelog b/debian/changelog
index 2e6676f..6586376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (6.5.1-0.5) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
+ (closes: #394311). Thanks to Michel Dänzer for the fix, and to Ryan
+ Richter for the report and testing.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 3 Jan 2007 13:48:20 +0100
+
mesa (6.5.1-0.4) unstable; urgency=medium
* Non-maintainer upload (and brown paper bag release).
commit 1dd29785cf6f9dd593118920fe767b5a4dbb0de0
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 3 13:43:46 2007 +0100
Import changes from the mesa 6.5.1-0.4 NMU.
diff --git a/debian/changelog b/debian/changelog
index 6c395f4..2e6676f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (6.5.1-0.4) unstable; urgency=medium
+
+ * Non-maintainer upload (and brown paper bag release).
+ * _Depend_ on libx11-dev from libgl1-mesa-dev; revert previous change.
+ Fixes FTBFS in other packages. (Really Closes: #396498)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Sat, 11 Nov 2006 13:55:20 +0100
+
mesa (6.5.1-0.3) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 83a9056..8217fb8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Mesa package maintainers <pkg-mesa-devel@lists.alioth.debian.org>
Uploaders: Marcelo E. Magallon <mmagallo@debian.org>
Standards-Version: 3.7.2
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19), libx11-dev
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19)
Package: libgl1-mesa-swx11
Section: libs
@@ -99,7 +99,7 @@ Description: A free implementation of th
Package: libgl1-mesa-dev
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (= ${binary:Version})
+Depends: ${shlibs:Depends}, libx11-dev, libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (= ${binary:Version})
Conflicts: libgl-dev, libgl1-mesa-dri-dev
Replaces: libgl-dev, libgl1-mesa-dri-dev
Provides: libgl-dev, libgl1-mesa-dri-dev
commit 5681987ee4b981fd2e741a804d4fe1a4a350a521
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 3 13:41:57 2007 +0100
Import changes from the mesa 6.5.1-0.3 NMU.
diff --git a/debian/changelog b/debian/changelog
index 7473aee..6c395f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (6.5.1-0.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build-depend on libx11-dev; fixes FTBFS. (Closes: #396498)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Wed, 8 Nov 2006 20:58:40 +0100
+
mesa (6.5.1-0.2) unstable; urgency=low
* Non-maintainer upload
diff --git a/debian/control b/debian/control
index 7dcc1ef..83a9056 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Mesa package maintainers <pkg-mesa-devel@lists.alioth.debian.org>
Uploaders: Marcelo E. Magallon <mmagallo@debian.org>
Standards-Version: 3.7.2
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19)
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19), libx11-dev
Package: libgl1-mesa-swx11
Section: libs
Reply to: