diff -u mesa-6.4.1/debian/rules mesa-6.4.1/debian/rules
--- mesa-6.4.1/debian/rules
+++ mesa-6.4.1/debian/rules
@@ -44,8 +44,14 @@
 
 DRI_MODULE_DIR := /usr/lib/dri
 
-build: $(STAMPDIR)/build
-$(STAMPDIR)/build: $(BUILD_TARGETS)
+unpack: patch
+
+patch: $(STAMPDIR)/patch-stamp
+$(STAMPDIR)/patch-stamp:
+	patch -p1 < debian/patches/mesa-6.4.1-i945gm.patch && mkdir -p $(dir $@) && touch $@
+
+build: $(STAMPDIR)/build 
+$(STAMPDIR)/build: $(STAMPDIR)/patch-stamp $(BUILD_TARGETS) 
 	dh_testdir
 	mkdir -p $(dir $@) && touch $@
 
@@ -142,8 +148,10 @@
 clean:
 	dh_testdir
 	dh_testroot
-	$(RM) -rf debian/stamp
 	$(RM) -rf build
+	- test -f $(STAMPDIR)/patch-stamp && patch -r /dev/null -R -p1 < debian/patches/mesa-6.4.1-i945gm.patch && $(RM) $(STAMPDIR)/patch-stamp
+	$(RM) -rf debian/stamp
+
 	dh_clean
 
 install: build install-all
diff -u mesa-6.4.1/debian/changelog mesa-6.4.1/debian/changelog
--- mesa-6.4.1/debian/changelog
+++ mesa-6.4.1/debian/changelog
@@ -1,3 +1,9 @@
+mesa (6.4.1-0ubuntu7) dapper; urgency=low
+
+  * debian/patches/mesa-6.4.1-i945gm.patch  [Malone: #35741]
+
+ -- Paul Sladen <ubuntu@paul.sladen.org>  Thu, 23 Mar 2006 10:16:15 +0000
+
 mesa (6.4.1-0ubuntu6) dapper; urgency=low
 
   * Add BindTexImageExt stuff to the public includes
only in patch2:
unchanged:
--- mesa-6.4.1.orig/debian/patches/mesa-6.4.1-i945gm.patch
+++ mesa-6.4.1/debian/patches/mesa-6.4.1-i945gm.patch
@@ -0,0 +1,47 @@
+diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/i915_texstate.c mesa-6.4.1/src/mesa/drivers/dri/i915/i915_texstate.c
+--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/i915_texstate.c	2005-06-01 01:10:03.000000000 +0700
++++ mesa-6.4.1/src/mesa/drivers/dri/i915/i915_texstate.c	2006-03-19 20:47:20.000000000 +0700
+@@ -496,7 +496,8 @@
+    }
+ 
+ 
+-   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G)
++   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G
++       || i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
+       i945LayoutTextureImages( i915, tObj );	 
+    else
+       i915LayoutTextureImages( i915, tObj );
+diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.c mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.c
+--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.c	2005-09-10 23:44:26.000000000 +0700
++++ mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.c	2006-03-19 20:47:36.000000000 +0700
+@@ -118,6 +118,8 @@
+ 	 chipset = "Intel(R) 915GM"; break;
+       case PCI_CHIP_I945_G:
+ 	 chipset = "Intel(R) 945G"; break;
++      case PCI_CHIP_I945_GM:
++	 chipset = "Intel(R) 945GM"; break;
+       default:
+ 	 chipset = "Unknown Intel Chipset"; break;
+       }
+diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.h mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.h
+--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.h	2005-06-01 01:10:03.000000000 +0700
++++ mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.h	2006-03-19 20:48:58.000000000 +0700
+@@ -413,6 +413,7 @@
+ #define PCI_CHIP_I915_G			0x2582
+ #define PCI_CHIP_I915_GM		0x2592
+ #define PCI_CHIP_I945_G			0x2772
++#define PCI_CHIP_I945_GM		0x27A2
+ 
+ 
+ /* ================================================================
+diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_screen.c mesa-6.4.1/src/mesa/drivers/dri/i915/intel_screen.c
+--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_screen.c	2005-08-15 13:59:24.000000000 +0700
++++ mesa-6.4.1/src/mesa/drivers/dri/i915/intel_screen.c	2006-03-19 20:48:02.000000000 +0700
+@@ -340,6 +340,7 @@
+    case PCI_CHIP_I915_G:
+    case PCI_CHIP_I915_GM:
+    case PCI_CHIP_I945_G:
++   case PCI_CHIP_I945_GM:
+       return i915CreateContext( mesaVis, driContextPriv, 
+ 			       sharedContextPrivate );
+