[SCM] kalzium packaging branch, kde4.10, updated. debian/4.10.2-2

Maximiliano Curia maxy at alioth.debian.org
Fri May 3 20:52:32 UTC 2013 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kalzium.git;a=commitdiff;h=c69c42e

The following commit has been merged in the kde4.10 branch:
commit c69c42e3474b14aefc790f53adef9606d89add47
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 3 21:41:52 2013 +0200

    Update copyright file.
---
 debian/changelog |    1 +
 debian/copyright |   78 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89ba67f..1636f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kalzium (4:4.10.2-2) UNRELEASED; urgency=low
 
   [ Maximiliano Curia ]
   * Add a watch file.
+  * Update copyright file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 08 Apr 2013 13:14:05 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f89e14b..9b0278c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,54 +1,59 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kalzium
+Upstream-Contact: Ian Monroe <ian.monroe at gmail.com>
+                  Jeremy Paul Whiting <jpwhiting at kde.org>
+Source: http://www.kde.org/download/
 Comment: This package was developed for Ubuntu by the Kubuntu Developers and
  modified to be included in Debian. See below the copyright holders for debian/*
  files.
 
 Files: *
-Copyright: 2003-2008 by Carsten Niehaus <cniehaus at kde.org>
-           2007-2008 by Marcus D. Hanwell <marcus at cryos.org>
-           2005 by Inge Wallin
-           2005, 2006 by Pino Toscano, toscano.pino at tiscali.it
-           2009-2010 by Etienne Rebetez, etienne.rebetez at oberwallis.ch
-           2009 by Kashyap R Puranik
-           2006, 2007 by Jerome Pansanel <j.pansanel at pansanel.net>
-           2006 by Georges Khaznadar
-           2007 by Johannes Simon
-           2004 by Thomas Nagy
+Copyright: 2003-2011 by Carsten Niehaus <cniehaus at kde.org>
+           2009-2011, Etienne Rebetez <etienne.rebetez at oberwallis.ch>
+           2008, Frederik Gladhorn <frederik.gladhorn at kdemail.net>
+           2006, Georges Khaznadar
+           2007, Ian Monroe <ian at monroe.nu>
+           2005, Inge Wallin <inge at lysator.liu.se>
+           2006-2007, Jerome Pansanel <j.pansanel at pansanel.net>
+           2007, Johannes Simon
+           2009, Kashyap R Puranik <kashthealien at gmail.com>
+           2010, Luca Tringali, TRINGALINVENT at libero.it
+           2007-2009, Marcus D. Hanwell <marcus at cryos.org>
+           2005-2007, Pino Toscano <pino at kde.org>
+           2004-2006, Thomas Nagy <tnagy2^8 at yahoo.fr>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
-Copyright: 2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Copyright: 2011, Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
+           2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
-Files: src/unitsettingsdialog.* src/kalziumunitcombobox.*
-Copyright: 2011 Rebetez Etienne <etienne.rebetez at oberwallis.ch>
-License: GPL-3+
-
-Files: compoundviewer/libkdeedu_compoundviewer_export.h libscience/libkdeedu_science_export.h
-Copyright: 2007 David Faure <faure at kde.org>
+Files: compoundviewer/libkdeedu_compoundviewer_export.h
+       libscience/libkdeedu_science_export.h
+Copyright: 2007, David Faure <faure at kde.org>
 License: LGPL-2+
 
 Files: doc/*
-Copyright: 2001, 2002, 2004, 2005, 2006, 2007, 2008 Carsten Niehaus
-           2005 Anne-Marie Mahfouf
-License: GFDL-1.2
+Copyright: 2001-2008, Carsten Niehaus <cniehaus at kde.org>
+           2005, Anne-Marie Mahfouf
+License: GFDL-1.2+
 
 Files: cmake/modules/*
-Copyright: 2006, 2007 Montel Laurent, <montel at kde.org>
-           2008, 2009 Gael Guennebaud, <g.gael at free.fr>
-           2006, 2007, Carsten Niehaus, <cniehaus at gmx.de>
-           2006, 2007, 2009, Pino Toscano, <pino at kde.org>
-           2008, Albert Astals Cid, <aacid at kde.org>
+Copyright: 2006, 2007 Montel Laurent <montel at kde.org>
+           2008, 2009 Gael Guennebaud <g.gael at free.fr>
+           2006, 2007, Carsten Niehaus <cniehaus at gmx.de>
+           2006, 2007, 2009, Pino Toscano <pino at kde.org>
+           2008, Albert Astals Cid <aacid at kde.org>
            2008 Marcus D. Hanwell <marcus at cryos.org>
 License: BSD-3-clause
 
 Files: src/psetable/*
-Copyright: 2007-2009 by Marcus D. Hanwell
-           2010-2011 by Etienne Rebetez <etienne.rebetez at oberwallis.ch>
-           2005-2006 by Pino Toscano, toscano.pino at tiscali.it
-           2003-2006 by Carsten Niehaus, cniehaus at kde.org
-License: LGPL-2.1
+Copyright: 2003-2006, Carsten Niehaus <cniehaus at kde.org>
+           2010-2011, Etienne Rebetez <etienne.rebetez at oberwallis.ch>
+           2010, Konstantin Tokarev
+           2007-2009, Marcus D. Hanwell <marcus at cryos.org>
+           2005-2006, Pino Toscano <toscano.pino at tiscali.it>
+License: LGPL-2.1+
 
 Files: src/psetable/statemachine.h
 Copyright: 2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -91,7 +96,7 @@ License: GPL-3+
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-License: GFDL-1.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;
@@ -123,7 +128,7 @@ License: LGPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2'.
 
-License: LGPL-2.1
+License: LGPL-2.1+
  This file is part of the Avogadro molecular editor project.
  For more information, see <http://avogadro.openmolecules.net/>
  .
@@ -147,7 +152,7 @@ License: LGPL-2.1
  `/usr/share/common-licenses/LGPL-2.1'.
 
 License: BSD-3-clause
- "Redistribution and use in source and binary forms, with or without
+ Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
  * Redistributions of source code must retain the above copyright
@@ -171,5 +176,4 @@ License: BSD-3-clause
  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."
- $QT_END_LICENSE$
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
kalzium packaging

More information about the pkg-kde-commits mailing list