configs/debian-default | 4 ++++
debian/changelog | 13 +++++++++++--
debian/control | 2 +-
src/mesa/shader/slang/library/slang_version_syn.h | 0
4 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit d39147a8a192d56798737cd254353546be2d2dbb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Feb 7 23:13:59 2007 +0100
Fix FTBFS on amd64.
Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to
Marc 'HE' Brockschmidt for the report (closes: #410118).
diff --git a/configs/debian-default b/configs/debian-default
index d13e551..aa4721a 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -5,6 +5,10 @@ CONFIG_NAME = debian-default
OPT_FLAGS = -O2 -g
CFLAGS += -fno-strict-aliasing
+# override settings in configs/linux-x86-64
+LIB_DIR = lib
+EXTRA_LIB_PATH =
+
SRC_DIRS = mesa
PROGRAM_DIRS =
diff --git a/debian/changelog b/debian/changelog
index 9744a89..e9446fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (6.5.2-3) experimental; urgency=low
+
+ * Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
+ settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to
+ Marc 'HE' Brockschmidt for the report (closes: #410118).
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 7 Feb 2007 23:04:28 +0100
+
mesa (6.5.2-2) experimental; urgency=low
* Sync Section/Priority for all packages with the override.
commit 7991f7e9366bf82adffd3d0d4761f1eebd3997d9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Feb 4 21:17:18 2007 +0100
* Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index f9f9b54..9744a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-mesa (6.5.2-2) UNRELEASED; urgency=low
+mesa (6.5.2-2) experimental; urgency=low
* Sync Section/Priority for all packages with the override.
* Build the arch:all debs in binary-indep, and use the debhelper -s option
for commands in binary-arch, to fix FTBFS on non-i386 archs, thanks to
Marc 'HE' Brockschmidt (closes: #409638).
+ * Add myself to Uploaders.
- -- Julien Cristau <[EMAIL PROTECTED]> Sun, 4 Feb 2007 17:17:50 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 4 Feb 2007 21:14:02 +0100
mesa (6.5.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 91419e5..5ac6522 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mesa
Section: graphics
Priority: optional
Maintainer: Debian X Strike Force <[email protected]>
-Uploaders: Thierry Reding <[EMAIL PROTECTED]>
+Uploaders: Thierry Reding <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>=
2.2.0) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.8),
libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19)
diff --git a/src/mesa/shader/grammar/grammar_crt.c
b/src/mesa/shader/grammar/grammar_crt.c
old mode 100755
new mode 100644
diff --git a/src/mesa/shader/grammar/grammar_crt.h
b/src/mesa/shader/grammar/grammar_crt.h
old mode 100755
new mode 100644
diff --git a/src/mesa/shader/shaderobjects_3dlabs.c
b/src/mesa/shader/shaderobjects_3dlabs.c
old mode 100755
new mode 100644
diff --git a/src/mesa/shader/shaderobjects_3dlabs.h
b/src/mesa/shader/shaderobjects_3dlabs.h
old mode 100755
new mode 100644
diff --git a/src/mesa/shader/slang/library/gc_to_bin.c
b/src/mesa/shader/slang/library/gc_to_bin.c
old mode 100755
new mode 100644
diff --git a/src/mesa/shader/slang/library/slang_version_syn.h
b/src/mesa/shader/slang/library/slang_version_syn.h
old mode 100755
new mode 100644
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
