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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7847730442c87f20299370aa9345007d4994f8d5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Sep 5 00:15:15 2017 +0200

    Rediff patches
    
    Add Use-DESTDIR-on-install.patch: <REASON>
    Drop don-t-set-the-prefix-twice.patch: <REASON>
---
 debian/patches/Use-DESTDIR-on-install.patch     | 34 +++++++++++++++++++++++++
 debian/patches/don-t-set-the-prefix-twice.patch | 23 -----------------
 debian/patches/series                           |  2 +-
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/debian/patches/Use-DESTDIR-on-install.patch b/debian/patches/Use-DESTDIR-on-install.patch
new file mode 100644
index 0000000..cc0b42f
--- /dev/null
+++ b/debian/patches/Use-DESTDIR-on-install.patch
@@ -0,0 +1,34 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Mon, 4 Sep 2017 22:46:32 +0200
+Subject: Use DESTDIR on install
+
+---
+ cmake-modules/KDEPython.cmake | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cmake-modules/KDEPython.cmake b/cmake-modules/KDEPython.cmake
+index d494036..d4cce34 100644
+--- a/cmake-modules/KDEPython.cmake
++++ b/cmake-modules/KDEPython.cmake
+@@ -104,15 +104,15 @@ MACRO(KDE_ADD_PYTHON_EXECUTABLE _pyname _exename)
+     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(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)
++    GET_FILENAME_COMPONENT(abs_link_name ${LINK_NAME} ABSOLUTE)
++    GET_FILENAME_COMPONENT(link_path ${LINK_NAME} PATH)
+     GET_FILENAME_COMPONENT(abs_link_path ${link_path} ABSOLUTE)
+-    FILE(MAKE_DIRECTORY ${abs_link_path})
+     GET_FILENAME_COMPONENT(abs_target ${TARGET} ABSOLUTE)
+ 
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} ${abs_link_name})")
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod a+x $ENV{DESTDIR}/${abs_target})")
++    INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${abs_link_path})")
++    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} \$ENV{DESTDIR}/${abs_link_name})")
++    INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod a+x \$ENV{DESTDIR}/${abs_target})")
+ 
+ ENDMACRO(KDE_ADD_PYTHON_EXECUTABLE)
diff --git a/debian/patches/don-t-set-the-prefix-twice.patch b/debian/patches/don-t-set-the-prefix-twice.patch
deleted file mode 100644
index dda4d69..0000000
--- a/debian/patches/don-t-set-the-prefix-twice.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 8a4a977..1e0ec07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 Fix-icons-path.patch
-don-t-set-the-prefix-twice.patch
+Use-DESTDIR-on-install.patch

-- 
kajongg packaging