[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-1-9-g157b55c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 69666eaed27e35d1ccd6aad5c0e9df2c65c99907
Merge: 0c1650d1c516a8c06f09986f69b028b2121a741a 946a13a67eddac59a8dd3d19cdcca1903d2d2db1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 19:58:41 2010 +0300

    Merge debian/4.3.4-{2,3} into master.

 debian/rules |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --cc debian/rules
index c6a70ea,6aabb0d..60530d3
--- a/debian/rules
+++ b/debian/rules
@@@ -1,44 -1,29 +1,50 @@@
  #!/usr/bin/make -f
  
 -UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
 +BINARYVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
 +UPSTREAMVERSION ?= $(shell echo '$(BINARYVERSION)' | sed 's/^\(.*\)-.*/\1/')
 +UPSTREAMVERSION := $(UPSTREAMVERSION)
  #UPSTREAMVERSION ?= 4:4.2.0
  #PLASMA_ABI=$(shell grep 'plasma-abi-' debian/libplasma3.symbols.in | head -n1 | sed 's/^.*\(plasma-abi-\S\+\).*/\1/')
 -RUNTIME_DEPS := kdebase-runtime (>= 4:4.3.0)
 +RUNTIME_DEPS := kdebase-runtime
  
 -DEB_CMAKE_CUSTOM_FLAGS := -DCMAKE_SKIP_RPATH=ON
 +DEB_DBG_PACKAGE_ALL := kdelibs5-dbg
  
 -DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 -DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg
 -DEB_DBG_PACKAGE_libplasma3 := kdelibs5-dbg
+ 
  #bump version for every new upstream version!
 -DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
 +DEB_DH_MAKESHLIBS_ARGS_libkdecore5 := -V'libkdecore5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
 +DEB_DH_MAKESHLIBS_ARGS_ALL := -V -u-c0
  #DEB_DH_MAKESHLIBS_ARGS_libplasma3 := -V'libplasma3 (>= $(UPSTREAMVERSION)), $(PLASMA_ABI)'
  
  # remove dependencies on kdebase-runtime and phonon (the metapackage)
  DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime -xphonon
  
+ ifeq (ia64,$(DEB_HOST_ARCH))
+     CFLAGS += -ffunction-sections
+     CXXFLAGS += -ffunction-sections
+ endif
+ 
 +# Libraries stuff
 +DEB_KDE43_LIBRARY_PACKAGES := libkdecore5 libkdeui5 libkde3support4 libkdesu5 libkdnssd4 \
 +    libkfile4 libkhtml5 libkimproxy4 libkio5 libkjsapi4 libkjsembed4 libkmediaplayer4 \
 +    libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 \
 +    libktexteditor4 libkutils4 libnepomuk4 libsolid4 libthreadweaver4
 +DEB_ALL_LIBRARIES_SUBST_PACKAGES = kdelibs5-dev kdelibs5-dbg
 +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
 +
 +binary-post-install/kdelibs5-data::
 +	chmod a+x debian/kdelibs5-data/usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
  
  #binary-predeb/libplasma3::
  #	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars

-- 
KDE Development Platform Libraries module packaging