rev 20264 - in kde-extras/lensfun/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-01-10 00:17:04 +0000 (Sun, 10 Jan 2016)
New Revision: 20264

Added:
   kde-extras/lensfun/trunk/debian/patches/upstream_Patch-47-respect-DESTDIR-when-installing-python-stuf.patch
Modified:
   kde-extras/lensfun/trunk/debian/changelog
   kde-extras/lensfun/trunk/debian/patches/series
Log:
fix DESTDIR installation for the python stuff

backport upstream commit 9ec857bb403accc262a9b5a9c2921b5c064fc9c8


Modified: kde-extras/lensfun/trunk/debian/changelog
===================================================================
--- kde-extras/lensfun/trunk/debian/changelog	2016-01-10 00:13:25 UTC (rev 20263)
+++ kde-extras/lensfun/trunk/debian/changelog	2016-01-10 00:17:04 UTC (rev 20264)
@@ -36,6 +36,9 @@
   * Backport upstream commit 3f74b78e4ee9f1d400ebbf2b9093a0f9c48c6307 to fix
     the Database unit test without an already installed lensfun; patch
     upstream_Use-database-in-source-directory-while-running-tests.patch.
+  * Backport upstream commit 9ec857bb403accc262a9b5a9c2921b5c064fc9c8 to fix
+    DESTDIR installation for the python stuff; patch
+    upstream_Patch-47-respect-DESTDIR-when-installing-python-stuf.patch
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 09 Jan 2016 08:34:11 +0100
 

Modified: kde-extras/lensfun/trunk/debian/patches/series
===================================================================
--- kde-extras/lensfun/trunk/debian/patches/series	2016-01-10 00:13:25 UTC (rev 20263)
+++ kde-extras/lensfun/trunk/debian/patches/series	2016-01-10 00:17:04 UTC (rev 20264)
@@ -1,2 +1,3 @@
 local-mathjax.diff
 upstream_Use-database-in-source-directory-while-running-tests.patch
+upstream_Patch-47-respect-DESTDIR-when-installing-python-stuf.patch

Added: kde-extras/lensfun/trunk/debian/patches/upstream_Patch-47-respect-DESTDIR-when-installing-python-stuf.patch
===================================================================
--- kde-extras/lensfun/trunk/debian/patches/upstream_Patch-47-respect-DESTDIR-when-installing-python-stuf.patch	                        (rev 0)
+++ kde-extras/lensfun/trunk/debian/patches/upstream_Patch-47-respect-DESTDIR-when-installing-python-stuf.patch	2016-01-10 00:17:04 UTC (rev 20264)
@@ -0,0 +1,23 @@
+From 9ec857bb403accc262a9b5a9c2921b5c064fc9c8 Mon Sep 17 00:00:00 2001
+From: Sebastian Kraft <mail at sebastiankraft.net>
+Date: Sat, 9 Jan 2016 20:55:21 +0100
+Subject: [PATCH] Patch #47: respect DESTDIR when installing python stuff
+
+---
+ apps/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index 70c77fd..2f6f8f1 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -42,5 +42,5 @@ IF(PYTHON)
+     IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
+       SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+     ENDIF()
+-    INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})")
++    INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
+ ENDIF(PYTHON)
+-- 
+2.6.4
+