[SCM] KDevelop Platform packaging branch, master, updated. debian/1.7.1-1-5-gfb1afbf

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=ec85b22

The following commit has been merged in the master branch:
commit ec85b2231efbc28854a7a2b1e59be4d4c3b6eda6
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jan 17 10:09:53 2016 +0100

    update the patches
    
    - workaround_boost_ftbfs: drop, fixed upstream
    - upstream_make_subversion_plugin_compile: drop, backported from upstream
---
 debian/changelog                                   |   3 +
 debian/patches/series                              |   2 -
 .../upstream_make_subversion_plugin_compile        | 140 ---------------------
 debian/patches/workaround_boost_ftbfs              |  14 ---
 4 files changed, 3 insertions(+), 156 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9384c6a..19f3f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ kdevplatform (1.7.2-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - workaround_boost_ftbfs: drop, fixed upstream
+    - upstream_make_subversion_plugin_compile: drop, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Jan 2016 10:03:52 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 73f977f..a6a68c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 11_disable_examples_tests.diff
-workaround_boost_ftbfs
-upstream_make_subversion_plugin_compile
diff --git a/debian/patches/upstream_make_subversion_plugin_compile b/debian/patches/upstream_make_subversion_plugin_compile
deleted file mode 100644
index 184f368..0000000
--- a/debian/patches/upstream_make_subversion_plugin_compile
+++ /dev/null
@@ -1,140 +0,0 @@
-commit 8117ca137b45816865554d6e86b96d9e633a7e08
-Author: Alex Merry <alex.merry at kde.org>
-Date:   Sun Aug 16 23:59:35 2015 +0100
-
-    Make subversion plugin compile with subversion 1.9.
-    
-    The plugin was formerly using private API, which was hidden in 1.9.
-    
-    REVIEW: 124783
-    (cherry picked from commit cfb7f8d89e4749c7b07c7880b3065bf8a86be22c)
-
-diff --git a/plugins/subversion/kdevsvncpp/client_ls.cpp b/plugins/subversion/kdevsvncpp/client_ls.cpp
-index 6cd79bb..95fd6cb 100644
---- a/plugins/subversion/kdevsvncpp/client_ls.cpp
-+++ b/plugins/subversion/kdevsvncpp/client_ls.cpp
-@@ -29,6 +29,7 @@
- #include "svn_client.h"
- #include "svn_path.h"
- #include "svn_sorts.h"
-+#include "svn_version.h"
- //#include "svn_utf.h"
- 
- // svncpp
-@@ -37,6 +38,8 @@
- #include "kdevsvncpp/exception.hpp"
- 
- 
-+#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
-+
- static int
- compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
- {
-@@ -90,6 +93,72 @@ namespace svn
-   }
- }
- 
-+#else
-+
-+#include <algorithm>
-+
-+static svn_error_t* store_entry(
-+        void *baton,
-+        const char *path,
-+        const svn_dirent_t *dirent,
-+        const svn_lock_t *,
-+        const char *abs_path,
-+        const char *,
-+        const char *,
-+        apr_pool_t *scratch_pool)
-+{
-+  svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
-+  if (path[0] == '

-- 
KDevelop Platform packaging