[SCM] Akonadi packaging branch, master, updated. debian/1.5.1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit dca96882de198b79ffa6935117f8a0dc0c3e5957
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 13 19:34:11 2011 +0200

    Switch debian/rules engine to qt-kde-team/2/*.
    
    Fixes FTBFS. (Closes: #618200)
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |   16 ++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f0c20db..dcc454b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ akonadi (1.5.0-0r1) UNRELEASED; urgency=low
   * Improve passing of MYSQLD_EXECUTABLE flag to cmake.
   * Drop 02_hardcode_debian_mysqld_path.diff, not needed any more.
   * Drop obsolete (pre-KDE 4.1) Breaks.
+  * Switch debian/rules engine to qt-kde-team/2/*. Fix FTBFS in the process.
+    (Closes: #618200)
 
   [ José Manuel Santamaría Lema ]
   * Rename libakonadiprivate1 as libakonadiprotocolinternals1 
diff --git a/debian/control b/debian/control
index 2ac6a3a..25a940f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 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, pkg-kde-tools (>= 0.9),
+Build-Depends: debhelper (>= 7), cmake (>= 2.6.2), automoc, pkg-kde-tools (>= 0.11),
  libqt4-dev (>= 4:4.6.0), shared-mime-info, libmysqlclient-dev,
  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev,
  libsqlite3-dev
diff --git a/debian/rules b/debian/rules
index 91c0c96..5abf91e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,15 @@
 #!/usr/bin/make -f
 
-DEB_CONFIG_INSTALL_DIR = /etc
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V -u-c0
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
-DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld
+override_dh_auto_configure:
+	$(overriden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld \
+	    -DCONFIG_INSTALL_DIR=/etc
 
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
+override_dh_makeshlibs:
+	$(overriden_command) -V -- -c0
 
-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
+override_dh_strip:
+	$(overriden_command) --dbg-package=akonadi-dbg

-- 
Akonadi packaging