[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=4f94a35

The following commit has been merged in the master branch:
commit 4f94a3530159274048b171df60bd07704e078369
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 7 16:02:23 2014 +0100

    releasing package kapidox version 5.4.0-0ubuntu1
---
 debian/changelog | 4 ++--
 debian/control   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ded2746..bf5d587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-kapidox (5.4.0-0ubuntu1) UNRELEASED; urgency=medium
+kapidox (5.4.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Nov 2014 18:27:12 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:59:29 +0100
 
 kapidox (5.3.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 39cb178..8eba3a9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: kapidox
 Section: libs
 Priority: optional
-Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Scott Kitterman <scott at kitterman.com>, Scarlett Clark <scarlett at scarlettgatelyclark.com>
 Build-Depends: debhelper (>= 9.0.0),
                dh-python,

-- 
kapidox packaging