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

[Diane Trout]

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

The following commit has been merged in the master branch:
commit bd452acdd6b34057f5a821433f104090fe254797
Author: Diane Trout <diane at ghic.org>
Date:   Thu Oct 31 09:37:01 2013 -0700

    Remove unversioned-header-dir.patch applied upstream.
---
 debian/changelog                            |    1 +
 debian/patches/series                       |    1 -
 debian/patches/unversioned-header-dir.patch |   19 -------------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3236ca2..688e20a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libqinfinity (1:0.5.2-1) UNRELEASED; urgency=low
   * New upstream release 0.5.2.
   * Update copyright file
   * Update symbols file to libqinfinity4
+  * Remove unversioned-header-dir.patch applied upstream.
 
  -- Diane Trout <diane at ghic.org>  Tue, 29 Oct 2013 11:45:47 -0700
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65d64fa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-unversioned-header-dir.patch
diff --git a/debian/patches/unversioned-header-dir.patch b/debian/patches/unversioned-header-dir.patch
deleted file mode 100644
index 90acc90..0000000
--- a/debian/patches/unversioned-header-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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