[SCM] kapidox packaging branch, master, updated. debian/5.37.0-2-85-gb2e06c9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kapidox.git;a=commitdiff;h=ae96b21

The following commit has been merged in the master branch:
commit ae96b21a09d09259a17b8664275bb7792aadcaa3
Merge: 0b8ea7a8b86910d3f769540f006ec051e1697eab 29523436cbe6c9c01f6e0e74b960536416236719
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Sep 29 14:31:12 2015 -0700

    Manual merge, vivid backport.
     * new upstream release * new upstream release
    -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:47:17 +0200
    
     * new upstream release
     * new upstream release
    -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:47:17 +0200

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

diff --cc debian/changelog
index 91079a9,023e673..4ef9537
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,16 +1,22 @@@
- kapidox (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
+ kapidox (5.14.0-0ubuntu1) wily; urgency=medium
+ 
++  [ Clive Johnston ]
+   * new upstream release
+ 
 - -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:09:26 +0100
++  [ Scarlett Clark ]
++  * Vivid backport. 
++  * Fix copyright shortname.
++  * Fix Vcs entries to point to git.
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:23:40 +0200   
+ 
+ kapidox (5.13.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:47:17 +0200
+ 
+ kapidox (5.12.0-0ubuntu1) wily; urgency=medium
  
    * New upstream release. 
    * Vivid backport. 
diff --cc debian/control
index ad040a1,ad040a1..da19ba5
--- a/debian/control
+++ b/debian/control
@@@ -8,8 -8,8 +8,8 @@@ Uploaders: Scott Kitterman <scott at kitte
  Build-Depends: debhelper (>= 9.0.0), dh-python, python
  Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kapidox
--Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/kapidox/trunk
--Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/kapidox/trunk
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kapidox.git
++Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kapidox.git
  X-Python-Version: 2.7
  
  Package: kapidox
diff --cc debian/copyright
index d384ae1,d384ae1..7cad1ce
--- a/debian/copyright
+++ b/debian/copyright
@@@ -8,7 -8,7 +8,7 @@@ Copyright: 2014  Alex Merry <alex.merry
             2014  Alex Turbov <i.zaufi at gmail.com>
             2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
             2014 Scott Kitterman <scott at kitterman.com>
--License: BSD 2 Clause
++License: BSD_2_Clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:

-- 
kapidox packaging