[Pkg-kde-commits] rev 2299 - in branches/kde-3.4.0/packages:
arts/debian kdeaccessibility/debian kdebase/debian
kdebindings/debian kdegraphics/debian kdelibs/debian
kdemultimedia/debian kdenetwork/debian kdetoys/debian
kdeutils/debian kdewebdev/debian
Adeodato Simó
adeodato at costa.debian.org
Thu Nov 17 01:46:22 UTC 2005
Author: adeodato
Date: 2005-11-17 01:46:19 +0000 (Thu, 17 Nov 2005)
New Revision: 2299
Modified:
branches/kde-3.4.0/packages/arts/debian/changelog
branches/kde-3.4.0/packages/arts/debian/control
branches/kde-3.4.0/packages/arts/debian/rules
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/kdebase/debian/changelog
branches/kde-3.4.0/packages/kdebase/debian/control
branches/kde-3.4.0/packages/kdebase/debian/rules
branches/kde-3.4.0/packages/kdebindings/debian/changelog
branches/kde-3.4.0/packages/kdebindings/debian/control
branches/kde-3.4.0/packages/kdebindings/debian/rules
branches/kde-3.4.0/packages/kdegraphics/debian/changelog
branches/kde-3.4.0/packages/kdegraphics/debian/control
branches/kde-3.4.0/packages/kdegraphics/debian/rules
branches/kde-3.4.0/packages/kdelibs/debian/changelog
branches/kde-3.4.0/packages/kdelibs/debian/control
branches/kde-3.4.0/packages/kdelibs/debian/rules
branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
branches/kde-3.4.0/packages/kdemultimedia/debian/control
branches/kde-3.4.0/packages/kdemultimedia/debian/rules
branches/kde-3.4.0/packages/kdenetwork/debian/changelog
branches/kde-3.4.0/packages/kdenetwork/debian/control
branches/kde-3.4.0/packages/kdenetwork/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
branches/kde-3.4.0/packages/kdewebdev/debian/changelog
branches/kde-3.4.0/packages/kdewebdev/debian/control
branches/kde-3.4.0/packages/kdewebdev/debian/rules
Log:
Do not use g++-3.4 for the glorious trio anymore. Yay mega commits.
Modified: branches/kde-3.4.0/packages/arts/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/arts/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -1,3 +1,11 @@
+arts (1.4.3-2) UNRELEASED; urgency=low
+
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
arts (1.4.3-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/arts/debian/control
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/arts/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.5), libvorbis-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.5), libvorbis-dev, sharutils, texinfo
Build-Conflicts: libmas-dev
Standards-Version: 3.6.2
Modified: branches/kde-3.4.0/packages/arts/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/arts/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -15,17 +15,6 @@
#shlibs_ver = 1.4.3-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_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -1,3 +1,11 @@
+kdeaccessibility (4:3.4.3-2) UNRELEASED; urgency=low
+
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdeaccessibility (4:3.4.3-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), gawk, gettext, sharutils, groff-base, kdelibs4-dev (>= 4:3.4.3), libxtst-dev, libgstreamer0.8-dev (>> 0.8.5), libgstreamer-plugins0.8-dev (>> 0.8.5), kdemultimedia-dev (>= 4:3.4.3), epos, flite, festival
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), gawk, gettext, sharutils, groff-base, kdelibs4-dev (>= 4:3.4.3), libxtst-dev, libgstreamer0.8-dev (>> 0.8.5), libgstreamer-plugins0.8-dev (>> 0.8.5), kdemultimedia-dev (>= 4:3.4.3), 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-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -15,16 +15,5 @@
###
-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.3-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -10,6 +10,10 @@
* Backport a fix from KDE 3.5 for a bug that caused switching to
Administrator mode in KControl to fail on occasion. (Closes: #306951)
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdebase (4:3.4.3-2) experimental; urgency=low
Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdebase/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), dbus-qt-1-dev, libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), dbus-qt-1-dev, libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
Build-Conflicts: nvidia-glx
Standards-Version: 3.6.2
Modified: branches/kde-3.4.0/packages/kdebase/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdebase/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -29,17 +29,6 @@
###
-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.3-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -1,3 +1,13 @@
+kdebindings (4:3.4.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdebindings (4:3.4.2-2) unstable; urgency=low
* The "I love the smell of 6 FTBFS first thing in the morning" release.
Modified: branches/kde-3.4.0/packages/kdebindings/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdebindings/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -1,5 +1,5 @@
Source: kdebindings
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.4.3), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.4.3), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
Section: devel
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -7,17 +7,6 @@
###
-GCC4_ICES_HERE := arm m68k hppa
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
- export CC=gcc-3.4
- export CPP=cpp-3.4
- export CXX=g++-3.4
-endif
-
-###
-
ifneq (,$(shell dh_listpackages -s | grep libqt3-jni))
WITH_JAVA := --with-java=/usr/lib/jvm/java-gcj
else
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -4,6 +4,10 @@
* Backport from KDE 3.5 a build fix for ksvg. (Closes: #338142)
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdegraphics (4:3.4.3-1) experimental; urgency=low
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.4.3), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libpaper-dev, libopenexr-dev (>= 1.2.1), libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.4.3), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libpaper-dev, libopenexr-dev (>= 1.2.1), libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
Standards-Version: 3.6.2
Package: kdegraphics
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -19,16 +19,5 @@
###
-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.3-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -7,6 +7,10 @@
* In the branch update is included a fix for kopete's compilation issues.
(Closes: #337423, #338901)
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdelibs (4:3.4.3-1) experimental; urgency=low
Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.3), libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.3), libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
Standards-Version: 3.6.2
Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -27,17 +27,6 @@
###
-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.3-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -5,6 +5,10 @@
* Add a manpage for kaudiocreator, courtesy of Francois Wendling.
(Closes: #337166)
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdemultimedia (4:3.4.3-3) experimental; urgency=low
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-2.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-2.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev
Standards-Version: 3.6.2
Package: kdemultimedia
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -27,16 +27,5 @@
###
-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.3-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -1,3 +1,11 @@
+kdenetwork (4:3.4.3-3) UNRELEASED; urgency=low
+
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdenetwork (4:3.4.3-2) experimental; urgency=low
+++ Changes by Christopher Martin:
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
Standards-Version: 3.6.2
Package: kdenetwork
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -12,17 +12,6 @@
###
-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.3-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-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -5,6 +5,10 @@
* Change doc-base section for all documentation to Games/Toys.
(Closes: #335068)
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdetoys (4:3.4.3-1) experimental; urgency=low
Modified: branches/kde-3.4.0/packages/kdetoys/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdetoys/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.3), gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.3), 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-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdetoys/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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: branches/kde-3.4.0/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdeutils/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -5,6 +5,10 @@
* Improve ark's description by referring to it as a _graphical_ archiving
tool. (Closes: #335839)
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdeutils (4:3.4.3-1) experimental; urgency=low
Modified: branches/kde-3.4.0/packages/kdeutils/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdeutils/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libkonq4-dev (>= 4:3.4.3), libsnmp9-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libkonq4-dev (>= 4:3.4.3), libsnmp9-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-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdeutils/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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: branches/kde-3.4.0/packages/kdewebdev/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/changelog 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/changelog 2005-11-17 01:46:19 UTC (rev 2299)
@@ -1,3 +1,11 @@
+kdewebdev (4:3.4.3-2) UNRELEASED; urgency=low
+
+ +++ Changes by Adeodato Simó:
+
+ * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdewebdev (4:3.4.3-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdewebdev/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/control 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/control 2005-11-17 01:46:19 UTC (rev 2299)
@@ -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 the-barrel.org>, 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 (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libcvsservice-dev (>= 4:3.4.3), libreadline4-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libcvsservice-dev (>= 4:3.4.3), libreadline4-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
Standards-Version: 3.6.2
Package: kdewebdev
Modified: branches/kde-3.4.0/packages/kdewebdev/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/rules 2005-11-17 01:26:29 UTC (rev 2298)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/rules 2005-11-17 01:46:19 UTC (rev 2299)
@@ -17,16 +17,5 @@
###
-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.3-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