[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.8-24-g17b9b86

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2f11461eaaee8a9935940129943256c9c2a12eaf
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 16 00:48:17 2010 +0200

    Update debian/copyright.
    
    What is more, make GPL-3 the main license since it dominates by file count.
---
 debian/changelog |    1 +
 debian/copyright |   51 +++++++++++++++++++++++++++------------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 233c3d7..e857818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ pkg-kde-tools (0.7.0~pre3) UNRELEASED; urgency=low
       pkgkde-symbolshelper use these new subroutines;
     - change datalib path in pkgkde-deb2symbols;
     - rewrite Makefile for reorganized source tree.
+  * Update debian/copyright.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 03 Mar 2010 23:43:10 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 97bd01f..a490645 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,49 +19,49 @@ Copyright:
 
 License (unless stated otherwise in the following paragraphs):
 
-  |  This package is free software; you can redistribute it and/or modify
+  |  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
+  |  the Free Software Foundation, either version 3 of the License, or
   |  (at your option) any later version.
   |
-  |  This package is distributed in the hope that it will be useful,
+  |  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 package; if not, write to the Free Software
-  |  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+  |  along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
-The follwing license and copyright applies to the contents of:
+The follwing license applies to:
 
-  - "symbolshelper" directory;
-  - "vcs" directory;
-  - dh_sameversiondep script.
+  - makefiles directory and its contents;
+  - qt-kde-team directory and its contents;
+  - datalib/kde4_flags
 
-  |  Copyright © 2008-2010 Modestas Vainius <modax at debian.org>
-  |
-  |  This program is free software: you can redistribute it and/or modify
+  |  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 3 of the License, or
+  |  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,
+  |  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, see <http://www.gnu.org/licenses/>
+  |  along with this package; if not, write to the Free Software
+  |  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-  - symbolshelper/Dpkg/Shlibs/*
+  - datalib/Dpkg/*
+  - datalib/dpkg-gensymbols.pl
+  - dpkg-gensymbols.1
+
+  Copyright © 2007 Raphaël Hertzog <hertzog at debian.org>
+  Copyright © 2009-2010 Modestas Vainius <modax at debian.org>
 
-  | Copyright © 2007 Raphaël Hertzog <hertzog at debian.org>
-  | Copyright © 2009-2010 Modestas Vainius <modax at debian.org>
-  |
   | 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
@@ -75,9 +75,12 @@ The follwing license and copyright applies to the contents of:
   | You should have received a copy of the GNU General Public License
   | along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is:
+
+ Copyright © 2008 Sune Vuorela <debian at pusling.com>,
+ Copyright © 2008-2010 Modestas Vainius <modax at debian.org>
 
-The Debian packaging is © 2008, Sune Vuorela <debian at pusling.com> and
-is licensed under any license, including the GPL, see above.
+It is licensed under any license, including the GPL, see above.

-- 
Debian Qt/KDE packaging tools