[SCM] KDE metapackages branch, master, updated. debian/80

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=41b8abb

The following commit has been merged in the master branch:
commit 41b8abb11eb287551b0f78369a8267db1df6830f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu May 9 17:57:55 2013 +0200

    Migrate copyright file to 1.0 format.
---
 debian/changelog |    1 +
 debian/copyright |   46 +++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e46703b..07c1db0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ meta-kde (5:79) UNRELEASED; urgency=low
   * Build depend on debhelper (>= 9) for build-indep/build-arch rules.
   * Bump Standards-Version to 3.9.4.
   * Move kdegames metapackage.
+  * Migrate copyright file to 1.0 format.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 May 2013 15:21:07 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 575e257..f975986 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,24 @@
-This package was created by Ivan E. Moore II <rkrusty at debian.org>.
-
-Copyright (C) 2001  Ivan E. Moore II
-Copyright (C) 2003  Christopher L. Cheney
-Copyright (C) 2004-2011  Debian Qt/KDE Maintainers
-
-
-    | 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 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 program; if not, write to the Free Software Foundation,
-    | Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The full GPL license is located on Debian systems at
-/usr/share/common-licenses/GPL.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment: This package was originally created by Ivan E. Moore II <rkrusty at debian.org>.
 
+Files: *
+Copyright: 2001, Ivan E. Moore II
+           2003, Christopher L. Cheney
+           2004-2011, Debian Qt/KDE Maintainers
+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 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 program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ The full GPL license is located on Debian systems at
+ /usr/share/common-licenses/GPL.

-- 
KDE metapackages