rev 17361 - in trunk/packages/akonadi/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-03-05 23:55:22 +0000 (Fri, 05 Mar 2010)
New Revision: 17361

Added:
   trunk/packages/akonadi/debian/patches/03_disable_usr_lib_install_rpath.diff
Modified:
   trunk/packages/akonadi/debian/changelog
   trunk/packages/akonadi/debian/control
   trunk/packages/akonadi/debian/patches/series
   trunk/packages/akonadi/debian/rules
Log:
* Bump libakonadiprivate1 shlibs with each new upstream release.
* Generate strict local shlibs for libakonadiprivate1: use
  library-packages.mk from pkg-kde-tools 0.6.4.
* Add ${misc:Depends} to akonadi-dbg Depends.
* Add 03_disable_usr_lib_install_rpath.diff patch in order to get rid of
  /usr/lib RPATH.

Modified: trunk/packages/akonadi/debian/changelog
===================================================================
--- trunk/packages/akonadi/debian/changelog	2010-03-05 23:45:36 UTC (rev 17360)
+++ trunk/packages/akonadi/debian/changelog	2010-03-05 23:55:22 UTC (rev 17361)
@@ -1,3 +1,15 @@
+akonadi (1.3.1-2) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Bump libakonadiprivate1 shlibs with each new upstream release.
+  * Generate strict local shlibs for libakonadiprivate1: use
+    library-packages.mk from pkg-kde-tools 0.6.4.
+  * Add ${misc:Depends} to akonadi-dbg Depends.
+  * Add 03_disable_usr_lib_install_rpath.diff patch in order to get rid of
+    /usr/lib RPATH.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Mar 2010 01:51:56 +0200
+
 akonadi (1.3.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/akonadi/debian/control
===================================================================
--- trunk/packages/akonadi/debian/control	2010-03-05 23:45:36 UTC (rev 17360)
+++ trunk/packages/akonadi/debian/control	2010-03-05 23:55:22 UTC (rev 17361)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modax at debian.org>,
  Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.4),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.6.4),
  libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient-dev,
  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
 Standards-Version: 3.8.4
@@ -29,7 +29,7 @@
 Package: akonadi-dbg
 Section: debug
 Architecture: any
-Suggests: akonadi-server (= ${binary:Version})
+Depends: ${misc:Depends}
 Description: debugging symbols for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service.  It provides a common framework for applications to store and

Added: trunk/packages/akonadi/debian/patches/03_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/03_disable_usr_lib_install_rpath.diff	                        (rev 0)
+++ trunk/packages/akonadi/debian/patches/03_disable_usr_lib_install_rpath.diff	2010-03-05 23:55:22 UTC (rev 17361)
@@ -0,0 +1,24 @@
+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/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -156,15 +156,6 @@
+   set(LIBRARY_OUTPUT_PATH   ${CMAKE_BINARY_DIR}/lib)
+ endif (WIN32)
+ 
+-# Set up RPATH handling, so the libs are found if they are installed to a non-standard location.
+-# By default cmake builds the targets with full RPATH to everything in the build directory,
+-# but then removes the RPATH when installing.
+-# These two options below make it set the RPATH of the installed targets to all
+-# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+-# install directory. Alex
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+-
+ if(APPLE)
+    set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+ endif(APPLE)

Modified: trunk/packages/akonadi/debian/patches/series
===================================================================
--- trunk/packages/akonadi/debian/patches/series	2010-03-05 23:45:36 UTC (rev 17360)
+++ trunk/packages/akonadi/debian/patches/series	2010-03-05 23:55:22 UTC (rev 17361)
@@ -1,2 +1,3 @@
 01_x11_not_required.diff
 02_hardcode_debian_mysqld_path.diff
+03_disable_usr_lib_install_rpath.diff

Modified: trunk/packages/akonadi/debian/rules
===================================================================
--- trunk/packages/akonadi/debian/rules	2010-03-05 23:45:36 UTC (rev 17360)
+++ trunk/packages/akonadi/debian/rules	2010-03-05 23:55:22 UTC (rev 17361)
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
 DEB_CONFIG_INSTALL_DIR = /etc
-DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V'libakonadiprivate1 (>= 1.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V
 
 DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld
 
+DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
+
 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