[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=1c87766

The following commit has been merged in the master branch:
commit 1c877663e53e2a50947eabe03a98420ad96097ce
Merge: 3926ff54a4feb7403c463a0e6bcdbd60215f434e f1debffa7cb6a5148792f4e94029068b2b3c4499
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 11:44:48 2016 +0200

    Merge branch 'master' into Neon/unstable
    
    # Conflicts:
    #	debian/control

 debian/changelog         | 13 +++++++++++++
 debian/control           |  4 ++--
 debian/upstream/metadata |  7 +++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 3fb192b,6d056f4..9fcd724
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,38 @@@
 +kapidox (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:21:42 +0000
 +
 +kapidox (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:04:31 +0000
 +
+ kapidox (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:00 +0100
+ 
+ kapidox (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:36 +0100
+ 
 +kapidox (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 14:55:18 +0100
 +
  kapidox (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/control
index 741d5c1,df73505..545fb1f
--- a/debian/control
+++ b/debian/control
@@@ -9,9 -8,8 +9,9 @@@ Uploaders: Scott Kitterman <scott at kitte
  Build-Depends: debhelper (>= 9), dh-python, python
  Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kapidox
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kapidox.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kapidox.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kapidox.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kapidox.git
 +X-Python-Version: 2.7
  
  Package: kapidox
  Architecture: all

-- 
kapidox packaging