[Pkg-kde-commits] rev 1754 - in branches/kde-3.4.0/packages:
kdeaccessibility/debian kdetoys/debian kdeutils/debian
Luk Claes
luk at costa.debian.org
Fri Sep 9 22:58:20 UTC 2005
Author: luk
Date: 2005-09-09 22:58:19 +0000 (Fri, 09 Sep 2005)
New Revision: 1754
Modified:
branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog
branches/kde-3.4.0/packages/kdeaccessibility/debian/control
branches/kde-3.4.0/packages/kdeaccessibility/debian/rules
branches/kde-3.4.0/packages/kdetoys/debian/changelog
branches/kde-3.4.0/packages/kdetoys/debian/control
branches/kde-3.4.0/packages/kdetoys/debian/rules
branches/kde-3.4.0/packages/kdeutils/debian/changelog
branches/kde-3.4.0/packages/kdeutils/debian/control
branches/kde-3.4.0/packages/kdeutils/debian/rules
Log:
ICEs like the arts one...
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog 2005-09-09 22:58:19 UTC (rev 1754)
@@ -1,6 +1,11 @@
kdeaccessibility (4:3.4.2-2) unstable; urgency=low
+ +++ Changes by Luk Claes:
+
* Add new files to respective debian/*.install files
+
+ * Build with g++-3.4 on arm, m68k and hppa; kdeaccessibility triggers the same
+ gcc 4.0 ICE as arts does.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 2 Sep 2005 20:18:02 +0200
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/control 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/control 2005-09-09 22:58:19 UTC (rev 1754)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), gawk, gettext, sharutils, groff-base, kdelibs4-dev (>= 4:3.4.2), libxtst-dev, libgstreamer0.8-dev (>> 0.8.5), libgstreamer-plugins0.8-dev (>> 0.8.5), kdemultimedia-dev (>= 4:3.4.2), epos, flite, festival
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), gawk, gettext, sharutils, groff-base, kdelibs4-dev (>= 4:3.4.2), libxtst-dev, libgstreamer0.8-dev (>> 0.8.5), libgstreamer-plugins0.8-dev (>> 0.8.5), kdemultimedia-dev (>= 4:3.4.2), epos, flite, festival
Standards-Version: 3.6.2
Package: kdeaccessibility
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/rules 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/rules 2005-09-09 22:58:19 UTC (rev 1754)
@@ -13,5 +13,18 @@
DEB_DH_MAKESHLIBS_ARGS_kttsd := -V'kttsd (>= 4:3.4.2-1)'
DEB_DH_MAKESHLIBS_ARGS_ksayit := -V'ksayit (>= 4:3.4.2-1)'
+###
+
+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
+
+###
+
#shlibs_ver = 4:3.4.2-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdetoys/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-09-09 22:58:19 UTC (rev 1754)
@@ -1,3 +1,12 @@
+kdetoys (4:3.4.2-2) unstable; urgency=low
+
+ +++ Changes by Luk Claes:
+
+ * Build with g++-3.4 on arm, m68k and hppa; kdetoys triggers the same gcc 4.0
+ ICE as arts does.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 2 Sep 2005 20:18:02 +0200
+
kdetoys (4:3.4.2-1) unstable; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdetoys/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/control 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdetoys/debian/control 2005-09-09 22:58:19 UTC (rev 1754)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.2), gawk, gettext, sharutils
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.2), gawk, gettext, sharutils
Build-Conflicts: autoconf2.13
Standards-Version: 3.6.2
Modified: branches/kde-3.4.0/packages/kdetoys/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/rules 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdetoys/debian/rules 2005-09-09 22:58:19 UTC (rev 1754)
@@ -1,5 +1,18 @@
#! /usr/bin/make -f
+###
+
+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
+
+###
+
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include debian/cdbs/simple-patchsys.mk
Modified: branches/kde-3.4.0/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/changelog 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdeutils/debian/changelog 2005-09-09 22:58:19 UTC (rev 1754)
@@ -1,3 +1,12 @@
+kdeutils (4:3.4.2-2) unstable; urgency=low
+
+ +++ Changes by Luk Claes:
+
+ * Build with g++-3.4 on arm, m68k and hppa; kdeutils triggers the same gcc 4.0
+ ICE as arts does.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 2 Sep 2005 20:18:02 +0200
+
kdeutils (4:3.4.2-1) unstable; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdeutils/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/control 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdeutils/debian/control 2005-09-09 22:58:19 UTC (rev 1754)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libkonq4-dev (>= 4:3.4.2), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libkonq4-dev (>= 4:3.4.2), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
Standards-Version: 3.6.2
Package: kdeutils
Modified: branches/kde-3.4.0/packages/kdeutils/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/rules 2005-09-09 19:49:44 UTC (rev 1753)
+++ branches/kde-3.4.0/packages/kdeutils/debian/rules 2005-09-09 22:58:19 UTC (rev 1754)
@@ -1,5 +1,18 @@
#! /usr/bin/make -f
+###
+
+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
+
+###
+
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include debian/cdbs/simple-patchsys.mk
More information about the pkg-kde-commits
mailing list