* Build depend on pkg-kde-tools 0.6.2 which:

  - enables LIBKDEINIT_INSTALL_DIR=/usr/lib/kde4/libkdeinit and
    ENABLE_LIBKDEINIT_RUNPATH by default;
  - has dh_movelibkdeinit which actually moves libkdeinit4_*.so to the
    private directory;
  - is capable of generating strict local library interdependencies by
    stealing debian/shlibs.local generation code from qt4-x11;
  - is capable of generating ${allLibraries} and ${kde43Libraries} substs.
* Implement a framework for moving libkdeinit4_*.so to the private directory:
  (patch 10_make_libkdeinit4_private.diff).
* Do not set RPATH to /usr/lib by default (patch
  09_disable_usr_lib_install_rpath.diff). Disallowed on Debian.
* Fix version in kdelibs5-data.NEWS (thanks to lintian).
  - Bump Build-Depends for libsoprano-dev to >= 2.4.0.1-2~.

1 files changed, 6 insertions, 23 deletions

diff --git a/debian/rules b/debian/rules
index d4e4aca..9308e2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 BINARYVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
 UPSTREAMVERSION ?= $(shell echo '$(BINARYVERSION)' | sed 's/^\(.*\)-.*/\1/')
-BINARYVERSION := $(BINARYVERSION)
 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/')
@@ -18,33 +17,17 @@ DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # remove dependencies on kdebase-runtime and phonon (the metapackage)
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime -xphonon
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
-
-# Generate dpkg-gencontrol substs
-DEB_LIBRARY_PACKAGES := $(filter-out %-dev,$(filter lib%,$(DEB_ARCH_PACKAGES)))
+# Libraries stuff
 DEB_KDE43_LIBRARY_PACKAGES := libkde3support4 libkdecore5 libkdesu5 libkdeui5 libkdnssd4 \
     libkfile4 libkhtml5 libkimproxy4 libkio5 libkjsapi4 libkjsembed4 libkmediaplayer4 \
     libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 \
     libktexteditor4 libkutils4 libnepomuk4 libsolid4 libthreadweaver4
-DEB_LIBRARY_PACKAGES_SUBST := $(foreach pkg,$(DEB_LIBRARY_PACKAGES),$(patsubst %,% (= $(BINARYVERSION)),,$(pkg)))
-DEB_KDE43_LIBRARY_PACKAGES_SUBST := $(foreach pkg,$(DEB_KDE43_LIBRARY_PACKAGES),$(patsubst %,% (= $(BINARYVERSION)),,$(pkg)))
-
-$(patsubst %,binary-predeb/%,kdelibs5-dev kdelibs5-dbg):: binary-predeb/%:
-	test -f debian/$(cdbs_curpkg).substvars || touch debian/$(cdbs_curpkg).substvars
-	echo 'allLibraryPackages=$(DEB_LIBRARY_PACKAGES_SUBST)' >> debian/$(cdbs_curpkg).substvars
+DEB_ALL_LIBRARIES_SUBST_PACKAGES = kdelibs5-dev kdelibs5-dbg
+DEB_KDE43_LIBRARIES_SUBST_PACKAGES = kdelibs5
+DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
 
-$(patsubst %,binary-predeb/%,kdelibs5):: binary-predeb/%:
-	test -f debian/$(cdbs_curpkg).substvars || touch debian/$(cdbs_curpkg).substvars
-	echo 'kde43LibraryPackages=$(DEB_KDE43_LIBRARY_PACKAGES_SUBST)' >> debian/$(cdbs_curpkg).substvars
-
-# Generate shlibs local files
-$(patsubst %,binary-fixup/%,$(DEB_ARCH_PACKAGES)) :: binary-fixup/%: binary-strip/%
-	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
-		sed 's/>=[^)]*/= $(BINARYVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\
-	fi
-
-clean::
-	rm -f debian/shlibs.local
+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-predeb/libplasma3::
 #	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars