[ros-catkin] 03/04: Rebase patches

[Jochen Sprickerhof]

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

jspricke pushed a commit to annotated tag debian/0.7.2-1
in repository ros-catkin.

commit 40032840dbef1dab097bb923ecf83c884d9d9a6d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Sep 17 14:15:12 2016 +0200

    Rebase patches
---
 debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch    | 2 +-
 .../patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch  | 6 +++---
 .../0007-Don-t-export-development-path-to-release-package.patch     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch b/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
index 755cdd8..9c13677 100644
--- a/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
+++ b/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
@@ -7,7 +7,7 @@ Subject: Use profile.d in /usr in _setup_util.py
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
-index cace21c..89c85e2 100755
+index 106507a..da59d5c 100755
 --- a/cmake/templates/_setup_util.py.in
 +++ b/cmake/templates/_setup_util.py.in
 @@ -213,6 +213,7 @@ def find_env_hooks(environ, cmake_prefix_path):
diff --git a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
index 2e95b48..6ef51f0 100644
--- a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
+++ b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
@@ -39,10 +39,10 @@ index 6910906..ce1918f 100644
  # undefine CATKIN_ENV since it might be set in the cache from a previous build
  set(CATKIN_ENV "" CACHE INTERNAL "catkin environment" FORCE)
 diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
-index 7d56edf..7f3266b 100644
+index ee47981..f03c38d 100644
 --- a/cmake/catkin_package.cmake
 +++ b/cmake/catkin_package.cmake
-@@ -313,12 +313,12 @@ function(_catkin_package)
+@@ -320,12 +320,12 @@ function(_catkin_package)
  
    if(NOT PROJECT_SKIP_PKG_CONFIG_GENERATION)
      # ensure that output folder exists
@@ -57,7 +57,7 @@ index 7d56edf..7f3266b 100644
    endif()
  
    # generate devel space cfg-extras for project
-@@ -439,7 +439,7 @@ function(_catkin_package)
+@@ -446,7 +446,7 @@ function(_catkin_package)
        ${catkin_EXTRAS_DIR}/em/pkg.pc.em
        ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}.pc)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}.pc
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
index 9d4a0e5..83f791c 100644
--- 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
@@ -8,10 +8,10 @@ Subject: Don't export development path to release package
  2 files changed, 12 insertions(+), 11 deletions(-)
 
 diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
-index 7f3266b..e41d8dc 100644
+index f03c38d..5a28669 100644
 --- a/cmake/catkin_package.cmake
 +++ b/cmake/catkin_package.cmake
-@@ -276,6 +276,10 @@ function(_catkin_package)
+@@ -283,6 +283,10 @@ function(_catkin_package)
    # used in the cmake extra files
    set(DEVELSPACE TRUE)
    set(INSTALLSPACE FALSE)
@@ -22,7 +22,7 @@ index 7f3266b..e41d8dc 100644
  
    set(PROJECT_SPACE_DIR ${CATKIN_DEVEL_PREFIX})
    set(PKG_INCLUDE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -390,6 +394,10 @@ function(_catkin_package)
+@@ -397,6 +401,10 @@ function(_catkin_package)
    # used in the cmake extra files
    set(DEVELSPACE FALSE)
    set(INSTALLSPACE TRUE)

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