[Python-modules-commits] [pyspf] 04/04: Merge branch 'master' of git+ssh://git.debian.org/git/python-modules/packages/pyspf

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository pyspf.

commit 80758f1950ed0bfaf84626b8d6d73dd2416fb7a1
Merge: 6569ee9 47163fe
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sat Jul 30 01:25:52 2016 -0400

    Merge branch 'master' of git+ssh://git.debian.org/git/python-modules/packages/pyspf
    
    Conflicts:
    	debian/changelog

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

diff --cc debian/changelog
index 8385227,5c976bb..c013ae2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,17 @@@
  pyspf (2.0.12t-2) UNRELEASED; urgency=medium
  
 +  [ Scott Kitterman ]
- 
 +  * Add "--slave" directive to update-alternatives to man page for spfquery
 +    is provided when spfquery.pyspf is the selected spfquery (Closes: #814985)
 +  * Bump standards version to 3.9.8 without further change
 +
++  [ Ondřej Nový ]
+   * Fixed VCS URL (https)
+ 
 - -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:53:48 +0200
 +  [ SVN-Git Migration ]
 +  * Migrate packaging to git with git-dpm
 +
 + -- Scott Kitterman <scott at kitterman.com>  Sat, 30 Jul 2016 01:17:07 -0400
  
  pyspf (2.0.12t-1) unstable; urgency=medium
  
diff --cc debian/control
index d3f9f24,05051fc..e7a0fd5
--- a/debian/control
+++ b/debian/control
@@@ -7,9 -7,9 +7,9 @@@ Build-Depends: debhelper (>= 9), dh-pyt
  X-Python-Version: >= 2.6
  X-Python3-Version: >= 3.3
  Homepage: https://pypi.python.org/pypi/pyspf/
- Vcs-Git: git://anonscm.debian.org/python-modules/packages/pyspf.git
+ Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pyspf.git
  Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pyspf.git
 -Standards-Version: 3.9.6
 +Standards-Version: 3.9.8
  
  Package: python-spf
  Architecture: all

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