diff -Nru graphviz-2.26.3/debian/changelog graphviz-2.26.3/debian/changelog
--- graphviz-2.26.3/debian/changelog	2011-12-17 12:10:58.000000000 +0000
+++ graphviz-2.26.3/debian/changelog	2012-04-02 15:08:41.000000000 +0000
@@ -1,3 +1,26 @@
+graphviz (2.26.3-10ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - debian/patches/linkage: Add more explicit library linkage to cope with
+      'ld --no-copy-dt-needed-entries'.
+    - Build using dh_python2.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 02 Apr 2012 16:08:26 +0100
+
+graphviz (2.26.3-10) unstable; urgency=low
+
+  * Fixes for compatibility with Automake 1.11.2 (Closes: #661909)
+  * Changed BD from libpng12-dev to libpng-dev (Closes: #662360)
+
+ -- David Claughton <dave@eclecticdave.com>  Tue, 13 Mar 2012 20:35:21 +0000
+
+graphviz (2.26.3-9) unstable; urgency=low
+
+  * Include patch by Samuel Thibault to handle autotools failure on hurd
+    (Closes: #648520)
+
+ -- Christoph Egger <christoph@debian.org>  Sun, 01 Jan 2012 15:35:06 +0100
+
 graphviz (2.26.3-8ubuntu2) precise; urgency=low
 
   * Build using dh_python2
diff -Nru graphviz-2.26.3/debian/control graphviz-2.26.3/debian/control
--- graphviz-2.26.3/debian/control	2011-12-17 12:11:42.000000000 +0000
+++ graphviz-2.26.3/debian/control	2012-04-02 15:07:47.000000000 +0000
@@ -12,7 +12,7 @@
  libfreetype6-dev,
  zlib1g-dev,
  libjpeg-dev,
- libpng12-dev,
+ libpng-dev,
  libxaw7-dev,
  bison,
  flex,
diff -Nru graphviz-2.26.3/debian/gbp.conf graphviz-2.26.3/debian/gbp.conf
--- graphviz-2.26.3/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ graphviz-2.26.3/debian/gbp.conf	2012-03-14 23:18:03.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = 2.26-maint
+upstream-branch = upstream
+pristine-tar = True
+filter = debian
+cleaner =
+
diff -Nru graphviz-2.26.3/debian/patches/automake_1.11.2_fixes graphviz-2.26.3/debian/patches/automake_1.11.2_fixes
--- graphviz-2.26.3/debian/patches/automake_1.11.2_fixes	1970-01-01 00:00:00.000000000 +0000
+++ graphviz-2.26.3/debian/patches/automake_1.11.2_fixes	2012-03-14 23:18:03.000000000 +0000
@@ -0,0 +1,35 @@
+Index: graphviz/plugin/ming/Makefile.am
+===================================================================
+--- graphviz.orig/plugin/ming/Makefile.am	2010-03-20 18:09:15.000000000 +0000
++++ graphviz/plugin/ming/Makefile.am	2012-03-05 22:35:16.000000000 +0000
+@@ -1,6 +1,8 @@
+ # $Id: Makefile.am,v 1.16 2009/06/03 01:10:57 ellson Exp $ $Revision: 1.16 $
+ ## Process this file with automake to produce Makefile.in
+ 
++pkgfontdir = ${pkgdatadir}/font
++
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+@@ -17,7 +19,7 @@
+ else
+ pkglib_LTLIBRARIES = libgvplugin_ming.la
+ endif
+-pkglib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
++pkgfont_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
+ endif
+ 
+ libgvplugin_ming_C_la_SOURCES = \
+Index: graphviz/tclpkg/gv/Makefile.am
+===================================================================
+--- graphviz.orig/tclpkg/gv/Makefile.am	2012-03-05 22:35:16.000000000 +0000
++++ graphviz/tclpkg/gv/Makefile.am	2012-03-05 22:35:16.000000000 +0000
+@@ -242,7 +242,7 @@
+ gv_tcl.cpp: gv.i
+ 	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
+ 
+-pkginclude_DATA = gv.i gv.cpp
++pkginclude_HEADERS = gv.i gv.cpp
+ pkglib_LTLIBRARIES = 
+ man_MANS =
+ pdf_DATA = 
diff -Nru graphviz-2.26.3/debian/patches/fix-hurd-autotools graphviz-2.26.3/debian/patches/fix-hurd-autotools
--- graphviz-2.26.3/debian/patches/fix-hurd-autotools	1970-01-01 00:00:00.000000000 +0000
+++ graphviz-2.26.3/debian/patches/fix-hurd-autotools	2012-03-14 23:18:03.000000000 +0000
@@ -0,0 +1,48 @@
+--- graphviz-2.26.3/m4/libtool.m4	2010-01-26 17:00:58.000000000 +0100
++++ graphviz-2.26.3/m4/libtool.m4	2011-11-12 15:20:27.000000000 +0100
+@@ -2334,16 +2334,6 @@
+   esac
+   ;;
+ 
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
+-
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -2445,7 +2435,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | gnu*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -3037,10 +3027,6 @@
+   fi
+   ;;
+ 
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+@@ -3075,7 +3061,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
diff -Nru graphviz-2.26.3/debian/patches/series graphviz-2.26.3/debian/patches/series
--- graphviz-2.26.3/debian/patches/series	2011-11-18 09:52:35.000000000 +0000
+++ graphviz-2.26.3/debian/patches/series	2012-04-02 15:07:59.000000000 +0000
@@ -11,4 +11,6 @@
 3_minor_fixes_to_dot_manpage
 0_python_27_support
 fix-kfreebsd-chroots
+fix-hurd-autotools
+automake_1.11.2_fixes
 linkage