[SCM] khelpcenter packaging branch, master, updated. d37026304876a5736345a8f0f53e735e1f03cead

Tue Jun 30 15:49:50 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khelpcenter.git;a=commitdiff;h=d370263

The following commit has been merged in the master branch:
commit d37026304876a5736345a8f0f53e735e1f03cead
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 30 16:53:50 2015 +0200

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 107 +++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0a0cd4..a646be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 khelpcenter (4:5.3.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.3.2).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:23:23 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0407c91..13b11fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,8 +10,39 @@ Copyright: 2002-2005, Cornelius Schumacher <schumacher at kde.org>
            1999, Matthias Elter <me at kde.org>
            2000, Matthias Hölzer-Klüpfel <hoelzer at kde.org>
            2002, SuSE Linux AG, Nuernberg
+           2006, Canonical Ltd, and Rosetta Contributors 2006
+           1998-2014, Free Software Foundation, Inc
+           2000, Jesús Bravo Álvarez
+           2008-2009, K Desktop Environment
+           1997-2004, KDE Team
+           2007, KDE i18n Project for Vietnamese
+           1999-2003, Meni Livne <livne at kde.org>
+           2008, Rosetta Contributors and Canonical Ltd 2008
+           2009, Rosetta Contributors and Canonical Ltd 2009
+           2010, Rosetta Contributors and Canonical Ltd 2010
+           2002-2012, This_file_is_part_of_KDE
+           2001, translate.org.za
 License: GPL-2+
 
+Files: doc/ca/fundamentals/index.docbook
+       doc/ca/khelpcenter/index.docbook
+       doc/de/fundamentals/index.docbook
+       doc/de/khelpcenter/index.docbook
+       doc/en/fundamentals/index.docbook
+       doc/en/khelpcenter/index.docbook
+       doc/en_US/fundamentals/index.docbook
+       doc/en_US/khelpcenter/index.docbook
+       doc/it/index.docbook
+       doc/nl/index.docbook
+       doc/pt_BR/fundamentals/index.docbook
+       doc/pt_BR/index.docbook
+       doc/pt_BR/khelpcenter/index.docbook
+       doc/sv/index.docbook
+       doc/uk/index.docbook
+Copyright: 2011, Alexey Subach
+           2011, Salma Sultana
+License: GFDL-1.2+
+
 Files: docentrytraverser.cpp
        docentrytraverser.h
        docmetainfo.cpp
@@ -22,30 +53,50 @@ Files: docentrytraverser.cpp
        scopeitem.h
 Copyright: 2002, Cornelius Schumacher <schumacher at kde.org>
            2001, Waldo Bastian <bastian at kde.org>
-License: GPL-2 or GPL-3
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License version 2 or at your option
- version 3 as published by the Free Software Foundation.
- .
- This program 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; see the file COPYING.  If not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
- .
+License: GPL-2+3
+
+Files: po/ca/htmlsearch.po
+       po/ca/kcmhtmlsearch.po
+       po/ca/khelpcenter.po
+       po/uk/htmlsearch.po
+       po/uk/kcmhtmlsearch.po
+       po/uk/khelpcenter.po
+Copyright: 1998-2015, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ -
+ 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 complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3'.
+
+Files: po/bg/htmlsearch.po
+       po/bg/kcmhtmlsearch.po
+       po/bg/khelpcenter.po
+Copyright: 2009-2012, Yasen Pramatarov <yasen at lindeas.com>
+           2006-2008, 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
- version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise, the
- complete text of the GNU General Public License version 3 can be found in
- "/usr/share/common-licenses/GPL-3".
+ can be found in `/usr/share/common-licenses/GPL'.
 
 Files: debian/*
 Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: GPL-2+
 
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ -
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
+
 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
@@ -62,3 +113,23 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public License
  version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2+3
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License version 2 or at your option
+ version 3 as published by the Free Software Foundation.
+ .
+ This program 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; see the file COPYING.  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 General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3'.

-- 
khelpcenter packaging

