[SCM] Qt DBusMenu library packaging branch, master, updated. debian/0.9.0-1-12-g95f57a8

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit c1382b0c6cec553f34767744624084da4e1cd85a
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Sun Oct 2 11:14:00 2011 +0530

    patches for doc path and multiarch
---
 debian/patches/001-dbusmenu-doc-path.diff       |   14 ++++++++
 debian/patches/002-use-multiarch-lib-paths.diff |   37 +++++++++++++++++++++++
 debian/patches/series                           |    2 +
 3 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/debian/patches/001-dbusmenu-doc-path.diff b/debian/patches/001-dbusmenu-doc-path.diff
new file mode 100644
index 0000000..1f349c5
--- /dev/null
+++ b/debian/patches/001-dbusmenu-doc-path.diff
@@ -0,0 +1,14 @@
+Description: change path for html doc
+ Change path for html documentations from
+ dbusmenu-qt to libdbusmenu-qt
+Origin: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/libdbusmenu-qt/view/head:/debian/patches/kubuntu_02_dbusmenu_doc_path.diff
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,6 +71,6 @@
+         )
+ 
+     install(DIRECTORY ${CMAKE_BINARY_DIR}/html/
+-        DESTINATION share/doc/dbusmenu-qt
++        DESTINATION share/doc/libdbusmenu-qt-doc
+         )
+ endif(WITH_DOC)
diff --git a/debian/patches/002-use-multiarch-lib-paths.diff b/debian/patches/002-use-multiarch-lib-paths.diff
new file mode 100644
index 0000000..951c70a
--- /dev/null
+++ b/debian/patches/002-use-multiarch-lib-paths.diff
@@ -0,0 +1,37 @@
+Description: add multiarch support
+ Adds multiarch support.
+Bug: https://bugs.launchpad.net/ubuntu/+source/sni-qt/+bug/838470
+Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
+Last-Update: 01-10-2011
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,7 @@
+ configure_file(dbusmenu-qt.pc.in ${CMAKE_BINARY_DIR}/dbusmenu-qt.pc @ONLY)
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-qt.pc
+-    DESTINATION lib${LIB_SUFFIX}/pkgconfig
++    DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig
+     )
+ 
+ add_subdirectory(src)
+--- a/dbusmenu-qt.pc.in
++++ b/dbusmenu-qt.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib/@CMAKE_LIBRARY_ARCHITECTURE@
+ includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-qt
+ 
+ Name: libdbusmenu-qt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -73,7 +73,7 @@
+     )
+ 
+ install(TARGETS dbusmenu-qt
+-    LIBRARY DESTINATION lib${LIB_SUFFIX})
++    LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
+ 
+ install(DIRECTORY .
+     DESTINATION include/dbusmenu-qt
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0ac37bd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+001-dbusmenu-doc-path.diff
+002-use-multiarch-lib-paths.diff

-- 
Qt DBusMenu library packaging