[pkg-kde-commits] rev 2639 - in trunk/packages: arts/debian
kdebase/debian kdelibs/debian
Christopher Martin
chrsmrtn at costa.debian.org
Thu Dec 15 23:01:26 UTC 2005
Author: chrsmrtn
Date: 2005-12-15 23:01:23 +0000 (Thu, 15 Dec 2005)
New Revision: 2639
Modified:
trunk/packages/arts/debian/changelog
trunk/packages/arts/debian/control
trunk/packages/arts/debian/rules
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/control
trunk/packages/kdebase/debian/rules
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/control
trunk/packages/kdelibs/debian/kdelibs-data.install
trunk/packages/kdelibs/debian/rules
Log:
Yank out gcc-3.4.
Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/arts/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
@@ -1,3 +1,12 @@
+arts (1.5.0-3) UNRELEASED; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+ be fixed. (Closes: #342955)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
arts (1.5.0-2) experimental; urgency=low
* Upload to experimental.
Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/arts/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
@@ -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, 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 (>= 5.0), 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: trunk/packages/arts/debian/rules
===================================================================
--- trunk/packages/arts/debian/rules 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/arts/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
@@ -17,19 +17,6 @@
#shlibs_ver = 1.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_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
binary-predeb/libarts1-dev::
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdebase/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
@@ -1,3 +1,18 @@
+kdebase (4:3.5.0-2) UNRELEASED; urgency=low
+
+ * Upload to experimental.
+
+ * KDE_3_4_BRANCH update (up to rXXXXXX). TODO.
+
+ +++ Changes by Christopher Martin:
+
+ * BUILD AGAINST EXP HAL/DBUS. TODO.
+
+ * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+ be fixed. (Closes: #342980)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdebase (4:3.5.0-1) alioth; urgency=low
* New upstream release.
Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdebase/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
@@ -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), dbus-qt-1-dev (>= 0.23.4-8), 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 (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), dbus-qt-1-dev (>= 0.23.4-8), 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: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdebase/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
@@ -30,19 +30,6 @@
DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= 4:3.5.0-1)'
DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= 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/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdelibs/debian/changelog 2005-12-15 23:01:23 UTC (rev 2639)
@@ -1,3 +1,12 @@
+kdelibs (4:3.5.0-3) UNRELEASED; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+ be fixed. (Closes: #342984)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdelibs (4:3.5.0-2) experimental; urgency=low
* Upload to experimental.
Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdelibs/debian/control 2005-12-15 23:01:23 UTC (rev 2639)
@@ -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, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev, libattr1-dev, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), 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 (>= 5.0), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev, libattr1-dev, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), 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: trunk/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs-data.install 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdelibs/debian/kdelibs-data.install 2005-12-15 23:01:23 UTC (rev 2639)
@@ -455,6 +455,7 @@
debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underBSDLicense.docbook
debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underFDL.docbook
debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underLGPL.docbook
debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underX11License.docbook
debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/update-doc.docbook
debian/tmp/usr/share/apps/ksgmltools2/customization/da/lang.entities
Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules 2005-12-15 04:00:16 UTC (rev 2638)
+++ trunk/packages/kdelibs/debian/rules 2005-12-15 23:01:23 UTC (rev 2639)
@@ -25,19 +25,6 @@
DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5.0-2)'
-###
-
-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