[Pkg-kde-commits] rev 1839 - branches/kde-3.4.0/packages/kdepim/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-09-21 17:40:25 +0000 (Wed, 21 Sep 2005)
New Revision: 1839

Modified:
   branches/kde-3.4.0/packages/kdepim/debian/changelog
   branches/kde-3.4.0/packages/kdepim/debian/control
   branches/kde-3.4.0/packages/kdepim/debian/rules
Log:
Preparing kdepim 3.4.2-2:
  * Build with g++-3.4 on arm, m68k and hppa. Closes: #327594
  * Add kitchensync as a dependency of kdepim-dev. Closes: #327159


Modified: branches/kde-3.4.0/packages/kdepim/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-09-21 04:35:03 UTC (rev 1838)
+++ branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-09-21 17:40:25 UTC (rev 1839)
@@ -1,3 +1,12 @@
+kdepim (4:3.4.2-2) unstable; urgency=medium
+
+  +++ Changes by Adeodato Simó:
+
+  * Build with g++-3.4 on arm, m68k and hppa. Closes: #327594
+  * Add kitchensync as a dependency of kdepim-dev. Closes: #327159
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 21 Sep 2005 17:45:43 +0200
+
 kdepim (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/kde-3.4.0/packages/kdepim/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/control	2005-09-21 04:35:03 UTC (rev 1838)
+++ branches/kde-3.4.0/packages/kdepim/debian/control	2005-09-21 17:40:25 UTC (rev 1839)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>
-Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
 Standards-Version: 3.6.2
 
@@ -22,7 +22,7 @@
 Package: kdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra0-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra0-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.

Modified: branches/kde-3.4.0/packages/kdepim/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/rules	2005-09-21 04:35:03 UTC (rev 1838)
+++ branches/kde-3.4.0/packages/kdepim/debian/rules	2005-09-21 17:40:25 UTC (rev 1839)
@@ -78,5 +78,18 @@
 	debian/kdepim-kresources/usr/lib/libkabc_xmlrpc.so.1.* \
 	-dDepends
 
+###
+
+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
+
+###
+
 test-shlibdeps:
 	@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact)