[pkg-kde-commits] rev 2641 - in trunk/packages: kdeaddons/debian kdesdk/debian kdetoys/debian kdewebdev/debian

Christopher Martin chrsmrtn at costa.debian.org
Thu Dec 15 23:16:29 UTC 2005


Author: chrsmrtn
Date: 2005-12-15 23:16:28 +0000 (Thu, 15 Dec 2005)
New Revision: 2641

Modified:
   trunk/packages/kdeaddons/debian/changelog
   trunk/packages/kdeaddons/debian/control
   trunk/packages/kdeaddons/debian/rules
   trunk/packages/kdesdk/debian/changelog
   trunk/packages/kdesdk/debian/control
   trunk/packages/kdesdk/debian/rules
   trunk/packages/kdetoys/debian/changelog
   trunk/packages/kdetoys/debian/control
   trunk/packages/kdetoys/debian/rules
   trunk/packages/kdewebdev/debian/changelog
   trunk/packages/kdewebdev/debian/control
   trunk/packages/kdewebdev/debian/rules
Log:
No more gcc-3.4.


Modified: trunk/packages/kdeaddons/debian/changelog
===================================================================
--- trunk/packages/kdeaddons/debian/changelog	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdeaddons/debian/changelog	2005-12-15 23:16:28 UTC (rev 2641)
@@ -1,3 +1,16 @@
+kdeaddons (4:3.5.0-2) UNRELEASED; urgency=low
+
+  * Upload to experimental.
+
+  * KDE_3_4_BRANCH update (up to rXXXXXX). TODO.
+
+  +++ Changes by Christopher Martin:
+
+  * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+    be fixed. (Closes: #342978)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdeaddons (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeaddons/debian/control
===================================================================
--- trunk/packages/kdeaddons/debian/control	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdeaddons/debian/control	2005-12-15 23:16:28 UTC (rev 2641)
@@ -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ó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), atlantik-dev (>= 4:3.5.0), kdebase-dev (>= 4:3.5.0), kdemultimedia-dev (>= 4:3.5.0), libkdegames-dev (>= 4:3.5.0), libkonq4-dev (>= 4:3.5.0), kdepim-dev (>= 4:3.5.0), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, xmms-dev, libdb4.3++-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), atlantik-dev (>= 4:3.5.0), kdebase-dev (>= 4:3.5.0), kdemultimedia-dev (>= 4:3.5.0), libkdegames-dev (>= 4:3.5.0), libkonq4-dev (>= 4:3.5.0), kdepim-dev (>= 4:3.5.0), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, xmms-dev, libdb4.3++-dev
 Standards-Version: 3.6.2
 
 Package: kdeaddons

Modified: trunk/packages/kdeaddons/debian/rules
===================================================================
--- trunk/packages/kdeaddons/debian/rules	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdeaddons/debian/rules	2005-12-15 23:16:28 UTC (rev 2641)
@@ -11,19 +11,6 @@
 
 DEB_DH_SHLIBDEPS_ARGS := -Xmediacontrol_panelapplet
 
-###
-
-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
-
-###
-
 binary-install/konq-plugins::
 	mv -f debian/konq-plugins/usr/share/man/py/man1/exif.1 \
 		debian/konq-plugins/usr/share/man/man1/exif.py.1; \

