rev 17018 - trunk/packages/kdelibs/debian

[Modestas Vainius]

Author: modax
Date: 2010-02-19 19:26:40 +0000 (Fri, 19 Feb 2010)
New Revision: 17018

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/rules
Log:
Merge relevant changes from 4:4.3.4-2 and 4:4.3.4-3.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-02-19 15:08:16 UTC (rev 17017)
+++ trunk/packages/kdelibs/debian/changelog	2010-02-19 19:26:40 UTC (rev 17018)
@@ -103,6 +103,20 @@
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 16 Feb 2010 10:58:38 +0100
 
+kde4libs (4:4.3.4-3) unstable; urgency=medium
+
+  * Add -ffunction-sections to C(XX)FLAGS on ia64 in order to fix FTBFS.
+
+ -- Modestas Vainius <modax at debian.org>  Fri, 19 Feb 2010 09:44:22 -0700
+
+kde4libs (4:4.3.4-2) unstable; urgency=emergency
+
+  * Fix libplasma3 symbols file (Closes: #570041).
+  * Pass CMAKE_SKIP_RPATH=ON to cmake.
+  * Urgency=emergency - needed for transition.
+
+ -- Modestas Vainius <modax at debian.org>  Thu, 18 Feb 2010 15:19:16 +0200
+
 kde4libs (4:4.3.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2010-02-19 15:08:16 UTC (rev 17017)
+++ trunk/packages/kdelibs/debian/rules	2010-02-19 19:26:40 UTC (rev 17018)
@@ -26,6 +26,14 @@
 DEB_KDE43_LIBRARIES_SUBST_PACKAGES = kdelibs5
 DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
 
+# Fixes FTBFS (4:4.3.4-2) on ia64 (khtml code is too large to fit):
+#   html/khtmlview.cpp:3623: relocation truncated to fit: GPREL22 against `.rodata'
+# etc. We will have to reevalute if this is still needed some time later.
+ifeq (ia64,$(DEB_HOST_ARCH))
+    CFLAGS += -ffunction-sections
+    CXXFLAGS += -ffunction-sections
+endif
+
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk