rev 19627 - kde-extras/icemon/trunk/debian

[Pino Toscano]

Author: pino
Date: 2013-06-12 09:56:38 +0000 (Wed, 12 Jun 2013)
New Revision: 19627

Modified:
   kde-extras/icemon/trunk/debian/changelog
   kde-extras/icemon/trunk/debian/copyright
Log:
copyright: switch to copyright-format v1.0, and update


Modified: kde-extras/icemon/trunk/debian/changelog
===================================================================
--- kde-extras/icemon/trunk/debian/changelog	2013-06-12 09:36:13 UTC (rev 19626)
+++ kde-extras/icemon/trunk/debian/changelog	2013-06-12 09:56:38 UTC (rev 19627)
@@ -14,6 +14,7 @@
   * Override the hyphen-used-as-minus-sign lintian tags, since all the
     man pages shipped are generated from docbook.
   * Add the docbook-xml build dependency for correct man pages regeneration.
+  * Switch copyright to copyright-format v1.0, and update it.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 12 Jun 2013 10:54:11 +0200
 

Modified: kde-extras/icemon/trunk/debian/copyright
===================================================================
--- kde-extras/icemon/trunk/debian/copyright	2013-06-12 09:36:13 UTC (rev 19626)
+++ kde-extras/icemon/trunk/debian/copyright	2013-06-12 09:56:38 UTC (rev 19627)
@@ -1,48 +1,54 @@
-This package was debianized by Fathi Boudra <fboudra at free.fr> on
-Mon, 11 Sep 2006 23:15:00 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: icemon
+Source: https://github.com/icecc/icemon
 
-It was downloaded from ftp://ftp.suse.com/pub/projects/icecream
+Files: *
+Copyright: 2003, Frerich Raabe <raabe at kde.org>
+           2003-2004, Cornelius Schumacher <schumacher at kde.org>
+           2003-2004, Stephan Kulow <coolo at kde.org>
+           2004-2006, Andre Wöbbeking <Woebbeking at web.de>
+           2004, Scott Wheeler <wheeler at kde.org>
+           2007, Dirk Mueller <mueller at kde.org>
+           2011, Daniel Molkentin <molkentin at kde.org>
+           2012, Kevin Funk <kevin at kfunk.org>
+License: GPL-2+
 
-Upstream Authors:
-   Frerich Raabe <raabe at kde.org>
-   Stephan Kulow <coolo at kde.org>
-   Cornelius Schumacher <schumacher at kde.org>
+Files: doc/icemon/index.docbook
+Copyright: 2004, Cornelius Schumacher <cschum at suse.de>
+License: GFDL-NIV-1.2+
 
-Copyright:
-   (C) 2003 Frerich Raabe <raabe at kde.org>
-   (C) 2003-2004 Stephan Kulow <coolo at kde.org>
-   (C) 2003-2004 Cornelius Schumacher <schumacher at kde.org>
-   (C) 2004-2006 Andre Wöbbeking <Woebbeking at web.de>
+Files: debian/*
+Copyright: 2006-2009, Fathi Boudra <fboudra at free.fr>
+           2013, Pino Toscano <pino at debian.org>
+License: GPL-2+
 
-The icecc-monitor manpage is (C) 2006 Jonathan Riddell <jriddell at ubuntu.com>
-and is licensed under the GPL, see below.
+Files: debian/icemon.xml
+Copyright: 2006, Jonathan Riddell <jriddell at ubuntu.com>
+License: GPL-2+
 
-License:
+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'.
 
-   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
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package 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 package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The documentations provided with icecc-monitor is distributed under
-the GNU Free Documentation License (FDL). They are considered free with
-regards to the Debian Free Software Guidelines (DFSG) because they don't
-contain any unmodifiable parts (invariant sections).
-
-On Debian systems, the complete text of the GNU Free Documentation License can 
-be found  in '/usr/share/common-licenses/GFDL-1.2'.
-
-The Debian packaging is (C) 2006, Fathi Boudra <fboudra at free.fr> and
-is licensed under the GPL, see above.
+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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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'.