[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=411aed1

The following commit has been merged in the master branch:
commit 411aed17b4565d65cd09ea51cfd08e519c55736e
Merge: 1544c874db13cf599312c85ac08b01fc9f3fa7fd 23a3e9a38ee178859ff6fdaff915282110e8d0d6
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Sep 23 14:11:12 2016 +0200

    Merging debian/5.25.0-1 into Neon/unstable
    
    NOCI

 debian/.gitattributes |  1 +
 debian/changelog      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/control        |  4 ++--
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index f13a9b0,af40a66..170ecdc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,47 +1,89 @@@
 +kapidox (5.26.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 12 Sep 2016 08:34:09 +0000
 +
+ kapidox (5.25.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 18 Aug 2016 17:20:55 +0200
+ 
 +kapidox (5.25.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Sat, 13 Aug 2016 20:15:10 +0000
 +
+ kapidox (5.24.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 15 Jul 2016 05:24:56 +0200
+ 
 +kapidox (5.24.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Jul 2016 07:42:26 +0000
 +
+ kapidox (5.23.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 17 Jun 2016 16:34:18 +0200
+ 
 +kapidox (5.23.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 13 Jun 2016 09:38:48 +0000
 +
+ kapidox (5.22.0-2) unstable; urgency=medium
+ 
+   * Fix vcs-browser field.
+     Thanks to Zhang Jingqiang for reporting (Closes: 824540)
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 18 May 2016 17:32:14 +0200
+ 
+ kapidox (5.22.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.22.0)
+   * Release to unstable.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 17 May 2016 10:58:04 +0200
+ 
 +kapidox (5.22.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Tue, 17 May 2016 07:27:35 +0000
 +
+ kapidox (5.21.0-1) experimental; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * Add upstream metadata (DEP-12)
+   * debian/control: Update Vcs-Browser and Vcs-Git fields
+   * Add a .gitattributes file to use dpkg-mergechangelogs
+ 
+   [ Automatic packaging ]
+   * Bump Standards-Version to 3.9.8
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 04 May 2016 18:38:59 +0200
+ 
 +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).
diff --cc debian/control
index 545fb1f,93d04fb..9218355
--- a/debian/control
+++ b/debian/control
@@@ -7,11 -6,10 +7,11 @@@ Uploaders: Scott Kitterman <scott at kitte
             Scarlett Clark <scarlett at scarlettgatelyclark.com>,
             Maximiliano Curia <maxy at debian.org>
  Build-Depends: debhelper (>= 9), dh-python, python
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Homepage: https://projects.kde.org/projects/frameworks/kapidox
- Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kapidox.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/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