Update to latest upstream release candidate.

Update patches.

5 files changed, 10 insertions, 40 deletions

diff --git a/debian/changelog b/debian/changelog
index 16f6303982c..59de3401145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (6.5.2~rc1-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * Update patches:
+    + Drop hunk #2 of 01_fix-makefile.patch, applied upstream.
+    + Drop 03_handle-sync-and-dont-unlock-display.patch, applied upstream.
+
+ -- Thierry Reding <thierry@gilfi.de>  Sat, 18 Nov 2006 18:52:55 +0100
+
 mesa (6.5.1-1) experimental; urgency=low
 
   * Provide i686 optimized versions in libgl1-mesa-swx11-i686.
diff --git a/debian/patches/01_fix-makefile.patch b/debian/patches/01_fix-makefile.patch
index f599d8438e1..6711d2fe5cd 100644
--- a/debian/patches/01_fix-makefile.patch
+++ b/debian/patches/01_fix-makefile.patch
@@ -1,11 +1,7 @@
 Do not build OSMesa for a standalone configuration, since Debian only ships
 OSMesa in a separate package.
 
-Fix Mesa makefile to install the libGL and libOSMesa libraries when they
-exist, not only depending on configuration.
-
 This patch by Thierry Reding.
-Hunk #2 submitted to Mesa and applied (post 6.5.1).
 
 --- a/src/mesa/Makefile
 +++ b/src/mesa/Makefile
@@ -18,17 +14,3 @@ Hunk #2 submitted to Mesa and applied (post 6.5.1).
  
  osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
  
-@@ -154,7 +154,12 @@
- 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
- 	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
- 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
--	$(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR)
-+	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
-+		$(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(GL_LIB).* $(INSTALL_DIR)/$(LIB_DIR); \
-+	fi
-+	@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
-+		$(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(OSMESA_LIB).* $(INSTALL_DIR)/$(LIB_DIR); \
-+	fi
- 	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
- 		cd drivers/dri ; $(MAKE) install ; \
- 	fi
diff --git a/debian/patches/03_handle-sync-and-dont-unlock-display.patch b/debian/patches/03_handle-sync-and-dont-unlock-display.patch
deleted file mode 100644
index d29769e4330..00000000000
--- a/debian/patches/03_handle-sync-and-dont-unlock-display.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch that fixes Debian bug #391681.
-
-This patch by Josh Triplett.
-Submitted to Mesa and applied (post 6.5.1).
-
---- a/src/glx/x11/glxext.c
-+++ b/src/glx/x11/glxext.c
-@@ -1016,11 +1016,11 @@
- 	if (!_XReply(dpy, (xReply*) &reply, 0, False)) {
- 	    /* Something is busted. Punt. */
- 	    UnlockDisplay(dpy);
-+	    SyncHandle();
- 	    FreeScreenConfigs(priv);
- 	    return GL_FALSE;
- 	}
- 
--	UnlockDisplay(dpy);
- 	if (!reply.numVisuals) {
- 	    /* This screen does not support GL rendering */
- 	    UnlockDisplay(dpy);
diff --git a/debian/patches/04_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch
index 66a4771003b..66a4771003b 100644
--- a/debian/patches/04_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
diff --git a/debian/patches/series b/debian/patches/series
index 327a78f2151..b370d514349 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 00_create-libdir.patch
 01_fix-makefile.patch
 02_use-ieee-fp-on-s390-and-m68k.patch
-03_handle-sync-and-dont-unlock-display.patch
-04_optional-progs-and-install.patch
+03_optional-progs-and-install.patch