[ros-catkin] 01/02: Add patch to fix reproducible builds

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to annotated tag debian/0.7.1-3
in repository ros-catkin.

commit c2477192f66bdd9e86e964462982e5c8049c3f39
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Aug 28 14:17:21 2016 +0200

    Add patch to fix reproducible builds
---
 ...xport-development-path-to-release-package.patch | 61 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 62 insertions(+)

diff --git a/debian/patches/0007-Don-t-export-development-path-to-release-package.patch b/debian/patches/0007-Don-t-export-development-path-to-release-package.patch
new file mode 100644
index 0000000..9d4a0e5
--- /dev/null
+++ b/debian/patches/0007-Don-t-export-development-path-to-release-package.patch
@@ -0,0 +1,61 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sun, 28 Aug 2016 14:06:53 +0200
+Subject: Don't export development path to release package
+
+---
+ cmake/catkin_package.cmake         |  8 ++++++++
+ cmake/templates/pkgConfig.cmake.in | 15 ++++-----------
+ 2 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
+index 7f3266b..e41d8dc 100644
+--- a/cmake/catkin_package.cmake
++++ b/cmake/catkin_package.cmake
+@@ -276,6 +276,10 @@ function(_catkin_package)
+   # used in the cmake extra files
+   set(DEVELSPACE TRUE)
+   set(INSTALLSPACE FALSE)
++  set(PROJECT_NAME_SOURCE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
++  set(PROJECT_NAME_DEVEL_PREFIX ${CATKIN_DEVEL_PREFIX})
++  set(PROJECT_NAME_INSTALL_PREFIX "")
++  set(PROJECT_NAME_PREFIX DEVEL)
+ 
+   set(PROJECT_SPACE_DIR ${CATKIN_DEVEL_PREFIX})
+   set(PKG_INCLUDE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -390,6 +394,10 @@ function(_catkin_package)
+   # used in the cmake extra files
+   set(DEVELSPACE FALSE)
+   set(INSTALLSPACE TRUE)
++  set(PROJECT_NAME_SOURCE_PREFIX "")
++  set(PROJECT_NAME_DEVEL_PREFIX "")
++  set(PROJECT_NAME_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
++  set(PROJECT_NAME_PREFIX INSTALL)
+ 
+   set(PROJECT_SPACE_DIR ${CMAKE_INSTALL_PREFIX})
+   set(PKG_INCLUDE_PREFIX ${PROJECT_SPACE_DIR})
+diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
+index a9dd856..1c36e63 100644
+--- a/cmake/templates/pkgConfig.cmake.in
++++ b/cmake/templates/pkgConfig.cmake.in
+@@ -66,17 +66,10 @@ endif()
+ set(@PROJECT_NAME at _CONFIG_INCLUDED TRUE)
+ 
+ # set variables for source/devel/install prefixes
+-if("@DEVELSPACE@" STREQUAL "TRUE")
+-  set(@PROJECT_NAME at _SOURCE_PREFIX @CMAKE_CURRENT_SOURCE_DIR@)
+-  set(@PROJECT_NAME at _DEVEL_PREFIX @CATKIN_DEVEL_PREFIX@)
+-  set(@PROJECT_NAME at _INSTALL_PREFIX "")
+-  set(@PROJECT_NAME at _PREFIX ${@PROJECT_NAME at _DEVEL_PREFIX})
+-else()
+-  set(@PROJECT_NAME at _SOURCE_PREFIX "")
+-  set(@PROJECT_NAME at _DEVEL_PREFIX "")
+-  set(@PROJECT_NAME at _INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@)
+-  set(@PROJECT_NAME at _PREFIX ${@PROJECT_NAME at _INSTALL_PREFIX})
+-endif()
++set(@PROJECT_NAME at _SOURCE_PREFIX @PROJECT_NAME_SOURCE_PREFIX@)
++set(@PROJECT_NAME at _DEVEL_PREFIX @PROJECT_NAME_DEVEL_PREFIX@)
++set(@PROJECT_NAME at _INSTALL_PREFIX @PROJECT_NAME_INSTALL_PREFIX@)
++set(@PROJECT_NAME at _PREFIX ${@PROJECT_NAME at _@PROJECT_NAME_PREFIX at _PREFIX})
+ 
+ # warn when using a deprecated package
+ if(NOT "@PROJECT_DEPRECATED@" STREQUAL "")
diff --git a/debian/patches/series b/debian/patches/series
index 94572e2..0d3bee8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0005-Fix-location-of-etc-for-catkin_find.patch
 0005-Use-profile.d-in-usr-in-_setup_util.py.patch
 0006-use-GNUInstallDirs-when-installing-into-usr.patch
+0007-Don-t-export-development-path-to-release-package.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-catkin.git