-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.
Cheers
Luk
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFDQPtm5UTeB5t8Mo0RAnAgAKC7A7wPsp0D33U+s1ufzRo1nPNY1wCeJKYw
msNuCVhphcQlB9Rz6DrNeeE=
=+S9P
-----END PGP SIGNATURE-----
diff -u apollon-1.0.1/debian/changelog apollon-1.0.1/debian/changelog
--- apollon-1.0.1/debian/changelog
+++ apollon-1.0.1/debian/changelog
@@ -1,3 +1,10 @@
+apollon (1.0.1-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use g++-3.4 on arm, hppa and m68k (Closes: #331395).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Mon, 3 Oct 2005 11:24:52 +0200
+
apollon (1.0.1-2.1) unstable; urgency=high
* Non-maintainer upload.
diff -u apollon-1.0.1/debian/control apollon-1.0.1/debian/control
--- apollon-1.0.1/debian/control
+++ apollon-1.0.1/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Bruno Sant'Anna <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.0), cdbs, autotools-dev, gettext,
libgift-dev, kdelibs4-dev
+Build-Depends: g++-3.4 [arm hppa m68k], debhelper (>= 4.1.0), cdbs,
autotools-dev, gettext, libgift-dev, kdelibs4-dev
Standards-Version: 3.6.1
Package: apollon
diff -u apollon-1.0.1/debian/rules apollon-1.0.1/debian/rules
--- apollon-1.0.1/debian/rules
+++ apollon-1.0.1/debian/rules
@@ -2,6 +2,19 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
+###
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+ export CC=gcc-3.4
+ export CPP=cpp-3.4
+ export CXX=g++-3.4
+endif
+
+###
+
# Unfortunate hack until upstream uses make distcheck.
clean::
rm -f po/*.gmo
