[pkg-kde-commits] rev 2640 - in trunk/packages:
kdeaccessibility/debian kdegraphics/debian
kdemultimedia/debian kdenetwork/debian kdeutils/debian
Christopher Martin
chrsmrtn at costa.debian.org
Thu Dec 15 23:07:53 UTC 2005
Author: chrsmrtn
Date: 2005-12-15 23:07:48 +0000 (Thu, 15 Dec 2005)
New Revision: 2640
Modified:
trunk/packages/kdeaccessibility/debian/changelog
trunk/packages/kdeaccessibility/debian/control
trunk/packages/kdeaccessibility/debian/rules
trunk/packages/kdegraphics/debian/changelog
trunk/packages/kdegraphics/debian/control
trunk/packages/kdegraphics/debian/rules
trunk/packages/kdemultimedia/debian/changelog
trunk/packages/kdemultimedia/debian/control
trunk/packages/kdemultimedia/debian/rules
trunk/packages/kdenetwork/debian/changelog
trunk/packages/kdenetwork/debian/control
trunk/packages/kdenetwork/debian/rules
trunk/packages/kdeutils/debian/changelog
trunk/packages/kdeutils/debian/control
trunk/packages/kdeutils/debian/rules
Log:
More ripping out of gcc-3.4.
Modified: trunk/packages/kdeaccessibility/debian/changelog
===================================================================
--- trunk/packages/kdeaccessibility/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdeaccessibility/debian/changelog 2005-12-15 23:07:48 UTC (rev 2640)
@@ -1,3 +1,16 @@
+kdeaccessibility (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: #342977)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdeaccessibility (4:3.5.0-1) alioth; urgency=low
* New upstream release.
Modified: trunk/packages/kdeaccessibility/debian/control
===================================================================
--- trunk/packages/kdeaccessibility/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdeaccessibility/debian/control 2005-12-15 23:07:48 UTC (rev 2640)
@@ -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), gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.0), kdemultimedia-dev (>= 4:3.5.0), libakode-dev, libgstreamer0.8-dev (>> 0.8.7), libgstreamer-plugins0.8-dev (>> 0.8.7), libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.0), kdemultimedia-dev (>= 4:3.5.0), libakode-dev, libgstreamer0.8-dev (>> 0.8.7), libgstreamer-plugins0.8-dev (>> 0.8.7), libxtst-dev, sharutils
Standards-Version: 3.6.2
Package: kdeaccessibility
Modified: trunk/packages/kdeaccessibility/debian/rules
===================================================================
--- trunk/packages/kdeaccessibility/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdeaccessibility/debian/rules 2005-12-15 23:07:48 UTC (rev 2640)
@@ -15,18 +15,5 @@
DEB_DH_MAKESHLIBS_ARGS_kttsd := -V'kttsd (>= 4:3.5.0-1)'
DEB_DH_MAKESHLIBS_ARGS_ksayit := -V'ksayit (>= 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
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdegraphics/debian/changelog 2005-12-15 23:07:48 UTC (rev 2640)
@@ -1,3 +1,16 @@
+kdegraphics (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: #342983)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdegraphics (4:3.5.0-1) alioth; urgency=low
* New upstream release.
Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdegraphics/debian/control 2005-12-15 23:07:48 UTC (rev 2640)
@@ -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, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.0), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.0), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, 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: trunk/packages/kdegraphics/debian/rules
===================================================================
--- trunk/packages/kdegraphics/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdegraphics/debian/rules 2005-12-15 23:07:48 UTC (rev 2640)
@@ -19,18 +19,5 @@
DEB_DH_MAKESHLIBS_ARGS_kviewshell := -V'kviewshell (>= 4:3.5.0-1)'
DEB_DH_MAKESHLIBS_ARGS_libkscan1 := -V'libkscan1 (>= 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))'))
Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdemultimedia/debian/changelog 2005-12-15 23:07:48 UTC (rev 2640)
@@ -1,3 +1,16 @@
+kdemultimedia (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: #342985)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdemultimedia (4:3.5.0-1) alioth; urgency=low
* New upstream release.
Modified: trunk/packages/kdemultimedia/debian/control
===================================================================
--- trunk/packages/kdemultimedia/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdemultimedia/debian/control 2005-12-15 23:07:48 UTC (rev 2640)
@@ -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, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), 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-9.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libakode-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), 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-9.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libakode-dev
Standards-Version: 3.6.2
Package: kdemultimedia
Modified: trunk/packages/kdemultimedia/debian/rules
===================================================================
--- trunk/packages/kdemultimedia/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdemultimedia/debian/rules 2005-12-15 23:07:48 UTC (rev 2640)
@@ -27,18 +27,5 @@
DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib := -V'libarts1-mpeglib (>= 4:3.5.0-1)'
DEB_DH_MAKESHLIBS_ARGS_kdemultimedia-kio-plugins := -V'kdemultimedia-kio-plugins (>= 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))'))
Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdenetwork/debian/changelog 2005-12-15 23:07:48 UTC (rev 2640)
@@ -1,14 +1,17 @@
-kdenetwork (4:3.5.0-2) experimental; urgency=low
+kdenetwork (4:3.5.0-2) UNRELEASED; urgency=low
* Upload to experimental.
- * KDE_3_4_BRANCH update (up to r4xxxxx).
+ * KDE_3_4_BRANCH update (up to r4xxxxx). TODO.
+++ Changes by Christopher Martin:
* Add lisa and reslisa manpages from François Wendling. Thanks!
(Closes: #343211, #343214)
+ * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+ be fixed. (Closes: #342986)
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
kdenetwork (4:3.5.0-1) alioth; urgency=low
Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdenetwork/debian/control 2005-12-15 23:07:48 UTC (rev 2640)
@@ -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, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 0.4.2), 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 (>= 5.0), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 0.4.2), 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: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdenetwork/debian/rules 2005-12-15 23:07:48 UTC (rev 2640)
@@ -14,19 +14,6 @@
DEB_DH_MAKESHLIBS_ARGS_librss1 := -V'librss1 (>= 4:3.5.0-1)'
DEB_DH_MAKESHLIBS_ARGS_kopete := -V'kopete (>= 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))'))
Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdeutils/debian/changelog 2005-12-15 23:07:48 UTC (rev 2640)
@@ -1,3 +1,16 @@
+kdeutils (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: #342990)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdeutils (4:3.5.0-1) alioth; urgency=low
* New upstream release.
Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdeutils/debian/control 2005-12-15 23:07:48 UTC (rev 2640)
@@ -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), kdebase-dev (>= 4:3.5.0), libkonq4-dev (>= 4:3.5.0), libgmp3-dev, libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), kdebase-dev (>= 4:3.5.0), libkonq4-dev (>= 4:3.5.0), libgmp3-dev, libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
Standards-Version: 3.6.2
Package: kdeutils
Modified: trunk/packages/kdeutils/debian/rules
===================================================================
--- trunk/packages/kdeutils/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
+++ trunk/packages/kdeutils/debian/rules 2005-12-15 23:07:48 UTC (rev 2640)
@@ -1,25 +1,12 @@
#! /usr/bin/make -f
-###
-
-DEB_KDE_APIDOX := yes
-
-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
include /usr/share/cdbs/1/rules/utils.mk
+DEB_KDE_APIDOX := yes
+
DOC_HTML_PRUNE := kcontrol kinfocenter ktimer kcharselect ksim
DEB_DH_STRIP_ARGS := --dbg-package=kdeutils-dbg
More information about the pkg-kde-commits
mailing list