[ros-rospack] 01/01: Simplify patches

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-rospack.

commit 1ad05ffec68828dfed7bd6b32f6ecb3e8cc71fd2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Jul 12 19:26:06 2017 +0200

    Simplify patches
---
 .../0003-Make-rospack-usable-without-rosdep.patch    |  6 +++---
 .../0004-Limit-search-depth-for-usr-share.patch      |  2 +-
 debian/patches/0007-Add-missing-include.patch        | 20 --------------------
 debian/patches/series                                |  1 -
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/patches/0003-Make-rospack-usable-without-rosdep.patch b/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
index 3dfea40..737b921 100644
--- a/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
+++ b/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
@@ -7,7 +7,7 @@ Subject: Make rospack usable without rosdep
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 3b2ea3d..ce0420b 100644
+index 3b2ea3d..feac065 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
 @@ -1696,10 +1696,16 @@ Rosstackage::isSysPackage(const std::string& pkgname)
@@ -21,7 +21,7 @@ index 3b2ea3d..ce0420b 100644
 +
 +      static bool rosdep_warning = false;
 +      if(!rosdep_warning) {
-+        std::cerr << "could not find python module 'rosdep2.rospack', continuing without it" << std::endl;
++        fprintf(stderr, "could not find python module 'rosdep2.rospack', continuing without it");
 +        rosdep_warning = true;
 +      }
 +      cache[pkgname] = true;
@@ -37,7 +37,7 @@ index 3b2ea3d..ce0420b 100644
 +
 +      static bool rosdep_cache_warning = false;
 +      if(!rosdep_cache_warning) {
-+        std::cerr << "could not find rosdep cache, continuing without it" << std::endl;
++        fprintf(stderr, "could not find rosdep cache, continuing without it");
 +        rosdep_cache_warning = true;
 +      }
 +      cache[pkgname] = true;
diff --git a/debian/patches/0004-Limit-search-depth-for-usr-share.patch b/debian/patches/0004-Limit-search-depth-for-usr-share.patch
index 3bf13b6..ce4014f 100644
--- a/debian/patches/0004-Limit-search-depth-for-usr-share.patch
+++ b/debian/patches/0004-Limit-search-depth-for-usr-share.patch
@@ -7,7 +7,7 @@ Subject: Limit search depth for /usr/share
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index ce0420b..ece8b3f 100644
+index feac065..8b0da6e 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
 @@ -30,6 +30,7 @@
diff --git a/debian/patches/0007-Add-missing-include.patch b/debian/patches/0007-Add-missing-include.patch
deleted file mode 100644
index c06c8f3..0000000
--- a/debian/patches/0007-Add-missing-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Wed, 12 Jul 2017 18:47:54 +0200
-Subject: Add missing include
-
----
- src/rospack.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/rospack.cpp b/src/rospack.cpp
-index ece8b3f..89cfacf 100644
---- a/src/rospack.cpp
-+++ b/src/rospack.cpp
-@@ -62,6 +62,7 @@
- 
- #include <algorithm>
- #include <climits>
-+#include <iostream>
- 
- #include <sys/stat.h>
- #include <stdio.h>
diff --git a/debian/patches/series b/debian/patches/series
index 8a6a6d1..5faec0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0004-Limit-search-depth-for-usr-share.patch
 0006-Fix-unit-tests.patch
 0007-Replace-PATH_MAX-by-getcwd-NULL-0-in-unit-test.patch
-0007-Add-missing-include.patch

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