# 
# 
# patch "ChangeLog"
#  from [72a27cd5fa3c5e7cd66ba4eb93e023a6006c4f93]
#    to [f040f117852df3ad9a640f04d9afac4ff23f9f2b]
# 
# patch "debian/changelog"
#  from [9c13bec1232cf7afa36bfbdc6388f4023aa790ca]
#    to [a3f4ddb644b8e0c6d514f7ae4d75a5a858d857b9]
# 
# patch "debian/rules"
#  from [fe72fe2cb65bfb118258945b73978e05c506a700]
#    to [19b4613248d9c253f2deb508895525077544e550]
# 
============================================================
--- ChangeLog	72a27cd5fa3c5e7cd66ba4eb93e023a6006c4f93
+++ ChangeLog	f040f117852df3ad9a640f04d9afac4ff23f9f2b
@@ -1,3 +1,12 @@
+2006-04-18  Richard Levitte  <address@hidden>
+
+	This change was contributed by Shaun Jackman <address@hidden>
+
+	* debian/changelog: Add missing Debian releases.
+
+	* debian/rules: From Debian bug report #334999: FTBFS on
+	arm/hppa/m68k: please use g++-3.4
+
 2006-04-15  Matthew Gregan  <address@hidden>
 
 	* tests/t_pidfile_log_permissions.at: Minor tweak to last change.
============================================================
--- debian/changelog	9c13bec1232cf7afa36bfbdc6388f4023aa790ca
+++ debian/changelog	a3f4ddb644b8e0c6d514f7ae4d75a5a858d857b9
@@ -30,12 +30,33 @@
 
  -- Nathaniel Smith <address@hidden>  Thu, 29 Dec 2005 13:28:11 -0800
 
+monotone (0.24-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tomas Fasth <address@hidden>  Sun, 18 Dec 2005 23:30:28 +0000
+
 monotone (0.24-0.1) unstable; urgency=low
 
   * New upstream release.
 
  -- Nathaniel Smith <address@hidden>  Sat, 26 Nov 2005 17:33:48 -0800
 
+monotone (0.23-4) unstable; urgency=low
+
+  * Applied a patch from Frank to actually make things work as intended.
+  * Closes: #334999: FTBFS on arm/hppa/m68k: please use g++-3.4
+
+ -- Tomas Fasth <address@hidden>  Sun, 23 Oct 2005 23:25:09 +0000
+
+monotone (0.23-3) unstable; urgency=low
+
+  * The build script is now configured to explicitly use g++-3.4 for arm,
+    hppa and m68k architectures as requested by Frank Lichtenheld.
+  * Closes: #334999: FTBFS on arm/hppa/m68k: please use g++-3.4
+
+ -- Tomas Fasth <address@hidden>  Sat, 22 Oct 2005 16:46:26 +0000
+
 monotone (0.23-2) unstable; urgency=low
 
   * Arm, hppa and m68k is now build-depending on g++-3.4
============================================================
--- debian/rules	fe72fe2cb65bfb118258945b73978e05c506a700
+++ debian/rules	19b4613248d9c253f2deb508895525077544e550
@@ -1,6 +1,13 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq (,$(filter $(DEB_HOST_ARCH),$(GCC4_ICES_HERE)))
+	DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-3.4 CXX=g++-3.4
+endif