rev 16913 - in trunk/packages/kdelibs/debian: . patches

Modestas Vainius modax at alioth.debian.org
Sat Feb 13 14:42:51 UTC 2010 

Author: modax
Date: 2010-02-13 14:42:47 +0000 (Sat, 13 Feb 2010)
New Revision: 16913

Added:
   trunk/packages/kdelibs/debian/kdelibs-bin.dirs
   trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
   trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs5-data.NEWS
   trunk/packages/kdelibs/debian/patches/series
   trunk/packages/kdelibs/debian/rules
Log:
* 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~.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-02-13 14:21:33 UTC (rev 16912)
+++ trunk/packages/kdelibs/debian/changelog	2010-02-13 14:42:47 UTC (rev 16913)
@@ -1,4 +1,4 @@
-kde4libs (4:4.4.0-0r3) UNRELEASED; urgency=low
+kde4libs (4:4.4.0-0r4) UNRELEASED; urgency=low
 
   * New upstream release. The „Kalastria Highborn“ release.
 
@@ -11,6 +11,16 @@
   * Drop obsolete presubj.
   * Do not export libQtUiTools.a symbols in kjsembed library
     (25_ld_exclude_libs_qtuitools.diff).
+  * 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).
   * Split kdelibs5 into separate library packages:
     - each public library gets its own package with a few exceptions;
     - remaining stuff moved from kdelibs5 to kdelibs5-plugins;
@@ -18,14 +28,15 @@
       directory in the source tree;
     - add package splitting rules to README.source;
     - bind kdebase-runtime to libkdecore5 for now;
-    - generate strict local library interdependencies by stealing
-      debian/shlibs.local generation code from qt4-x11;
   * Add control substs ${allLibraryPackages} and ${kde43LibraryPackages}
     for use in kdelibs5-{dev,dbg} and kdelibs5 metapackage despectively.
   * Add ${perl:Depends} to Depends of kdelibs5-plugins, kdelibs5-data and
     kdoctools.
   * Add patch 00_r1089160_khtml_scrolling_fix.diff from upstream to fix
     performance problems in KHTML.
+  * 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).
 
   [ Kai Wasserbäch ]
   * debian/patches:
@@ -46,7 +57,7 @@
       libpolkit-qt-1-dev, libxss-dev and libqca2-dev.
     - Bump Build-Depends for Qt to >= 4.6.0.
     - Bump Build-Depends for Phonon to >= 4.4.0.
-    - Bump Build-Depends for libsoprano-dev to >= 2.3.70
+    - Bump Build-Depends for libsoprano-dev to >= 2.4.0.1-2~.
     - Bump Standards-Version to 3.8.4, no further changes needed.
   * debian/rules: Set „RUNTIME_DEPS“ to „kdebase-runtime (>= 4:4.4.0)“.
   * debian/kdelibs5-data.install: Update.

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-02-13 14:21:33 UTC (rev 16912)
+++ trunk/packages/kdelibs/debian/control	2010-02-13 14:42:47 UTC (rev 16913)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, cmake (>= 2.6.3), pkg-kde-tools (>= 0.6), po-debconf,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, cmake (>= 2.6.3), pkg-kde-tools (>= 0.6.2~), po-debconf,
  shared-mime-info (>= 0.20), dpkg-dev (>= 1.15.3), libphonon-dev (>= 4:4.4.0),
  libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4:4.6.0), libqt4-opengl-dev (>= 4:4.6.0),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libpng-dev, libssl-dev, libsm-dev, flex, bison,
- libsoprano-dev (>= 2.3.70), libstreamanalyzer-dev (>= 0.6.3),
+ libsoprano-dev (>= 2.4.0.1-2~), libstreamanalyzer-dev (>= 0.6.3),
  libxml2-dev, libxml2-utils, libxslt1-dev, libxtst-dev, libgif-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
  libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,
@@ -231,8 +231,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0)
 Description: the Instant Messaging Interface Library for the KDE Platform
- This library provides provides an easy-to-use interface to any instant
- messengers or chat programs that implement KIMIface.
+ This library provides an easy-to-use interface to any instant messengers or
+ chat programs that implement KIMIface.
  .
  This package is part of the KDE Development Platform libraries module.
 
@@ -451,9 +451,9 @@
 Package: kdelibs5-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${allLibraryPackages},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${allLibraries},
  kdoctools (= ${binary:Version}), kdelibs-bin (= ${binary:Version}),
