[SCM] kcodecs packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfdd9501
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 12:56:02 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=a92cfec
The following commit has been merged in the kubuntu_wily_archive branch:
commit a92cfeccb331ec9eb18c75d7e6256cc329fba292
Merge: 782b71c7906f5824f412cda489d4877c73a2f713 d4bcf67455b7540516e5f78500dd3958a364497c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Apr 16 13:48:43 2015 +0200
Merge commit 'd4bcf67455b7540516e5f78500dd3958a364497c'
Conflicts:
debian/control
debian/copyright
debian/changelog | 46 ++++++++++++++++++++++++++++++++++++++++++++++
debian/copyright | 12 ++++++------
2 files changed, 52 insertions(+), 6 deletions(-)
diff --cc debian/changelog
index 2b84425,c25285e..e90896f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,49 +1,83 @@@
+kcodecs (5.9.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.9.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 16 Apr 2015 10:23:35 +0200
+
+ kcodecs (5.9.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 13 Apr 2015 23:19:24 +0200
+
+kcodecs (5.8.0-1) experimental; urgency=medium
+
+ * New upstream release (5.8.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 14 Mar 2015 22:27:08 +0100
+
+ kcodecs (5.8.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Mar 2015 15:45:48 +0100
+
+kcodecs (5.7.0-1) experimental; urgency=medium
+
+ * New upstream release (5.7.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 27 Feb 2015 23:11:37 +0100
+
+ kcodecs (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 16:27:55 +0100
+
+kcodecs (5.6.0-1) experimental; urgency=medium
+
+ [ Harald Sitter ]
+ * Do not build depend on qt5-default, we only need qtbase5-dev
+
+ [ Maximiliano Curia ]
+ * New upstream release (5.6.0).
+ * Update build dependencies to experimental versions.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update install files.
+ * Update build dependencies to follow cmake.
+ * Update copyright information.
+ * Add basic autopkgtests support.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 22 Jan 2015 18:09:59 +0100
+
+ kcodecs (5.6.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 06 Jan 2015 19:51:30 +0100
+
+ kcodecs (5.5.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 15 Dec 2014 11:16:45 +0100
+
+ kcodecs (5.4.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Nov 2014 15:01:09 +0100
+
+ kcodecs (5.3.0-0ubuntu1) utopic; urgency=medium
+
+ [ Harald Sitter ]
+ * Do not build depend on qt5-default, we only need qtbase5-dev
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 07 Oct 2014 11:11:27 +0100
+
kcodecs (5.2.0-0ubuntu1) utopic; urgency=medium
* New upstream release
diff --cc debian/copyright
index 3d61dbb,0457d3f..019e25b
--- a/debian/copyright
+++ b/debian/copyright
@@@ -3,22 -3,9 +3,20 @@@ Upstream-Name: kcodec
Source: git://anongit.kde.org/kcodecs
Files: *
- debian/*
- autotests/*
-Copyright: © 2011 Romain Perier <bambi at kubuntu.org>
- © 2012 Ni Hui <shuizhuyuanluo at 126.com>
+Copyright: 1999, Lars Knoll <knoll at kde.org>
+ 1999, Lars Knoll <knoll at mpi-hd.mpg.de>
+ 2001-2004, Marc Mutz <mutz at kde.org>
+ 2004, Matt Douhan <matt at fruitsalad.org>
+ 2007, Nick Shaforostoff <shafff at ukr.net>
+ 2001-2006, Nicolas GOUTTE <goutte at kde.org>
+ 2010, Thomas McGuire <mcguire at kde.org>
+ 2010, Volker Krause <vkrause at kde.org>
+ 2008, Wang Hoi <zealot.hoi at gmail.com>
- 2014, Rohan Garg <rohangarg at kubuntu.org>
+License: LGPL-2+
+
+Files: autotests/*
- Copyright: © 2011 Romain Perier <bambi at kubuntu.org>
- © 2012 Ni Hui <shuizhuyuanluo at 126.com>
++Copyright: 2011, Romain Perier <bambi at kubuntu.org>
++ 2012, Ni Hui <shuizhuyuanluo at 126.com>
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@@ -58,98 -44,33 +56,100 @@@ License: Expa
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Files: src/kcharsets.cpp
-Copyright: © 1999 Lars Knoll <knoll at kde.org>
- © 2001, 2003, 2004, 2005, 2006 Nicolas GOUTTE <goutte at kde.org>
- © 2007 Nick Shaforostoff <shafff at ukr.net>
-License: LGPL-2+
+Files: autotests/kcodecstest.cpp
+ autotests/kcodecstest.h
+ autotests/kemailaddresstest.cpp
+ autotests/kemailaddresstest.h
+ autotests/rfc2047test.cpp
+ autotests/rfc2047test.h
+ src/kcodecs.cpp
+ src/kcodecs.h
+ src/kcodecs_p.h
+Copyright: 2014, Daniel Vrátil <dvratil at redhat.com>
+ 2004, David Faure <faure at kde.org>
+ 2000-2001, Dawit Alemayehu <adawit at kde.org>
+ 2001-2002, Marc Mutz <mutz at kde.org>
+ 2001, Rik Hemsley (rikkus) <rik at kde.org>
+ 2009, Thomas McGuire <mcguire at kde.org>
+ 2006, Volker Krause <vkrause at kde.org>
+ 2001, Rik Hemsley <rik at kde.org>
+ 1991-1992, RSA Data Security Inc.
+ 1995, Mordechai T. Abzug
+ 1996-1999, Ronald Tschalär
+License: LGPL-2
-Files: src/kcodecs.*
- src/probers/nsSJISProber.h
+Files: src/probers/nsSJISProber.h
src/probers/nsSBCSGroupProber.h
-Copyright:
- © 1998 <developer at mozilla.org>
- © 2001 Shy Shalom <shooshX at gmail.com>
- © 2000-2001 Dawit Alemayehu <adawit at kde.org>
- © 2001 Rik Hemsley <rik at kde.org>
- © 1991 RSA Data Security Inc. Created
- © 1991 All Rights Reserved.
- © 2000-2001 Dawit Alemayehu <adawit at kde.org>
-License: LGPL-2
+Copyright: 2001, Netscape Communications Corporation
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+ ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ .
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+ .
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+ .
+ The Original Code is Mozilla Universal charset detector code.
+ .
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 2001
+ the Initial Developer. All Rights Reserved.
+ .
+ Contributor(s):
+ Shy Shalom <shooshX at gmail.com>
+ .
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+ .
+ ***** END LICENSE BLOCK *****
-Files: src/kencodingprober.*
- src/kentities.c
+Files: autotests/base64benchmark.cpp
+ autotests/codectest.cpp
+ autotests/codectest.h
+ src/kcharsets.cpp
src/kcharsets.h
- debian/*
-Copyright: © 2008 Wang Hoi <zealot.hoi at gmail.com>
- © 1999 Lars Knoll <knoll at mpi-hd.mpg.de>
- © 1999 Lars Knoll <knoll at kde.org>
- 2014 Rohan Garg <rohangarg at kubuntu.org>
+ src/kcodecsbase64.cpp
+ src/kcodecsbase64.h
+ src/kcodecsidentity.cpp
+ src/kcodecsidentity.h
+ src/kcodecsqp.cpp
+ src/kcodecsqp.h
+ src/kcodecsuuencode.cpp
+ src/kcodecsuuencode.h
+ src/kemailaddress.cpp
+ src/kemailaddress.h
+ src/kencodingprober.cpp
+ src/kencodingprober.h
+ src/kentities.c
- debian/*
+Copyright: 1999, Lars Knoll <knoll at kde.org>
+ 1999, Lars Knoll <knoll at mpi-hd.mpg.de>
+ 2001-2004, Marc Mutz <mutz at kde.org>
+ 2004, Matt Douhan <matt at fruitsalad.org>
+ 2007, Nick Shaforostoff <shafff at ukr.net>
+ 2001-2006, Nicolas GOUTTE <goutte at kde.org>
+ 2010, Thomas McGuire <mcguire at kde.org>
+ 2010, Volker Krause <vkrause at kde.org>
+ 2008, Wang Hoi <zealot.hoi at gmail.com>
- 2014, Rohan Garg <rohangarg at kubuntu.org>
++License: LGPL-2+
++
++Files: debian/*
++Copyright: 2014, Rohan Garg <rohangarg at kubuntu.org>
License: LGPL-2+
License: LGPL-2+
--
kcodecs packaging
More information about the pkg-kde-commits
mailing list