summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorJulien Cristau <[email protected]>2007-04-25 01:48:33 +0200
committerJulien Cristau <[email protected]>2007-04-25 01:48:33 +0200
commit6f2b0fe4638cf838cbcc852777abc35794154399 (patch)
treead3d447e40878716b0b63859869e1051462e90ed /debian
parent0c69176498fa8b7c6126d7b0dd96b9c4994dfe1f (diff)
New upstream release candidate.
Refresh a couple patches.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/01_fix-makefile.patch8
-rw-r--r--debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch8
3 files changed, 13 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index cf425d3105a..bd193f271a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (6.5.3~rc2-1) UNRELEASED; urgency=low
+mesa (6.5.3~rc3-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
@@ -11,11 +11,12 @@ mesa (6.5.3~rc2-1) UNRELEASED; urgency=low
07_call_radeonSetCliprects_from_radeonMakeCurrent.patch,
08_r300_update_window_state_when_bound_but_stamp_changed.patch,
09_i915_always_enable_pixel_fog.patch: remove, included upstream.
+ + 01_fix-makefile.patch, 02_use-ieee-fp-on-s390-and-m68k.patch: refresh.
* Add build-dependencies on libxdamage-dev and libxfixes-dev.
* Resync debian/scripts/install-source.sh.
* Build mesa-swx11-source only in binary-indep.
- -- Julien Cristau <[email protected]> Sun, 22 Apr 2007 01:06:39 +0200
+ -- Julien Cristau <[email protected]> Wed, 25 Apr 2007 01:46:10 +0200
mesa (6.5.2-5) UNRELEASED; urgency=low
diff --git a/debian/patches/01_fix-makefile.patch b/debian/patches/01_fix-makefile.patch
index 6711d2fe5cd..41c1c707df4 100644
--- a/debian/patches/01_fix-makefile.patch
+++ b/debian/patches/01_fix-makefile.patch
@@ -3,9 +3,11 @@ OSMesa in a separate package.
This patch by Thierry Reding.
---- a/src/mesa/Makefile
-+++ b/src/mesa/Makefile
-@@ -107,7 +107,7 @@
+Index: mesa/src/mesa/Makefile
+===================================================================
+--- mesa.orig/src/mesa/Makefile 2007-04-25 01:44:31.000000000 +0200
++++ mesa/src/mesa/Makefile 2007-04-25 01:44:58.000000000 +0200
+@@ -105,7 +105,7 @@
$(OSMESA_DRIVER_OBJECTS)
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
index f54457521c5..ddc71983b1e 100644
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -2,9 +2,11 @@ Patch that fixes Debian bug #349437.
This patch by David Nusinow.
---- a/src/mesa/main/imports.h
-+++ b/src/mesa/main/imports.h
-@@ -155,8 +155,9 @@
+Index: mesa/src/mesa/main/imports.h
+===================================================================
+--- mesa.orig/src/mesa/main/imports.h 2007-04-25 01:44:31.000000000 +0200
++++ mesa/src/mesa/main/imports.h 2007-04-25 01:45:04.000000000 +0200
+@@ -158,8 +158,9 @@
*** USE_IEEE: Determine if we're using IEEE floating point
***/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \