[SCM] libqinfinity packaging branch, master, updated. d26652420ec22c4f8987812994fa063523759b8f

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libqinfinity.git;a=commitdiff;h=d266524

The following commit has been merged in the master branch:
commit d26652420ec22c4f8987812994fa063523759b8f
Author: Diane Trout <diane at ghic.org>
Date:   Sun Oct 20 21:21:38 2013 -0700

    Backport unversioned-header-dir.patch to put headers into an unversioned directory
---
 debian/changelog                            |    2 ++
 debian/patches/series                       |    1 +
 debian/patches/unversioned-header-dir.patch |   19 +++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d6f5608..a8c473a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ libqinfinity (1:0.5.1-1) experimental; urgency=low
   * Add dependency pkg-kde-tools helper.
   * Introduce epoch to allow changing version number to match that of libinfinity.
   * Remove unneeded debian/*.dirs files
+  * Backport unversioned-header-dir.patch to put headers into an
+    unversioned directory
 
  -- Diane Trout <diane at ghic.org>  Sat, 19 Oct 2013 14:58:35 -0700
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..65d64fa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+unversioned-header-dir.patch
diff --git a/debian/patches/unversioned-header-dir.patch b/debian/patches/unversioned-header-dir.patch
new file mode 100644
index 0000000..90acc90
--- /dev/null
+++ b/debian/patches/unversioned-header-dir.patch
@@ -0,0 +1,19 @@
+Author: Sven Brauch <svenbrauch at googlemail.com>
+Date:   Wed Oct 16 17:38:29 2013 +0200
+Description:
+    Install into include/libqinfinity/ instead of include/libqinfinity/..-1.0
+
+    The version number did not match, and also there's not really a point
+    in the extra subdirectorya
+
+    cherry picked from commit 7bc8175fb8894e14e6a92191e0867e929680fc51
+
+--- a/libqinfinity/CMakeLists.txt
++++ b/libqinfinity/CMakeLists.txt
+@@ -106,5 +106,5 @@
+ 	DESTINATION lib${LIB_SUFFIX})
+ 
+ install(FILES ${QInfinity_HDRS}
+-	DESTINATION include/libqinfinity-1.0/libqinfinity)
++	DESTINATION include/libqinfinity)
+ 

-- 
libqinfinity packaging