[SCM] kapidox packaging branch, master, updated. dbe3abc1be9b9bbf3ded7d0daeabcdc030635442

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Wed Oct 8 14:31:16 UTC 2014


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

The following commit has been merged in the master branch:
commit dbe3abc1be9b9bbf3ded7d0daeabcdc030635442
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Oct 8 16:31:12 2014 +0200

    sync with Debian archive
---
 debian/changelog | 83 +++++++++++++-------------------------------------------
 debian/control   |  9 +++---
 debian/copyright | 42 ++++++++++++++++------------
 3 files changed, 48 insertions(+), 86 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a1b325..3a033e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,25 @@
-kapidox (5.2.0-0ubuntu1) UNRELEASED; urgency=medium
+kapidox (5.3.0-1) unstable; urgency=medium
 
-  [ Rohan Garg ]
-  * Use new scripts from pkg-kde-tools
+  * New upstream release
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 07 Oct 2014 23:45:06 -0400
+
+kapidox (5.2.0-1) unstable; urgency=medium
 
-  [ Jonathan Riddell ]
   * New upstream release
-  * Use pkg-kde-tools version 3 scripts
+    Drop debian/patches/fix-version, fixed upstream
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 11 Sep 2014 20:18:27 +0000
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 09 Sep 2014 06:28:43 -0400
 
-kapidox (5.1.0-0ubuntu1) utopic; urgency=medium
+kapidox (5.1.0-1) unstable; urgency=medium
 
   * New upstream release
-  * No changes - trigger rebuild 
+    - Drop debian/patches/add-jquery-license, incorporated upstream
+    - Add debian/patches/fix-version to update version number in setup.py
 
- -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:10:26 +0200
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 06 Aug 2014 02:31:05 -0400
 
-kapidox (5.0.0-0ubuntu1) utopic; urgency=medium
+kapidox (5.0.0-1) unstable; urgency=medium
 
   [ Jonathan Riddell ]
   * Initial stable upstream release
@@ -26,65 +29,17 @@ kapidox (5.0.0-0ubuntu1) utopic; urgency=medium
   * Add VCS header fields
 
   [ Scott Kitterman ]
-  * Rework packaging to just build as a python app and not use redundant CMake
-    tools
+  * Rework unoffical Kubuntu packaging to just build as a python app and not
+    use redundant CMake tools
     - Simplify debian/rules
     - Drop unneeded build-depends
     - Make kapidox arch all
   * Improve package description
-  * Add missing depends on python-jinja2 and python-yaml
+  * Add depends on python-jinja2 and python-yaml
   * Add libgv-python as Recommends (since it is optional, but should usually
     be used)
-  * Add lintian-overrides for source-is-missing, the source is in the
-    tar now
+  * Add lintian-overrides for source-is-missing, the source is in the tar
+  * Add debian/patches/add-jquery-license to provide full license text for
+    jquery
 
  -- Scott Kitterman <scott at kitterman.com>  Fri, 11 Jul 2014 11:46:51 -0400
-
-kapidox (4.100.0-0ubuntu1) utopic; urgency=medium
-
-  [ Jonathan Riddell ]
-  * New upstream beta release
-
-  [ Scarlett Clark ]
-  * Bump depends versions
-
-  [ Harald Sitter ]
-  * Remove useless Pre-Depends fields used for multiarch compat in
-    releases older than trusty
-
-  [ José Manuel Santamaría Lema ]
-  * Fix debian/rules so the package is buildable again.
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 02 Jun 2014 13:33:23 +0100
-
-kapidox (4.99.0-0ubuntu1) trusty; urgency=medium
-
-  * New upstream beta release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 05 May 2014 15:39:51 +0100
-
-kapidox (4.98.0-0ubuntu1) trusty; urgency=medium
-
-  * New upstream alpha release
-  * Rename library package for soname 5
-  * New upstream beta release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 29 Mar 2014 10:22:33 +0000
-
-kapidox (4.96.0-0ubuntu1~ubuntu14.04~ppa2) trusty; urgency=medium
-
-  * Add missing python support
-
- -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 13 Feb 2014 09:03:46 -0800
-
-kapidox (4.96.0-0ubuntu1~ubuntu14.04~ppa1) trusty; urgency=medium
-
-  * New upstream alpha release
-
- -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 11 Feb 2014 18:32:47 +0100
-
-kapidox (4.95.0-0ubuntu1) trusty; urgency=low
-
-  * Initial release
-
- -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 30 Jan 2014 08:16:49 +0000
diff --git a/debian/control b/debian/control
index c937001..39cb178 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
 Source: kapidox
 Section: libs
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Maximiliano Curia <maxy at debian.org>
+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,
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/kapidox
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kapidox.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kapidox.git
+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
 
 Package: kapidox
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 1870eb4..b3eba1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,8 @@ Files: *
 Copyright: 2014  Alex Merry <alex.merry at kdemail.net>
            2014  Aurélien Gâteau <agateau at kde.org>
            2014  Alex Turbov <i.zaufi at gmail.com>
+           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+           2014 Scott Kitterman <scott at kitterman.com>
 License: BSD 2 Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -28,21 +30,25 @@ 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: debian/*
-Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+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
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  .
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
kapidox packaging



More information about the pkg-kde-commits mailing list