[SCM] kajongg packaging branch, master, updated. debian/16.08.3-1-18-g3c1c3ed

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 5 06:40:29 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kajongg.git;a=commitdiff;h=35d9d97

The following commit has been merged in the master branch:
commit 35d9d9786a452a29b47d63545e4f92dd6e51f7d1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 4 22:47:01 2017 +0200

    Add patch: don-t-set-the-prefix-twice.patch
---
 debian/patches/don-t-set-the-prefix-twice.patch | 23 +++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/don-t-set-the-prefix-twice.patch b/debian/patches/don-t-set-the-prefix-twice.patch
new file mode 100644
index 0000000..dda4d69
--- /dev/null
+++ b/debian/patches/don-t-set-the-prefix-twice.patch
@@ -0,0 +1,23 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Mon, 4 Sep 2017 22:46:32 +0200
+Subject: don't set the prefix twice
+
+---
+ cmake-modules/KDEPython.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake-modules/KDEPython.cmake b/cmake-modules/KDEPython.cmake
+index d494036..e97e9ac 100644
+--- a/cmake-modules/KDEPython.cmake
++++ b/cmake-modules/KDEPython.cmake
+@@ -103,8 +103,8 @@ MACRO(KDE_ADD_PYTHON_EXECUTABLE _pyname _exename)
+          MESSAGE(STATUS "Project name is necessary to create symlink against python program!!! It will fail.")
+     endif(NOT PROJECT_NAME)
+ 
+-    set(TARGET ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname})
+-    set(LINK_NAME ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}/${_exename})
++    set(TARGET ${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname})
++    set(LINK_NAME ${BIN_INSTALL_DIR}/${_exename})
+ 
+     GET_FILENAME_COMPONENT(abs_link_name $ENV{DESTDIR}/${LINK_NAME} ABSOLUTE)
+     GET_FILENAME_COMPONENT(link_path $ENV{DESTDIR}/${LINK_NAME} PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 7816d35..8a4a977 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Fix-icons-path.patch
+don-t-set-the-prefix-twice.patch

-- 
kajongg packaging



More information about the pkg-kde-commits mailing list