- cmake (>= 2.6.3), automoc (>= 1.0~version-0.9.88), pkg-kde-tools (>= 0.6),
+ cmake (>= 2.6.3), automoc (>= 1.0~version-0.9.88), pkg-kde-tools (>= 0.6.2~),
  ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4},
  ${sameVersionDep:libphonon-dev:libkhtml5}
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
@@ -471,7 +471,7 @@
 Package: kdelibs5
 Architecture: any
 Pre-Depends: debconf | debconf-2.0
-Depends: ${misc:Depends}, ${kde43LibraryPackages}, kdoctools (= ${binary:Version}),
+Depends: ${misc:Depends}, ${kde43Libraries}, kdoctools (= ${binary:Version}),
  kdelibs5-plugins (= ${binary:Version}), kdelibs-bin (= ${binary:Version})
 Description: transitional package for the KDE Development Platform libraries
  This is a dummy transitional package to enable installation of other Debian
@@ -485,7 +485,7 @@
 Architecture: any
 Priority: extra
 Depends: libqt4-dbg (>= 4:4.6), libc6-dbg [amd64]
-Recommends: ${allLibraryPackages}, kdelibs-bin (= ${binary:Version})
+Recommends: ${allLibraries}, kdelibs-bin (= ${binary:Version})
 Description: debugging symbols for the KDE Development Platform libraries
  This package contains debugging files used to investigate problems with
  binaries included in the KDE Development Platform libraries module.

Added: trunk/packages/kdelibs/debian/kdelibs-bin.dirs
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs-bin.dirs	                        (rev 0)
+++ trunk/packages/kdelibs/debian/kdelibs-bin.dirs	2010-02-13 14:42:47 UTC (rev 16913)
@@ -0,0 +1 @@
+usr/lib/kde4/libkdeinit

Modified: trunk/packages/kdelibs/debian/kdelibs5-data.NEWS
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-data.NEWS	2010-02-13 14:21:33 UTC (rev 16912)
+++ trunk/packages/kdelibs/debian/kdelibs5-data.NEWS	2010-02-13 14:42:47 UTC (rev 16913)
@@ -1,4 +1,4 @@
-kde4libs (4:4.0.81+svn816106-1) experimental; urgency=low
+kde4libs (4:4.0.82+svn819867-1) experimental; urgency=low
 
   *  Configuration files are now treated differently. 
      default files are installed in /usr/share/kde4/config and these 

Added: trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	2010-02-13 14:42:47 UTC (rev 16913)
@@ -0,0 +1,21 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Do not set install RPATH to /usr/lib by default
+ /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
+ general
+Forwarded: not-needed
+
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -943,11 +943,9 @@
+    if (APPLE)
+       set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+    else (APPLE)
+-      # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
+-      set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+       set(CMAKE_SKIP_BUILD_RPATH FALSE)
+       set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+    endif (APPLE)
+ endif (UNIX)
+ 

