[SCM] telepathy-logger-qt packaging branch, master, updated. debian/0.4.0-1-18-g1016e9c

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-logger-qt.git;a=commitdiff;h=d6ad511

The following commit has been merged in the master branch:
commit d6ad5114edb7f5c6020f974bc0b54b111d7bb6d2
Author: Diane Trout <diane at ghic.org>
Date:   Fri May 24 21:30:19 2013 -0700

    Install cmake files into common cmake directory
    Update watch file for new upstream location.
---
 debian/libtelepathy-logger-qt4-dev.install |    1 +
 debian/rules                               |    3 ++-
 debian/watch                               |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/libtelepathy-logger-qt4-dev.install b/debian/libtelepathy-logger-qt4-dev.install
index e92f67a..9c820cb 100644
--- a/debian/libtelepathy-logger-qt4-dev.install
+++ b/debian/libtelepathy-logger-qt4-dev.install
@@ -1,3 +1,4 @@
 usr/include/*
 usr/lib/*/libtelepathy-logger-qt4.so
 usr/lib/*/pkgconfig/*
+usr/lib/*/cmake/*
diff --git a/debian/rules b/debian/rules
index a6bc7cc..be2e9e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
+CMAKE_FLAGS = -DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR=1
 include /usr/share/dpkg/architecture.mk
 
 %:
 	dh $@ --parallel --list-missing --dbg-package=libtelepathy-logger-qt4-1-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_SHARED_LIBS=1 -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+	dh_auto_configure -- -DBUILD_SHARED_LIBS=1 -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" $(CMAKE_FLAGS)
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V
diff --git a/debian/watch b/debian/watch
index b70272a..4e0affb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 
-ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/([\d.]+)/src/telepathy-logger-qt-([\d.]+).tar.bz2
+ftp://ftp.kde.org/pub/kde/stable/kde-telepathy/([\d.]+)/src/telepathy-logger-qt-([\d.]+).tar.bz2

-- 
telepathy-logger-qt packaging