diff -Nru libdispatch-0~svn197/debian/changelog libdispatch-0~svn197/debian/changelog
--- libdispatch-0~svn197/debian/changelog	2012-07-09 18:06:11.000000000 +0100
+++ libdispatch-0~svn197/debian/changelog	2013-05-12 13:08:22.000000000 +0100
@@ -1,3 +1,14 @@
+libdispatch (0~svn197-3.1+rpi1) wheezy-staging; urgency=low
+
+  * Adopt fixes uploaded to ubuntu quantal by Colin Watson.
+    - Strip --param=ssp-buffer-size=4 from CFLAGS; clang doesn't support it
+      and so we end up omitting Blocks support.
+    - Strip -fstack-protector from CFLAGS; this causes a link failure with
+      clang on at least some architectures.
+    - Fix build with 'ld --no-add-needed'.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 12 May 2013 12:07:26 +0000
+
 libdispatch (0~svn197-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -5,6 +16,16 @@
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Tue, 10 Jul 2012 02:05:06 +0900
 
+libdispatch (0~svn197-3ubuntu1) precise; urgency=low
+
+  * Strip --param=ssp-buffer-size=4 from CFLAGS; clang doesn't support it
+    and so we end up omitting Blocks support (LP: #935090).
+  * Strip -fstack-protector from CFLAGS; this causes a link failure with
+    clang on at least some architectures.
+  * Fix build with 'ld --no-add-needed'.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 23 Apr 2012 13:43:20 +0100
+
 libdispatch (0~svn197-3) unstable; urgency=low
 
   * Replace individual patches with a combined libdispatch-r197_v2 patch.
diff -Nru libdispatch-0~svn197/debian/control libdispatch-0~svn197/debian/control
--- libdispatch-0~svn197/debian/control	2011-05-24 04:13:43.000000000 +0100
+++ libdispatch-0~svn197/debian/control	2013-05-12 13:24:39.000000000 +0100
@@ -1,7 +1,7 @@
 Source: libdispatch
 Priority: extra
 Maintainer: Mark Heily <mark@heily.com>
-Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, libblocksruntime0, libblocksruntime-dev, libkqueue0, libkqueue-dev, libpthread-workqueue-dev, autotools-dev, pkg-config, libtool, clang (>= 2.8) 
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 7.0.50~), dh-autoreconf, libblocksruntime0, libblocksruntime-dev, libkqueue0, libkqueue-dev, libpthread-workqueue-dev, autotools-dev, pkg-config, libtool, clang (>= 2.8) 
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://libdispatch.macosforge.org/
diff -Nru libdispatch-0~svn197/debian/patches/series libdispatch-0~svn197/debian/patches/series
--- libdispatch-0~svn197/debian/patches/series	2012-07-09 18:10:58.000000000 +0100
+++ libdispatch-0~svn197/debian/patches/series	2013-05-12 13:03:36.000000000 +0100
@@ -1,3 +1,4 @@
 libdispatch-r197_v2.patch
 disable_dispatch_read.patch
 avoid-mfence-on-i386.patch
+testing-linkage.patch
diff -Nru libdispatch-0~svn197/debian/patches/testing-linkage.patch libdispatch-0~svn197/debian/patches/testing-linkage.patch
--- libdispatch-0~svn197/debian/patches/testing-linkage.patch	1970-01-01 01:00:00.000000000 +0100
+++ libdispatch-0~svn197/debian/patches/testing-linkage.patch	2013-05-12 13:03:36.000000000 +0100
@@ -0,0 +1,19 @@
+Description: Fix build with 'ld --no-add-needed'
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/660671
+Forwarded: no
+Last-Update: 2012-04-23
+
+Index: b/testing/Makefile.am
+===================================================================
+--- a/testing/Makefile.am
++++ b/testing/Makefile.am
+@@ -81,7 +81,7 @@
+ noinst_PROGRAMS+=$(TOOLS)
+ 
+ INCLUDES=-I$(top_builddir) -I$(top_srcdir)
+-LDADD=libtest.la ../src/libdispatch.la
++LDADD=libtest.la ../src/libdispatch.la ../src/libshims.la
+ CFLAGS=-Wall $(MARCH_FLAGS) $(CBLOCKS_FLAGS)
+ CXXFLAGS=-Wall $(MARCH_FLAGS) $(CXXBLOCKS_FLAGS)
+ 
diff -Nru libdispatch-0~svn197/debian/rules libdispatch-0~svn197/debian/rules
--- libdispatch-0~svn197/debian/rules	2011-06-29 03:08:06.000000000 +0100
+++ libdispatch-0~svn197/debian/rules	2013-05-12 13:03:36.000000000 +0100
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export CFLAGS := $(shell DEB_CFLAGS_MAINT_STRIP='-fstack-protector --param=ssp-buffer-size=4' dpkg-buildflags --get CFLAGS)
+
 #override_dh_auto_configure:
 #	CC=clang ./configure --prefix=/usr