[SCM] ki18n packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g40469d4
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:01:43 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ki18n.git;a=commitdiff;h=f639238
The following commit has been merged in the kubuntu_unstable branch:
commit f639238423c018175fbe8c0bb748c30398b65d0b
Merge: c487f22822fb9a8ff3d5fd02771b811fd6ee19cb 218d3a1c08dc8a8c31005d267175e703c84fda09
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Mar 2 15:47:37 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/changelog | 32 ++++++++++++++++++++-
debian/copyright | 86 +++++++++++++++++++++++++++++++++++++++-----------------
2 files changed, 91 insertions(+), 27 deletions(-)
diff --cc debian/changelog
index 9fce47f,cb239b7..b60bc0f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,33 +1,53 @@@
+ki18n (5.7.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.7.0).
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Feb 2015 17:34:58 +0100
+
+ ki18n (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 17:01:36 +0100
+
+ki18n (5.6.0-1) experimental; urgency=medium
+
+ * New upstream release (5.6.0).
+ * Bump build dependencies to build against the experimental versions.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update install files.
+ * Remove kjs build dependency, keep ki18n in tier 1.
+ * Update copyright information.
+ * Add basic autopkgtests support.
+ * Add missing dev dependency (thanks to acc headers check).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 23 Jan 2015 12:15:49 +0100
+
+ ki18n (5.6.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 06 Jan 2015 20:19:41 +0100
+
+ ki18n (5.5.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 15 Dec 2014 12:17:20 +0100
+
+ ki18n (5.4.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Nov 2014 15:10:14 +0100
+
+ ki18n (5.3.0-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 07 Oct 2014 11:19:20 +0100
+
ki18n (5.2.0-0ubuntu1) utopic; urgency=medium
* New upstream release
@@@ -28,7 -38,7 +58,7 @@@
ki18n (5.1.0-0ubuntu1) utopic; urgency=medium
-- * Update copyright to match licensing to source
++ * Update copyright to match licensing to source
* New upstream release
-- Scarlett Clark <scarlett at scarlettgatelyclark.com> Tue, 05 Aug 2014 17:11:08 +0200
diff --cc debian/copyright
index 1e21668,fb728b8..9292f24
--- a/debian/copyright
+++ b/debian/copyright
@@@ -3,81 -3,19 +3,77 @@@ Upstream-Name: ki18
Source: https://projects.kde.org/projects/frameworks/ki18n
Files: *
-- debian/*
-Copyright: © 2006-2008, 2012-2013 Chusslove Illich <caslav.ilic at gmx.net>
- © 2006 Alexander Neundorf <neundorf at kde.org>
- © 2013 Aurélien Gâteau <agateau at kde.org>
- © 2001 Hans Petter Bieker <bieker at kde.org>
- © 1995-1998, 2000-2002, 2004-2006 Free Software Foundation Inc.
- © 2005 Thomas Braxton <brax108 at cox.net>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2006-2013, Chusslove Illich <caslav.ilic at gmx.net>
+ 1995-2006, Free Software Foundation, Inc
- © 2006 Alexander Neundorf <neundorf at kde.org>
- © 2013 Aurélien Gâteau <agateau at kde.org>
- 2001 Hans Petter Bieker <bieker at kde.org>
++ 2001, Hans Petter Bieker <bieker at kde.org>
+ 2014, Kevin Krammer <krammer at kde.org>
- © 2005 Thomas Braxton <brax108 at cox.net>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
++ 2009, Adriaan de Groot, Mustapha Abubakar, Ibrahim Dasuna
++ 2006, Canonical Ltd, and Rosetta Contributors 2006
++ 1998, Erez Nir <erez-n at actcom.co.il>
++ 2000-2010, Free Software Foundation, Inc
++ 2008-2009, K Desktop Environment
++ 2005, KDE Armenian translation team
++ 2005, KDE Russian translation team
++ 2000-2003, KDE e.v
++ 2007, KDE i18n Project for Vietnamese
++ 1999-2003, Meni Livne <livne at kde.org>
++ 2008, This_file_is_part_of_KDE
++ 2001, translate.org.za
License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This library 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
- Files: cmake/*
- Copyright: 2014, Alex Richardson <arichardson.kde at gmail.com>
- 2006-2007, Alexander Neundorf <neundorf at kde.org>
++Files: COPYING-CMAKE-SCRIPTS
++ cmake/KF5I18NMacros.cmake
++ cmake/kf5i18nuic.cmake
++Copyright: 2006-2007, Alexander Neundorf <neundorf at kde.org>
+ 2007-2009, Kitware, Inc
++ The Regents of the University of California
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (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: autotests/ktranscriptcleantest.cpp
+ autotests/ktranscriptcleantest.h
+ autotests/ktranscripttest.cpp
+ autotests/ktranscripttest.h
++ po/ca/ki18n5.po
++ po/ca at valencia/ki18n5.po
++ po/uk/ki18n5.po
+ src/klocalizedtranslator.cpp
+ src/klocalizedtranslator.h
+Copyright: 2013, Aurélien Gâteau <agateau at kde.org>
+ 2014, Chusslove Illich <caslav.ilic at gmx.net>
+ 2014, Kevin Krammer <krammer at kde.org>
+ 2014, Martin Gräßlin <mgraesslin at kde.org>
++ 2014, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@@ -89,17 -27,20 +85,22 @@@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
.
- On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise,
+ the version 3 of the GNU Lesser General Public License can be found in
+ "/usr/share/common-licenses/LGPL-3".
-Files: autotests/ktranscripttest.cpp
- autotests/ktranscripttest.h
-Copyright: 2013 Aurélien Gâteau <agateau at kde.org>
-License: LGPL-KDEeV
++Files: cmake/FindLibIntl.cmake
++Copyright: 2014, Alex Richardson <arichardson.kde at gmail.com>
++License: BSD
++ Redistribution and use is allowed according to the terms of the BSD license.
++
+Files: autotests/klocalizedstringtest.h
+Copyright: 2005, Thomas Braxton <brax108 at cox.net>
+License: LGPL-2
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@@ -113,3 -54,23 +114,36 @@@
.
On Debian systems, the complete text of the GNU Library General
Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
-Files: autotests/klocalizedstringtest.h
-Copyright: 2005 Thomas Braxton <brax108 at cox.net>
-License: LGPL-2
++Files: po/bg/ki18n5.po
++Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
++ 2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
++License: GPL
++ This file is licensed under the GPL.
++ .
++ On Debian systems, the complete text of the GNU General Public License can be
++ found in "/usr/share/common-licenses/GPL".
++
++Files: debian/*
++Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
++License: LGPL-2+
++
++License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
++
--
ki18n packaging
More information about the pkg-kde-commits
mailing list