-----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) iD8DBQFDP62X5UTeB5t8Mo0RAvEcAKCjIzde0wVSQz6uq1OzOkpQPmeFjACgw8G0 45ZLv6LHzH8O3D4aN/BAkC4= =qQ9F -----END PGP SIGNATURE-----
diff -u kdesdk-3.4.2/debian/changelog kdesdk-3.4.2/debian/changelog --- kdesdk-3.4.2/debian/changelog +++ kdesdk-3.4.2/debian/changelog @@ -1,3 +1,10 @@ +kdesdk (4:3.4.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build-dep on g++-3.4 on arm, hppa and m68k (closes:#330934). + + -- Luk Claes <[EMAIL PROTECTED]> Sat, 1 Oct 2005 20:21:41 +0200 + kdesdk (4:3.4.2-2) unstable; urgency=low * Built against libfam-dev, not libgamin-dev (closes: #326547). diff -u kdesdk-3.4.2/debian/control kdesdk-3.4.2/debian/control --- kdesdk-3.4.2/debian/control +++ kdesdk-3.4.2/debian/control @@ -2,7 +2,7 @@ Section: kde Priority: optional Maintainer: Ben Burton <[EMAIL PROTECTED]> -Build-Depends: automake1.7, binutils-dev, bison, debhelper (>> 4.0.0), flex, kdelibs4-dev (>= 4:3.4.2), kdepim-dev (>= 4:3.4.2), libapr0-dev, libdb4.2-dev, libkcal2-dev (>= 4:3.4.2), libktnef1-dev (>= 4:3.4.2), libsvn0-dev +Build-Depends: g++-3.4 [arm hppa m68k], automake1.7, binutils-dev, bison, debhelper (>> 4.0.0), flex, kdelibs4-dev (>= 4:3.4.2), kdepim-dev (>= 4:3.4.2), libapr0-dev, libdb4.2-dev, libkcal2-dev (>= 4:3.4.2), libktnef1-dev (>= 4:3.4.2), libsvn0-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.6.2.1 diff -u kdesdk-3.4.2/debian/rules kdesdk-3.4.2/debian/rules --- kdesdk-3.4.2/debian/rules +++ kdesdk-3.4.2/debian/rules @@ -16,6 +16,19 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +### + +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 + +### + INSTALL_DIR = install -p -d -o root -g root -m 755 INSTALL_FILE = install -p -o root -g root -m 644 INSTALL_BIN = install -p -o root -g root -m 755
