diff -Nru unity-6.4.0/CMakeLists.txt unity-6.4.0/CMakeLists.txt
--- unity-6.4.0/CMakeLists.txt	2012-08-31 21:45:54.000000000 +0000
+++ unity-6.4.0/CMakeLists.txt	2012-09-03 00:34:13.000000000 +0000
@@ -17,16 +17,13 @@
 set (CMAKE_CXX_FLAGS_DEBUG "-g3")
 set (CMAKE_CXX_FLAGS_RELEASE "")
 
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
+if (BUILD_GLES)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
     set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm")
 else ()
     set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
 endif ()
 
-if (BUILD_GLES)
-	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
-endif (BUILD_GLES)
-
 #
 # Niceties
 #
diff -Nru unity-6.4.0/dash/previews/CMakeLists.txt unity-6.4.0/dash/previews/CMakeLists.txt
--- unity-6.4.0/dash/previews/CMakeLists.txt	2012-08-31 21:45:54.000000000 +0000
+++ unity-6.4.0/dash/previews/CMakeLists.txt	2012-09-03 00:34:13.000000000 +0000
@@ -10,13 +10,13 @@
      "-I${CMAKE_CURRENT_BINARY_DIR}"
      )
 
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
   set (CFLAGS ${CFLAGS} "-fPIC")
-endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
 
 add_definitions (${CFLAGS})
 
-set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
+set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD})
 link_libraries (${LIBS})
 
 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
diff -Nru unity-6.4.0/debian/changelog unity-6.4.0/debian/changelog
--- unity-6.4.0/debian/changelog	2012-09-02 17:20:43.000000000 +0000
+++ unity-6.4.0/debian/changelog	2012-09-03 01:02:51.000000000 +0000
@@ -1,3 +1,13 @@
+unity (6.4.0-0ubuntu4) quantal-proposed; urgency=low
+
+  * CMakeLists.txt: Make the GL/GLU linking conditional on BUILD_GLES,
+    rather than based on uname, so it actually matches GLES settings.
+  * dash/previews/CMakeLists.txt: Cargo-cult linking options from other
+    modules for both -fPIC and UNITY_STANDALONE_LADD, fixing ARM/GLES.
+  * debian/rules: Remove crazy per-arch quilt madness and drop patches.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 02 Sep 2012 18:34:29 -0600
+
 unity (6.4.0-0ubuntu3) quantal-proposed; urgency=low
 
   * no-change rebuild to pick up nux-dev gles bits on armel/armhf 
diff -Nru unity-6.4.0/debian/patches/disable_standalone-clients.patch unity-6.4.0/debian/patches/disable_standalone-clients.patch
--- unity-6.4.0/debian/patches/disable_standalone-clients.patch	2012-04-19 14:32:36.000000000 +0000
+++ unity-6.4.0/debian/patches/disable_standalone-clients.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e01c178..7e3a4f5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -156,7 +156,7 @@ add_subdirectory(tests)
- add_subdirectory(tools)
- add_subdirectory(UnityCore)
- add_subdirectory(guides)
--add_subdirectory(standalone-clients EXCLUDE_FROM_ALL)
-+#add_subdirectory(standalone-clients EXCLUDE_FROM_ALL)
diff -Nru unity-6.4.0/debian/patches/series.armel unity-6.4.0/debian/patches/series.armel
--- unity-6.4.0/debian/patches/series.armel	2012-04-19 14:32:36.000000000 +0000
+++ unity-6.4.0/debian/patches/series.armel	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-disable_standalone-clients.patch
diff -Nru unity-6.4.0/debian/patches/series.armhf unity-6.4.0/debian/patches/series.armhf
--- unity-6.4.0/debian/patches/series.armhf	2012-04-19 14:32:36.000000000 +0000
+++ unity-6.4.0/debian/patches/series.armhf	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-disable_standalone-clients.patch
diff -Nru unity-6.4.0/debian/rules unity-6.4.0/debian/rules
--- unity-6.4.0/debian/rules	2012-09-01 20:07:26.000000000 +0000
+++ unity-6.4.0/debian/rules	2012-09-03 01:02:24.000000000 +0000
@@ -18,25 +18,6 @@
 
 LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' )
 
-override_dh_quilt_patch:
-	dh_quilt_patch
-	if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
-	  pc=".pc.$(DEB_HOST_ARCH)"; \
-	  test -d "$(CURDIR)/$$pc" || mkdir "$(CURDIR)/$$pc"; \
-	  cp debian/patches/series.$(DEB_HOST_ARCH) $(CURDIR)/$$pc/series; \
-	  cd $(CURDIR); \
-	  QUILT_PC="$$pc" quilt upgrade || true; \
-	  QUILT_PC="$$pc" QUILT_PATCHES="debian/patches/" quilt push -a || true; \
-	fi; \
-
-override_dh_quilt_unpatch:
-	if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
-	  pc=".pc.$(DEB_HOST_ARCH)"; \
-	  cd $(CURDIR); \
-	  QUILT_PC="$$pc" QUILT_PATCHES="debian/patches/" quilt pop -a || true; \
-	fi; \
-	dh_quilt_unpatch
-
 override_dh_auto_configure:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON