[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=23acdf3

The following commit has been merged in the master branch:
commit 23acdf39c0a62e03db4b977f92374b487f4c98b7
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Jul 13 08:22:11 2015 -0700

    New upstream release.
---
 debian/changelog | 6 ++++++
 debian/control   | 9 ++++-----
 debian/copyright | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b631ee6..20dc629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kapidox (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release. 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Jul 2015 08:21:41 -0700
+
 kapidox (5.10.0-0ubuntu1) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index eed0e86..ad040a1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: libs
 Priority: optional
 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,
-               python,
+Uploaders: Scott Kitterman <scott at kitterman.com>,
+           Scarlett Clark <scarlett at scarlettgatelyclark.com>
+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
@@ -15,7 +14,7 @@ X-Python-Version: 2.7
 
 Package: kapidox
 Architecture: all
-Depends: ${python:Depends}, python-jinja2, python-yaml, ${misc:Depends}
+Depends: python-jinja2, python-yaml, ${misc:Depends}, ${python:Depends}
 Recommends: libgv-python
 Description: API documentation generation tool for KDE frameworks
  Framework to aid in creating API documentation for KDE Frameworks in a
diff --git a/debian/copyright b/debian/copyright
index b3eba1a..d384ae1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,7 +30,7 @@ License: BSD 2 Clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/jquery/jquery-2.1.0.js 
+Files: src/jquery/jquery-2.1.0.js
        src/kapidox/data/htmlresource/jquery-2.1.0.min.js
 Copyright: 2005, 2013 2014 jQuery Foundation, Inc. and other contributors
 License: Expat

-- 
kapidox packaging