[Python-modules-commits] [vcr.py] 04/09: merge with repo

[Daniel Stender]

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

stender pushed a commit to branch master
in repository vcr.py.

commit cf984af6f8f9560053b13211b7464fc3036d040f
Merge: d5e96a1 a1b8d56
Author: Daniel Stender <stender at debian.org>
Date:   Sat Jun 25 19:13:03 2016 +0200

    merge with repo

 debian/changelog | 3 +++
 debian/control   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 6fdeda7,6072dc7..c9778ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,15 @@@
  vcr.py (1.7.3-2) UNRELEASED; urgency=medium
  
 -  * Fixed VCS URL (https)
 +  * deb/control:
 +    + put team into Maintainer field (for unconfirmed team uploads).
 +    + updated uploader email address.
 +    + bumped standards to 3.9.8 (no changes needed).
 +    + removed Testsuite field (deprecated).
  
 - -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 22:37:23 +0200
++    [ Ondřej Nový ]
++  * Fixed VCS URL (https).
++
 + -- Daniel Stender <stender at debian.org>  Sat, 25 Jun 2016 19:09:46 +0200
  
  vcr.py (1.7.3-1) unstable; urgency=medium
  
diff --cc debian/control
index 0b85248,6d891cd..37eefe4
--- a/debian/control
+++ b/debian/control
@@@ -35,12 -36,13 +35,12 @@@ Build-Depends
   python3-httplib2,
   python3-tornado,
   python3-pytest-tornado
 -Standards-Version: 3.9.6
 +Standards-Version: 3.9.8
  Homepage: https://github.com/kevin1024/vcrpy/
- Vcs-Git: git://anonscm.debian.org/python-modules/packages/vcr.py.git
- Vcs-Browser: http://anonscm.debian.org/cgit/python-modules/packages/vcr.py.git
+ Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/vcr.py.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/vcr.py.git
  X-Python-Version: >= 2.6
  X-Python3-Version: >= 3.3
 -Testsuite: autopkgtest
  
  Package: python-vcr
  Architecture: all

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/vcr.py.git