Added: trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff	2010-02-13 14:42:47 UTC (rev 16913)
@@ -0,0 +1,78 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Framework for making libkdeinit4_*.so "private"
+ The patch adds LIBKDEINIT_INSTALL_DIR cmake flag which specifies where
+ libkdeinit4_*.so are supposed to end up. Please note, however, that
+ libkdeinit4_*.so will not be automatically installed to LIBKDEINIT_INSTALL_DIR
+ (but rather LIB_INSTALL_DIR) after cmake_install and you will need to be move
+ to LIBKDEINIT_INSTALL_DIR manually in packaging (or e.g. with
+ dh_movelibkdeinit).
+ .
+ Therefore, RUNPATH is disabled by default due to above limitation. Each
+ application will have to set ENABLE_LIBKDEINIT_RUNPATH:BOOL=ON cmake flag in
+ order for proper RUNPATH to be set on the generated kdeinit executables. However,
+ CDBS kde.mk and debhelper kde addon/buildsystem enable this flag by default and
+ hence call dh_movelibkdeinit.
+Forwarded: no
+
+--- a/CreateKDELibsDependenciesFile.cmake
++++ b/CreateKDELibsDependenciesFile.cmake
+@@ -31,6 +31,7 @@
+ set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+ make_install_path_absolute(KDE4_LIB_INSTALL_DIR     ${LIB_INSTALL_DIR})
+ make_install_path_absolute(KDE4_LIBEXEC_INSTALL_DIR ${LIBEXEC_INSTALL_DIR})
++make_install_path_absolute(KDE4_LIBKDEINIT_INSTALL_DIR ${LIBKDEINIT_INSTALL_DIR})
+ make_install_path_absolute(KDE4_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR})
+ make_install_path_absolute(KDE4_BIN_INSTALL_DIR     ${BIN_INSTALL_DIR})
+ make_install_path_absolute(KDE4_SBIN_INSTALL_DIR    ${SBIN_INSTALL_DIR})
+@@ -63,6 +64,7 @@
+ 
+ set(KDE4_LIB_INSTALL_DIR     \"${KDE4_LIB_INSTALL_DIR}\")
+ set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\")
++set(KDE4_LIBKDEINIT_INSTALL_DIR \"${KDE4_LIBKDEINIT_INSTALL_DIR}\")
+ set(KDE4_INCLUDE_INSTALL_DIR \"${KDE4_INCLUDE_INSTALL_DIR}\")
+ set(KDE4_BIN_INSTALL_DIR     \"${KDE4_BIN_INSTALL_DIR}\")
+ set(KDE4_SBIN_INSTALL_DIR    \"${KDE4_SBIN_INSTALL_DIR}\")
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -771,6 +771,7 @@
+    _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"         "The subdirectory to the header prefix")
+ 
+    _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde4"                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
++   _set_fancy(LIBKDEINIT_INSTALL_DIR   "${LIB_INSTALL_DIR}"                     "The subdirectory relative to the install prefix where core libraries of the kdeinit based executables may be installed (default is ${LIB_INSTALL_DIR})")
+    _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"         "The config file install dir")
+    _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"           "The parent directory where applications can install their data")
+    _set_fancy(HTML_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/doc/HTML"       "The HTML install dir for documentation")
+--- a/cmake/modules/KDE4Macros.cmake
++++ b/cmake/modules/KDE4Macros.cmake
+@@ -758,6 +758,14 @@
+       set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
+ 
+       kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
++      if (UNIX AND ENABLE_LIBKDEINIT_RUNPATH AND NOT (${LIBKDEINIT_INSTALL_DIR} STREQUAL ${LIB_INSTALL_DIR}))
++         if (CMAKE_SKIP_RPATH)
++            set_target_properties(${_target_NAME} PROPERTIES LINK_FLAGS "-Wl,--enable-new-dtags,-rpath,'${LIBKDEINIT_INSTALL_DIR}'")
++         else (CMAKE_SKIP_RPATH)
++            set_target_properties(${_target_NAME} PROPERTIES INSTALL_RPATH "${LIBKDEINIT_INSTALL_DIR}"
++                                                             LINK_FLAGS    "-Wl,--enable-new-dtags")
++         endif (CMAKE_SKIP_RPATH)
++      endif (UNIX AND ENABLE_LIBKDEINIT_RUNPATH AND NOT (${LIBKDEINIT_INSTALL_DIR} STREQUAL ${LIB_INSTALL_DIR}))
+       target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
+    endif(WIN32)
+ 
+--- a/kinit/CMakeLists.txt
++++ b/kinit/CMakeLists.txt
+@@ -51,6 +51,14 @@
+ 
+ install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
++if (UNIX AND NOT (${LIBKDEINIT_INSTALL_DIR} STREQUAL ${LIB_INSTALL_DIR}))
++    if (CMAKE_SKIP_RPATH)
++        set_target_properties(kdeinit4 PROPERTIES LINK_FLAGS "-Wl,--enable-new-dtags,-rpath,'${LIBKDEINIT_INSTALL_DIR}'")
++    else (CMAKE_SKIP_RPATH)
++        set_target_properties(kdeinit4 PROPERTIES INSTALL_RPATH "${LIBKDEINIT_INSTALL_DIR}"
++                                                  LINK_FLAGS    "-Wl,--enable-new-dtags")
++    endif (CMAKE_SKIP_RPATH)
++endif (UNIX AND NOT (${LIBKDEINIT_INSTALL_DIR} STREQUAL ${LIB_INSTALL_DIR}))
+ ########### kwrapper4 ###############
+ if (WIN32)
+   set(kwrapper_SRCS kwrapper_win.cpp  )

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-02-13 14:21:33 UTC (rev 16912)
+++ trunk/packages/kdelibs/debian/patches/series	2010-02-13 14:42:47 UTC (rev 16913)
@@ -1,5 +1,7 @@
 00_r1089160_khtml_scrolling_fix.diff
 08_add_debian_build_type.diff
+09_disable_usr_lib_install_rpath.diff
+10_make_libkdeinit4_private.diff
 11_default_kde4_xdg_menu_prefix.diff
 13_qt4_designer_plugins_path.diff
 14_hardcode_ptm_device.diff

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2010-02-13 14:21:33 UTC (rev 16912)
+++ trunk/packages/kdelibs/debian/rules	2010-02-13 14:42:47 UTC (rev 16913)
@@ -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 @@
 # 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)))
+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-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
+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
 
-$(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
-
 #binary-predeb/libplasma3::
 #	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars

More information about the pkg-kde-commits mailing list