[SCM] kapidox packaging branch, master, updated. debian/5.11.0-1-8-g1e3d624

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d395f019749debf7cc68674b7fda548aeb1e5f56
Merge: 82e4a59c14f4380a39ca36cba98427364e4fae57 c3f32897e2cffba6d73c94e7573f96459bf6da74
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jul 7 17:30:59 2015 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |  6 ++++++
 debian/control   |  7 ++++---
 debian/copyright | 13 +++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 0c66918,33e29ab..0830870
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,25 @@@
 -kapidox (5.6.0-1~) UNRELEASED; urgency=medium
++kapidox (5.11.0-2~) UNRELEASED; urgency=medium
+ 
 -  * New upstream release (5.6.0).
 -  * Bump Standards-Version to 3.9.6, no changes needed.
+   * Add myself to the Uploaders field.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 22 Jan 2015 16:27:53 +0100
+ 
 +kapidox (5.11.0-1) unstable; urgency=medium
 +
 +  [ Scott Kitterman ]
 +  * New upstream release
 +  * Merge back Ubuntu changes
 +  * Agreed maintainer change from Python Applications Packaging Team to
 +    Debian/Kubuntu Qt/KDE Maintainers
 +  * Update Vcs-* fields in debian/control
 +  * Bump standards version to 3.9.6 without further change
 +
 +  [ Scarlett Clark ]
 +  * Add override_dh_auto_clean to keep git-buildpackage happy by
 +    ignoring errors
 +
 + -- Scott Kitterman <scott at kitterman.com>  Sun, 05 Jul 2015 13:58:25 -0400
 +
  kapidox (5.3.0-1) unstable; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 22d4c38,9eae2bd..73dff1d
--- a/debian/control
+++ b/debian/control
@@@ -1,16 -1,18 +1,17 @@@
  Source: kapidox
  Section: libs
  Priority: optional
 -Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 +Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Scott Kitterman <scott at kitterman.com>, Scarlett Clark <scarlett at scarlettgatelyclark.com>
- Build-Depends: debhelper (>= 9.0.0),
+ Uploaders: Scott Kitterman <scott at kitterman.com>,
+            Scarlett Clark <scarlett at scarlettgatelyclark.com>,
+            Maximiliano Curia <maxy at debian.org>
+ 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/viewvc/python-apps/packages/kapidox/trunk
 -Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/kapidox/trunk
 -X-Python-Version: 2.7
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kapidox.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kapidox.git
- X-Python-Version: 2.7
  
  Package: kapidox
  Architecture: all

-- 
kapidox packaging