diff -u the-3.1/debian/changelog the-3.1/debian/changelog
--- the-3.1/debian/changelog
+++ the-3.1/debian/changelog
@@ -1,3 +1,12 @@
+the (3.1-5ubuntu1) intrepid; urgency=low
+
+  * Sync with Debian (LP: #240894), additional changes required.
+  * Patch rexx.c using quilt to fix FTBFS on Intrepid.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Tue, 17 Jun 2008 23:46:42 +0100
+
 the (3.1-5) unstable; urgency=low
 
   * Adjusted debian/rules to comply with the latest bash brace
@@ -8,6 +17,14 @@
 
  -- Alen Zekulic <azekulic@fesb.hr>  Fri, 09 May 2008 21:55:30 +0200
 
+the (3.1-4ubuntu1) gutsy; urgency=low
+
+  * debian/rules: Remove bashism.
+  * debian/control: Modify Maintainer value to match
+    DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 03 Sep 2007 19:08:24 +0200
+
 the (3.1-4) unstable; urgency=low
 
   * Added sharutils to Build-Depends (closes: #251909).
diff -u the-3.1/debian/control the-3.1/debian/control
--- the-3.1/debian/control
+++ the-3.1/debian/control
@@ -1,8 +1,9 @@
 Source: the
 Section: editors
 Priority: optional
-Maintainer: Alen Zekulic <azekulic@fesb.hr>
-Build-Depends: libncurses5-dev, regina3-dev, regina-rexx, sharutils
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alen Zekulic <azekulic@fesb.hr>
+Build-Depends: libncurses5-dev, regina3-dev, regina-rexx, sharutils, quilt
 Standards-Version: 3.7.3
 
 Package: the
diff -u the-3.1/debian/rules the-3.1/debian/rules
--- the-3.1/debian/rules
+++ the-3.1/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 SHELL=/bin/bash
 
 package=the
@@ -7,7 +9,7 @@
 CCOPTS="-O2 -g"
 
 build: stamp-build stamp-doc
-stamp-build: stamp-configure
+stamp-build: stamp-configure $(QUILT_STAMPFN)
 	$(checkdir)
 	$(MAKE) CFLAGS=$(CCOPTS) the THE_Help.txt
 	touch stamp-build
@@ -26,7 +28,7 @@
 
 doc: stamp-doc
 
-clean:
+clean: unpatch
 	$(checkdir)
 	-rm -f stamp-build stamp-configure stamp-doc
 	[ ! -f Makefile ] || $(MAKE) distclean
only in patch2:
unchanged:
--- the-3.1.orig/debian/patches/series
+++ the-3.1/debian/patches/series
@@ -0,0 +1 @@
+gcc4.3-open-parameters
only in patch2:
unchanged:
--- the-3.1.orig/debian/patches/gcc4.3-open-parameters
+++ the-3.1/debian/patches/gcc4.3-open-parameters
@@ -0,0 +1,16 @@
+Index: the-3.1/rexx.c
+===================================================================
+--- the-3.1.orig/rexx.c	2008-06-17 23:01:57.816172627 +0100
++++ the-3.1/rexx.c	2008-06-17 23:02:06.276172567 +0100
+@@ -1820,11 +1820,7 @@
+    {
+       if (err)
+       {
+-#if defined(UNIX)
+-         if ((errfd = open(errfile,O_RDWR|O_CREAT|O_TRUNC)) == (-1))
+-#else
+          if ((errfd = open(errfile,O_RDWR|O_CREAT|O_TRUNC,S_IWRITE|S_IREAD)) == (-1))
+-#endif
+          {
+             TRACE_RETURN();
+             return(RC_ACCESS_DENIED+1000);