[ros-vcstools] 01/02: Replace VCS patch by 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-vcstools.

commit 97a96169e37ed86a60bd8390bfca7257e9680a74
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jul 28 07:34:40 2017 +0200

    Replace VCS patch by upstream version
    
    Closes: #868652
---
 ...h => 0002-Add-fake-identity-for-VCSs-123.patch} | 27 ++++++++++++++--------
 debian/patches/series                              |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0002-Add-fake-identity-for-VCSs.patch b/debian/patches/0002-Add-fake-identity-for-VCSs-123.patch
similarity index 71%
rename from debian/patches/0002-Add-fake-identity-for-VCSs.patch
rename to debian/patches/0002-Add-fake-identity-for-VCSs-123.patch
index e2f96f3..306ea6c 100644
--- a/debian/patches/0002-Add-fake-identity-for-VCSs.patch
+++ b/debian/patches/0002-Add-fake-identity-for-VCSs-123.patch
@@ -1,12 +1,17 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 18 Jul 2017 15:22:06 +0200
-Subject: Add fake identity for VCSs
+From: Jochen Sprickerhof <github at jochen.sprickerhof.de>
+Date: Fri, 28 Jul 2017 01:02:00 +0200
+Subject: Add fake identity for VCSs (#123)
 
+* Add fake identity for VCSs
+
+This makes the unit tests self contained.
+
+* add author and committer for git
 ---
  test/test_bzr.py | 8 +++-----
- test/test_git.py | 3 +++
+ test/test_git.py | 5 +++++
  test/test_hg.py  | 3 +++
- 3 files changed, 9 insertions(+), 5 deletions(-)
+ 3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/test/test_bzr.py b/test/test_bzr.py
 index 8e260c3..93c5952 100644
@@ -32,19 +37,21 @@ index 8e260c3..93c5952 100644
          self.directories = dict(setUp=self.root_directory)
          self.remote_path = os.path.join(self.root_directory, "remote")
 diff --git a/test/test_git.py b/test/test_git.py
-index cbee034..85d9c81 100644
+index cbee034..bb62d0e 100644
 --- a/test/test_git.py
 +++ b/test/test_git.py
-@@ -53,6 +53,9 @@ except ImportError:
+@@ -52,6 +52,11 @@ try:
+ except ImportError:
      from SocketServer import TCPServer, BaseRequestHandler
  
- 
++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>'
 +
-+
+ 
  class GitClientTestSetups(unittest.TestCase):
  
-     @classmethod
 diff --git a/test/test_hg.py b/test/test_hg.py
 index f45a7c6..7812625 100644
 --- a/test/test_hg.py
diff --git a/debian/patches/series b/debian/patches/series
index d830e5e..06892b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Fix-Disable-unit-tests.patch
-0002-Add-fake-identity-for-VCSs.patch
+0002-Add-fake-identity-for-VCSs-123.patch

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