[SCM] ktp-call-ui packaging branch, master, updated. debian/0.4.0-1-27-g4304e0c

Diane Trout diane-guest at alioth.debian.org
Wed Jul 10 05:05:08 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git;a=commitdiff;h=a9e4d54

The following commit has been merged in the master branch:
commit a9e4d54a2f8d59f8140b1c78687261b933300f61
Author: Diane Trout <diane at caltech.edu>
Date:   Wed May 22 23:10:53 2013 -0700

    Provide paths for dbus-1.0 and telepathy-1.0 headers.
    
    I also needed to patch libqtf/CMakeLists.txt to accept
    a DBUS_INCLUDE_DIR
---
 debian/patches/dbus_include.patch |   10 ++++++++++
 debian/patches/series             |    1 +
 debian/rules                      |    7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/patches/dbus_include.patch b/debian/patches/dbus_include.patch
new file mode 100644
index 0000000..8c69f73
--- /dev/null
+++ b/debian/patches/dbus_include.patch
@@ -0,0 +1,10 @@
+--- a/libqtf/CMakeLists.txt
++++ b/libqtf/CMakeLists.txt
+@@ -10,6 +10,7 @@
+     ${TP_FARSTREAM_INCLUDE_DIRS}
+     ${FARSTREAM_INCLUDE_DIRS}
+     ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
++    ${DBUS_INCLUDE_DIR}
+ )
+ 
+ add_definitions(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..83b55df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dbus_include.patch
diff --git a/debian/rules b/debian/rules
index 28a21fa..ba4c577 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
 
+CMAKE_FLAGS := \
+    -DTP_FARSTREAM_INCLUDE_DIRS=/usr/include/telepathy-1.0 \
+    -DDBUS_INCLUDE_DIR=/usr/include/dbus-1.0
+
 %:
 	dh $@ --parallel --with kde --dbg-package=kde-telepathy-call-ui-dbg --list-missing
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CMAKE_FLAGS)

-- 
ktp-call-ui packaging



More information about the pkg-kde-commits mailing list