Modified: trunk/packages/kdesdk/debian/changelog
===================================================================
--- trunk/packages/kdesdk/debian/changelog	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdesdk/debian/changelog	2005-12-15 23:16:28 UTC (rev 2641)
@@ -1,3 +1,16 @@
+kdesdk (4:3.5.0-2) UNRELEASED; urgency=low
+
+  * Upload to experimental.
+
+  * KDE_3_4_BRANCH update (up to rXXXXXX). TODO.
+
+  +++ Changes by Christopher Martin:
+
+  * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+    be fixed. (Closes: #342988)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdesdk (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdesdk/debian/control
===================================================================
--- trunk/packages/kdesdk/debian/control	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdesdk/debian/control	2005-12-15 23:16:28 UTC (rev 2641)
@@ -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ó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, pkg-config, kdelibs4-dev (>= 4:3.5.0), binutils-dev, bison, flex, kdepim-dev (>= 4:3.5.0), libapr0-dev, libdb4.3-dev, libkcal2-dev (>= 4:3.5.0), libktnef1-dev (>= 4:3.5.0), libsvn0-dev (>= 1.2.3dfsg1-3)
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, pkg-config, kdelibs4-dev (>= 4:3.5.0), binutils-dev, bison, flex, kdepim-dev (>= 4:3.5.0), libapr0-dev, libdb4.3-dev, libkcal2-dev (>= 4:3.5.0), libktnef1-dev (>= 4:3.5.0), libsvn0-dev (>= 1.2.3dfsg1-3)
 Standards-Version: 3.6.2
 
 Package: kdesdk

Modified: trunk/packages/kdesdk/debian/rules
===================================================================
--- trunk/packages/kdesdk/debian/rules	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdesdk/debian/rules	2005-12-15 23:16:28 UTC (rev 2641)
@@ -18,19 +18,6 @@
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
-###
-
-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
-
-###
-
 DEB_INSTALL_CHANGELOGS_cervisia := cervisia/ChangeLog
 DEB_INSTALL_CHANGELOGS_kapptemplate := kapptemplate/ChangeLog
 DEB_INSTALL_CHANGELOGS_kbabel := kbabel/ChangeLog

Modified: trunk/packages/kdetoys/debian/changelog
===================================================================
--- trunk/packages/kdetoys/debian/changelog	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdetoys/debian/changelog	2005-12-15 23:16:28 UTC (rev 2641)
@@ -1,3 +1,16 @@
+kdetoys (4:3.5.0-2) UNRELEASED; urgency=low
+
+  * Upload to experimental.
+
+  * KDE_3_4_BRANCH update (up to rXXXXXX). TODO.
+
+  +++ Changes by Christopher Martin:
+
+  * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+    be fixed. (Closes: #342989)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdetoys (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdetoys/debian/control
===================================================================
--- trunk/packages/kdetoys/debian/control	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdetoys/debian/control	2005-12-15 23:16:28 UTC (rev 2641)
@@ -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ó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>, Josh Metzler <joshdeb at metzlers.org>
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, kdelibs4-dev (>= 4:3.5.0), gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, kdelibs4-dev (>= 4:3.5.0), gawk, gettext, sharutils
 Standards-Version: 3.6.2
 
 Package: kdetoys

Modified: trunk/packages/kdetoys/debian/rules
===================================================================
--- trunk/packages/kdetoys/debian/rules	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdetoys/debian/rules	2005-12-15 23:16:28 UTC (rev 2641)
@@ -1,18 +1,5 @@
 #! /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: trunk/packages/kdewebdev/debian/changelog
===================================================================
--- trunk/packages/kdewebdev/debian/changelog	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdewebdev/debian/changelog	2005-12-15 23:16:28 UTC (rev 2641)
@@ -1,3 +1,16 @@
+kdewebdev (4:3.5.0-2) UNRELEASED; urgency=low
+
+  * Upload to experimental.
+
+  * KDE_3_4_BRANCH update (up to rXXXXXX). TODO.
+
+  +++ Changes by Christopher Martin:
+
+  * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+    be fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdewebdev (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdewebdev/debian/control
===================================================================
--- trunk/packages/kdewebdev/debian/control	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdewebdev/debian/control	2005-12-15 23:16:28 UTC (rev 2641)
@@ -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ó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), libcvsservice-dev (>= 4:3.5.0), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), libcvsservice-dev (>= 4:3.5.0), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.6.2
 
 Package: kdewebdev

Modified: trunk/packages/kdewebdev/debian/rules
===================================================================
--- trunk/packages/kdewebdev/debian/rules	2005-12-15 23:07:48 UTC (rev 2640)
+++ trunk/packages/kdewebdev/debian/rules	2005-12-15 23:16:28 UTC (rev 2641)
@@ -17,18 +17,5 @@
 
 DEB_DH_MAKESHLIBS_ARGS_kommander := -V'kommander (>= 4:3.5.0-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.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))




More information about the pkg-kde-commits mailing list