[ros-rosinstall] 01/02: Replace vcs patch with upstream version

[Jochen Sprickerhof]

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

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

commit 93d3017efadea1cbaa6c45cb07e5f490cfcb1717
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jul 25 22:15:40 2017 +0200

    Replace vcs patch with upstream version
    
    Closes: #869162
---
 .../patches/0003-Add-fake-identity-for-VCSs.patch  | 20 -----------
 .../0004-Add-fake-identity-for-VCSs-107.patch      | 40 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0003-Add-fake-identity-for-VCSs.patch b/debian/patches/0003-Add-fake-identity-for-VCSs.patch
deleted file mode 100644
index dcf32b0..0000000
--- a/debian/patches/0003-Add-fake-identity-for-VCSs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 18 Jul 2017 16:26:53 +0200
-Subject: Add fake identity for VCSs
-
----
- test/scm_test_base.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/scm_test_base.py b/test/scm_test_base.py
-index 77cb9d7..795ce05 100644
---- a/test/scm_test_base.py
-+++ b/test/scm_test_base.py
-@@ -126,6 +126,7 @@ class AbstractRosinstallCLITest(unittest.TestCase):
-     """Base class for cli tests"""
-     @classmethod
-     def setUpClass(self):
-+        os.environ['EMAIL'] = 'Your Name <name at example.com>'
-         self.new_environ = copy.copy(os.environ)
-         self.new_environ["PYTHONPATH"] = os.path.join(os.getcwd(), "src")
-         if "ROS_WORKSPACE" in self.new_environ:
diff --git a/debian/patches/0004-Add-fake-identity-for-VCSs-107.patch b/debian/patches/0004-Add-fake-identity-for-VCSs-107.patch
new file mode 100644
index 0000000..f8936c3
--- /dev/null
+++ b/debian/patches/0004-Add-fake-identity-for-VCSs-107.patch
@@ -0,0 +1,40 @@
+From: Jochen Sprickerhof <github at jochen.sprickerhof.de>
+Date: Tue, 25 Jul 2017 22:09:52 +0200
+Subject: Add fake identity for VCSs (#107)
+
+* Add fake identity for VCSs
+
+This makes the unit tests self contained.
+
+* remove no longer supported Python versions
+
+* Update .travis.yml
+
+* nose -w is weird
+
+* use correct python and install to get deps
+
+* comment to try and get travis building the latest commit
+
+* don't run rosws tests, out-of-date
+
+* Add author name and mail for git
+---
+ test/scm_test_base.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/scm_test_base.py b/test/scm_test_base.py
+index 77cb9d7..019b93d 100644
+--- a/test/scm_test_base.py
++++ b/test/scm_test_base.py
+@@ -126,6 +126,10 @@ class AbstractRosinstallCLITest(unittest.TestCase):
+     """Base class for cli tests"""
+     @classmethod
+     def setUpClass(self):
++        os.environ['GIT_AUTHOR_NAME'] = 'Your Name'
++        os.environ['GIT_COMMITTER_NAME'] = 'Your Name'
++        os.environ['GIT_AUTHOR_EMAIL'] = 'name at example.com'
++        os.environ['EMAIL'] = 'Your Name <name at example.com>'
+         self.new_environ = copy.copy(os.environ)
+         self.new_environ["PYTHONPATH"] = os.path.join(os.getcwd(), "src")
+         if "ROS_WORKSPACE" in self.new_environ:
diff --git a/debian/patches/series b/debian/patches/series
index 90e7bb7..3d11c85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001-Add-default-ROS_ROOT-for-rosbuild.patch
 0002-Disable-tests-with-network-connection.patch
-0003-Add-fake-identity-for-VCSs.patch
 0004-Add-missing-dependency.patch
+0004-Add-fake-identity-for-VCSs-107.patch

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