[SCM] kdevelop-python packaging branch, master, updated. debian/1.7.2-2-5-gccfa24b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ccfa24b5b5640337b8a87468fe17ca80bee6d179
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 6 18:42:45 2016 -0300

    Remove existing patches, they are already applied upstream.
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  2 --
 ...ream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch | 26 ----------------------
 ...fix-cmake-macro-name-of-python-executable.patch | 26 ----------------------
 4 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf28158..431a42a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kdevelop-python (1.7.3-1) UNRELEASED; urgency=medium
   * Bump python build dependency to python3.5 (Closes: #820186).
   * Improve debian/watch to search for different compression methods in
     tarballs and to repack the tarball with xz compression if necessary.
+  * Remove existing patches, they are already applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 May 2016 18:38:08 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 661cd6b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-upstream_fix-cmake-macro-name-of-python-executable.patch
-upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch
diff --git a/debian/patches/upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch b/debian/patches/upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch
deleted file mode 100644
index c6370f7..0000000
--- a/debian/patches/upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b54654be20cfd52cf121784f8a5dd6e77bc4767b Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Fri, 22 Jan 2016 08:22:56 +0100
-Subject: [PATCH] cmake: use CMAKE_LIBRARY_ARCHITECTURE
-
-... instead of hardcoding x86_64-linux-gnu & i386-linux-gnu
----
- cmake/modules/FindPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
-index 17d6c30..136c5c9 100644
---- a/cmake/modules/FindPython.cmake
-+++ b/cmake/modules/FindPython.cmake
-@@ -87,7 +87,7 @@ find_library(PYTHON_LIBRARIES
-     PATHS
-         "${PYTHON_PREFIX}/lib"
-         [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath]/libs
--    PATH_SUFFIXES "" "python${PYTHON_VERSION}/config" "x86_64-linux-gnu" "i386-linux-gnu"
-+    PATH_SUFFIXES "" "python${PYTHON_VERSION}/config" "${CMAKE_LIBRARY_ARCHITECTURE}"
-     DOC "Python libraries" NO_DEFAULT_PATH)
- 
- find_path(PYTHON_INCLUDE_DIRS "Python.h"
--- 
-2.7.0.rc3
-
diff --git a/debian/patches/upstream_fix-cmake-macro-name-of-python-executable.patch b/debian/patches/upstream_fix-cmake-macro-name-of-python-executable.patch
deleted file mode 100644
index c5edd9d..0000000
--- a/debian/patches/upstream_fix-cmake-macro-name-of-python-executable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 673a4890fd3becfab22c1e9eda2071dafd08a161 Mon Sep 17 00:00:00 2001
-From: Sven Brauch <mail at svenbrauch.de>
-Date: Mon, 21 Dec 2015 13:55:32 +0100
-Subject: [PATCH] fix cmake macro name of python executable
-
-BUG:353821
-REVIEW:124185
----
- kdevpythonversion.h.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdevpythonversion.h.cmake b/kdevpythonversion.h.cmake
-index b8557ac..7786449 100644
---- a/kdevpythonversion.h.cmake
-+++ b/kdevpythonversion.h.cmake
-@@ -30,6 +30,6 @@
- 
- #define KDEVPYTHON_VERSION KDE_MAKE_VERSION(@KDEVPYTHON_VERSION_MAJOR@, @KDEVPYTHON_VERSION_MINOR@, @KDEVPYTHON_VERSION_PATCH@)
- 
--#define PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@"
-+#define PYTHON_EXECUTABLE "@PYTHON_EXEC@"
- 
- #endif
--- 
-2.7.0.rc3
-

-- 
kdevelop-python packaging