[ros-catkin-pkg] 02/05: Rebase patch

[Jochen Sprickerhof]

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

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

commit 6e7edb479928b8d5aa1e6ecb099b92ef18b5a0e4
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jun 23 14:24:18 2017 +0200

    Rebase patch
---
 debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch b/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch
index 834d2b7..43aa31e 100644
--- a/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch
+++ b/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch
@@ -3,14 +3,14 @@ Date: Sat, 28 Jan 2017 17:07:08 +0100
 Subject: Set default ROS_DISTRO to debian
 
 ---
- bin/catkin_create_pkg | 2 +-
+ src/catkin_pkg/cli/create_pkg.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/bin/catkin_create_pkg b/bin/catkin_create_pkg
-index 2f7e265..f1abf48 100755
---- a/bin/catkin_create_pkg
-+++ b/bin/catkin_create_pkg
-@@ -43,7 +43,7 @@ def main(argv=sys.argv[1:], parent_path=os.getcwd()):
+diff --git a/src/catkin_pkg/cli/create_pkg.py b/src/catkin_pkg/cli/create_pkg.py
+index c3117f5..b9ad83e 100644
+--- a/src/catkin_pkg/cli/create_pkg.py
++++ b/src/catkin_pkg/cli/create_pkg.py
+@@ -41,7 +41,7 @@ def main(argv=sys.argv[1:], parent_path=os.getcwd()):
      parser.add_argument('-m', '--maintainer',
                          action='append',
                          help='A single maintainer, may be used multiple times')

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