[SCM] kdevelop-python packaging branch, master, updated. debian/1.7.0-1-7-gb9b3343
Pino Toscano
pino at moszumanska.debian.org
Thu Jan 21 22:45:45 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop-python.git;a=commitdiff;h=b9b3343
The following commit has been merged in the master branch:
commit b9b3343c4df90916358ab74f8ff32a44f5dfcb9c
Author: Pino Toscano <pino at debian.org>
Date: Thu Jan 21 23:33:12 2016 +0100
fix the macro of the Python executable
backport upstream commit 673a4890fd3becfab22c1e9eda2071dafd08a161
---
debian/changelog | 3 +++
debian/patches/series | 1 +
...fix-cmake-macro-name-of-python-executable.patch | 26 ++++++++++++++++++++++
3 files changed, 30 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 33a3d90..4f440c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ kdevelop-python (1.7.2-0r1) UNRELEASED; urgency=medium
* Explicitly use python3.4(-dev): kdev-python seems to require this
particular version, so use it as stop-gap measure to make this plugin
buildable and usable again. (Closes: #810750)
+ * Backport upstream commit 673a4890fd3becfab22c1e9eda2071dafd08a161 to fix
+ the macro of the Python executable; patch
+ upstream_fix-cmake-macro-name-of-python-executable.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 21 Jan 2016 22:56:54 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..567d7ce
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix-cmake-macro-name-of-python-executable.patch
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
new file mode 100644
index 0000000..c5edd9d
--- /dev/null
+++ b/debian/patches/upstream_fix-cmake-macro-name-of-python-executable.patch
@@ -0,0 +1,26 @@
+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
More information about the pkg-kde-commits
mailing list