[SCM] rocs packaging branch, master, updated. debian/4.7.4-2-10-g43bae73

Pino Toscano pino at alioth.debian.org
Sat Jun 16 14:36:38 UTC 2012


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

The following commit has been merged in the master branch:
commit 18559d0cacd753eb2d9f7cb4003d56e17365f8ca
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 16:18:57 2012 +0200

    copyright: convert to copyright-format v1.0, fix/update
---
 debian/changelog |    1 +
 debian/copyright |  192 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 105 insertions(+), 88 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65dcb01..6c59c08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ rocs (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3, no changes required.
   * Add watch file.
   * Drop patch upstream_enable_exceptions.diff, backported from upstream.
+  * Convert copyright to copyright-format v1.0 and fix/update.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Jun 2012 15:08:14 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5724769..d74b071 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,108 +1,135 @@
-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: rocs
 Source: ftp.kde.org
 
 Files: *
-Copyright: 2008, Ugo Sangiori <ugorox at gmail.com>
+Copyright: 2001-2002, Duncan Mac-Vicar Prett <duncan at kde.org>
+           2002-2003, Martijn Klingens <klingens at kde.org>
+           2002-2005, Olivier Goffart <ogoffart at kde.org>
+           2004-2011, Tomaz Canabrava <tomaz.canabrava at gmail.com>
+           2008, Ugo Sangiori <ugorox at gmail.com>
+           2009-2011, Wagner Reck <wagner.reck at gmail.com>
+           2011, Andreas Cord-Landwehr <cola at uni-paderborn.de> <phoenixx at uni-paderborn.de>
+License: GPL-2+
+
+Files: src/Actions/ZoomAction.h
+       src/Core/Data.cpp
+       src/Core/Data.h
+       src/Core/DataStructure.cpp
+       src/Core/DataStructure.h
+       src/Core/KrossBackend.cpp
+       src/Core/KrossBackend.h
+       src/Core/Pointer.cpp
+       src/Core/Pointer.h
+       src/Core/QtScriptBackend.cpp
+       src/Core/QtScriptBackend.h
+       src/Plugins/DataStructure/Graph/GraphNode.cpp
+       src/Plugins/DataStructure/Graph/GraphNode.h
+       src/Plugins/ToolsPluginInterface.cpp
+Copyright: 2001-2002, Duncan Mac-Vicar Prett <duncan at kde.org>
+           2002-2004, Olivier Goffart <ogoffart at kde.org>
+           2004-2011, Tomaz Canabrava <tomaz.canabrava at gmail.com>
            2010-2011, Wagner Reck <wagner.reck at gmail.com>
-           2008-2011, Tomaz Canabrava <tomaz.canabrava at gmail.com>
            2011, Andreas Cord-Landwehr <cola at uni-paderborn.de>
-           2006-2007, Gael de Chalendar <kleag at free.fr>
-License: GPL-2+
+License: LGPL-2.1+
 
-Files: src/Plugins/PluginManager.cpp
-       src/Plugins/importPlainTXT/PlainTxtFilePlugin.cpp
-       src/Plugins/importPlainTXT/PlainTxtFilePlugin.h
-       src/Plugins/dotParser/DotParser.cpp
-       src/Plugins/dotParser/tests/ParseDotTest.h
-       src/Plugins/dotParser/tests/ParseDotTest.cpp
-       src/Plugins/dotParser/DotParser.h
-       src/Plugins/FilePluginInterface.h
-       src/Plugins/kmlParser/KMLParser.h
-       src/Plugins/kmlParser/KMLHandler.h
-       src/Plugins/kmlParser/KMLHandler.cpp
-       src/Plugins/kmlParser/KMLParser.cpp
-       src/Plugins/FilePluginInterface.cpp
-       src/Plugins/MakeComplete/makecompletetoolsplugin.h
-       src/Plugins/MakeComplete/makecompletetoolsplugin.cpp
-       src/Plugins/GMLParser/GMLParser.cpp
-       src/Plugins/GMLParser/tests/ParseDotTest.h
-       src/Plugins/GMLParser/tests/ParseDotTest.cpp
-       src/Plugins/GMLParser/GMLParser.h
-       src/Plugins/PluginManager.h
+Files: src/Core/DataStructurePluginManager.cpp
+       src/Core/DataStructurePluginManager.h
+       src/Core/DocumentManager.cpp
+       src/Core/DynamicPropertiesList.cpp
+       src/Core/DynamicPropertiesList.h
+       src/Plugins/DataStructure/Graph/GraphPlugin.cpp
+       src/Plugins/DataStructure/Graph/GraphPlugin.h
+       src/Plugins/DataStructure/Graph/GraphStructure.cpp
+       src/Plugins/DataStructure/Graph/GraphStructure.h
        src/Plugins/DataStructure/LinkedList/ListNode.cpp
        src/Plugins/DataStructure/LinkedList/ListNode.h
+       src/Plugins/DataStructure/LinkedList/ListPlugin.cpp
        src/Plugins/DataStructure/LinkedList/ListPlugin.h
        src/Plugins/DataStructure/LinkedList/ListStructure.cpp
-       src/Plugins/DataStructure/LinkedList/ListPlugin.cpp
        src/Plugins/DataStructure/LinkedList/ListStructure.h
-       src/Plugins/DataStructure/Graph/GraphPlugin.h
-       src/Plugins/DataStructure/Graph/GraphStructure.h
-       src/Plugins/DataStructure/Graph/GraphPlugin.cpp
-       src/Plugins/DataStructure/Graph/GraphStructure.cpp
-       src/Core/DataStructurePluginManager.h
-       src/Core/DocumentManager.h
-       src/Core/DynamicPropertiesList.h
-       src/Core/DataStructurePluginManager.cpp
-       src/Core/DocumentManager.cpp
-       src/Core/DynamicPropertiesList.cpp
-       src/Interface/ImporterExporterManager.h
-       src/Interface/edgepropertieswidget.h
-       src/Interface/edgepropertieswidget.cpp
-       src/Interface/PossibleIncludes.cpp
-       src/Interface/ImporterExporterManager.cpp
-       src/Interface/PossibleIncludes.h
-       src/Tests/TestDynamicProperties.h
+       src/Plugins/FilePluginInterface.cpp
+       src/Plugins/FilePluginInterface.h
+       src/Plugins/FilePlugins/dotParser/DotParser.cpp
+       src/Plugins/FilePlugins/dotParser/DotParser.h
+       src/Plugins/FilePlugins/dotParser/tests/ParseDotTest.cpp
+       src/Plugins/FilePlugins/dotParser/tests/ParseDotTest.h
+       src/Plugins/FilePlugins/GMLParser/GMLParser.cpp
+       src/Plugins/FilePlugins/GMLParser/GMLParser.h
+       src/Plugins/FilePlugins/GMLParser/tests/ParseGMLTest.cpp
+       src/Plugins/FilePlugins/GMLParser/tests/ParseGMLTest.h
+       src/Plugins/FilePlugins/kmlParser/KMLHandler.cpp
+       src/Plugins/FilePlugins/kmlParser/KMLHandler.h
+       src/Plugins/FilePlugins/kmlParser/KMLParser.cpp
+       src/Plugins/FilePlugins/kmlParser/KMLParser.h
+       src/Plugins/FilePlugins/TXTParser/PlainTxtFilePlugin.cpp
+       src/Plugins/FilePlugins/TXTParser/PlainTxtFilePlugin.h
+       src/Plugins/PluginManager.cpp
+       src/Plugins/PluginManager.h
        src/Tests/TestDataStructure.cpp
        src/Tests/TestDataStructure.h
        src/Tests/TestDynamicProperties.cpp
-Copyright: 2009-2011, Tomaz Martins dos Santos Canabrava <tomaz.canabrava at gmail.com>
+       src/Tests/TestDynamicProperties.h
+Copyright: 2010-2011, Tomaz Canabrava <tomaz.canabrava at gmail.com>
            2010-2011, Wagner Reck <wagner.reck at gmail.com>
            2011, Andreas Cord-Landwehr <cola at uni-paderborn.de>
-           2010, Andrew Coles <andrew.i.coles at googlemail.com>
 License: GPL-3+
 
-Files: src/Plugins/DataStructure/Graph/GraphNode.cpp
-       src/Plugins/DataStructure/Graph/GraphNode.h
-       src/Plugins/ToolsPluginInterface.cpp
-       src/Actions/zoom.h
-       src/Actions/zoom.cpp
-       src/Core/DataStructure.h
-       src/Core/Data.cpp
-       src/Core/KrossBackend.cpp
-       src/Core/Pointer.h
-       src/Core/QtScriptBackend.h
-       src/Core/KrossBackend.h
-       src/Core/QtScriptBackend.cpp
-       src/Core/DataStructure.cpp
-       src/Core/Pointer.cpp
-       src/Core/Data.h
-       src/Interface/GraphScene.cpp
-       src/Interface/GraphScene.h
-Copyright: 2010-2011, Wagner Reck <wagner.reck at gmail.com>
-           2004-2011, Tomaz Canabrava <tomaz.canabrava at gmail.com>
-           2002-2004, Olivier Goffart <ogoffart at kde.org>
-           2001-2002, Duncan Mac-Vicar Prett <duncan at kde.org>
-           2011 Andreas Cord-Landwehr <cola at uni-paderborn.de>
-License: LGPL-2.1+
-
-Files: src/Tests/testGraph.h
-       src/Tests/testGraph.cpp
-Copyright: 2004-2007 by Tomaz Canabrava <tomaz.canabrava at gmail.com>
-License: LGPL-2
+Files: src/Plugins/FilePlugins/dotParser/dotgrammar.cpp
+       src/Plugins/FilePlugins/dotParser/dotgrammar.h
+       src/Plugins/FilePlugins/dotParser/DotGraphParsingHelper.cpp
+       src/Plugins/FilePlugins/dotParser/DotGraphParsingHelper.h
+       src/Plugins/FilePlugins/GMLParser/GMLGraphParsingHelper.cpp
+       src/Plugins/FilePlugins/GMLParser/GMLGraphParsingHelper.h
+Copyright: 2006-2007, Gael de Chalendar <kleag at free.fr>
+License: GPL-2
 
 Files: doc/*
-Copyright: 2009, Tomaz Canabrava <tomaz.canabrava at gmail.com>
-License: GFDL-1.2
+Copyright: 2009, Anne-Marie Mahfouf <annma at kde.org>
+           2009, Tomaz Canabrava <tomaz.canabrava at gmail.com>
+           2011, Andreas Cord-Landwehr <cordlandwehr at googlemail.com>
+License: GFDL-NIV-1.2+
 
-Files: cmake/*
-Copyright: 2004, Sandia Corporation
+Files: cmake/modules/FindGraphViz.cmake
+Copyright: Copyright 2004 Sandia Corporation.
+Comment:
+ Under the terms of Contract DE-AC04-94AL85000 with Sandia Coroporation,
+ the U.S. Government retains certain rights in this software.
 License: LGPL-2.1+
 
 Files: debian/*
 Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+           2012 Pino Toscano <pino at debian.org>
 License: GPL-2+
 
+
+License: GFDL-NIV-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.
+ .
+ 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
+ KGraphViewer 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, version 2.
+ .
+ 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; 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'.
+
 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
@@ -169,14 +196,3 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the GNU LIBRARY
  GENERAL PUBLIC LICENSE version 2.1 can be found in "/usr/share/common-licenses/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"

-- 
rocs packaging



More information about the pkg-kde-commits mailing list