[Monotone-devel] [PATCH] monotone's Debian package

[Shaun Jackman]

Monotone's debian/ directory is out of sync with the source
distributed by Debian. Please apply this patch, which was authored by
Tomas Fasth <address@hidden>. This patch is against monotone 0.24;
the changelog will need to be merged by hand.

http://ftp.debian.org/debian/pool/main/m/monotone/monotone_0.24-1.diff.gz

Thanks,
Shaun

--- monotone-0.24.orig/debian/rules
+++ monotone-0.24/debian/rules
@@ -4,3 +4,10 @@
 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
--- monotone-0.24.orig/debian/changelog
+++ monotone-0.24/debian/changelog
@@ -1,9 +1,30 @@
+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