diff -Nru xiphos-3.2.2+dfsg1/debian/changelog xiphos-3.2.2+dfsg1/debian/changelog
--- xiphos-3.2.2+dfsg1/debian/changelog	2014-09-21 00:33:27.000000000 +0000
+++ xiphos-3.2.2+dfsg1/debian/changelog	2015-09-22 20:52:22.000000000 +0000
@@ -1,3 +1,9 @@
+xiphos (3.2.2+dfsg1-1+rpi1) stretch-staging; urgency=medium
+
+  * Increase max template depth to allow build with gcc 5 (Closes: 778183)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Sep 2015 20:51:59 +0000
+
 xiphos (3.2.2+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru xiphos-3.2.2+dfsg1/debian/patches/increase-template-depth.patch xiphos-3.2.2+dfsg1/debian/patches/increase-template-depth.patch
--- xiphos-3.2.2+dfsg1/debian/patches/increase-template-depth.patch	1970-01-01 00:00:00.000000000 +0000
+++ xiphos-3.2.2+dfsg1/debian/patches/increase-template-depth.patch	2015-09-22 20:56:22.000000000 +0000
@@ -0,0 +1,39 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ xiphos (3.2.2+dfsg1-1+rpi1) stretch-staging; urgency=medium
+ .
+   * Increase max template depth to allow build with gcc 5 (Closes: 778183)
+Author: Peter Michael Green <plugwash@raspbian.org>
+Bug-Debian: https://bugs.debian.org/778183
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- xiphos-3.2.2+dfsg1.orig/wscript
++++ xiphos-3.2.2+dfsg1/wscript
+@@ -199,8 +199,8 @@ def configure(conf):
+         env['CXXFLAGS']            = []
+         env['CXXFLAGS_OPTIMIZED']  = ['-O2']
+         env['CXXFLAGS_RELEASE']    = ['-O2']
+-        env['CXXFLAGS_DEBUG']      = ['-g', '-DDEBUG', '-ftemplate-depth-25']
+-        env['CXXFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG', '-ftemplate-depth-25']
++        env['CXXFLAGS_DEBUG']      = ['-g', '-DDEBUG', '-ftemplate-depth=250']
++        env['CXXFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG', '-ftemplate-depth=250']
+     
+     if env['IS_WIN32']:
+         ## setup for Winsock on Windows (required for read-aloud)
diff -Nru xiphos-3.2.2+dfsg1/debian/patches/series xiphos-3.2.2+dfsg1/debian/patches/series
--- xiphos-3.2.2+dfsg1/debian/patches/series	2014-09-21 00:33:27.000000000 +0000
+++ xiphos-3.2.2+dfsg1/debian/patches/series	2015-09-22 20:56:22.000000000 +0000
@@ -1 +1,2 @@
 
+increase-template-depth.patch