[SCM] kremotecontrol packaging branch, master, updated. debian/4.8.4-2-3-g9e156fb

Pino Toscano pino at alioth.debian.org
Tue Jun 26 16:10:35 UTC 2012


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

The following commit has been merged in the master branch:
commit 9e156fb86d9ab9a0e9f9dcab316d2dd364f814a0
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 26 18:05:46 2012 +0200

    copyright: simplify
---
 debian/changelog |    1 +
 debian/copyright |   43 ++++++-------------------------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3db2f86..1f0be40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kremotecontrol (4:4.8.4-3) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Readd kdelirc transitional package lost in the split.
+  * Simplify copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Jun 2012 17:51:38 +0200
 
diff --git a/debian/copyright b/debian/copyright
index dbd1985..d3af902 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,52 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kremotecontrol
 Source: http://www.kde.org
 
-Files: dataengines/*
-Copyright: 2010 Frank Scheffold <fscheffold at googlemail.com>
-License: LGPL-2.0
-
-Files: kcmremotecontrol/*
-Copyright: 2010 Michael Zanetti <michael_zanetti at gmx.net>
-           2009 Frank Scheffold <fscheffold at googlemail.com>
-License: GPL-2+
-
-Files: kded/*
-Copyright: 2010 Frank Scheffold <fscheffold at googlemail.com>
-License: GPL-2+
-
-Files: krcdnotifieritem/*
-Copyright: 2010 Michael Zanetti <michael_zanetti at gmx.net>
-License: GPL-2+
-
-Files: libkremotecontrol/backends/*
+Files: *
 Copyright: 2002 Gav Wood <gav at kde.org>
-           2009 Michael Zanetti <michael_zanetti at gmx.net>
+           2009-2011 Michael Zanetti <michael_zanetti at gmx.net>
+           2009-2010 Frank Scheffold <fscheffold at googlemail.com>
 License: GPL-2+
 
-Files: libkremotecontrol/ifaces/*
-Copyright: 2011 Michael Zanetti <michael_zanetti at gmx.net>
-License: GPL-2+
-
-Files: libkremotecontrol/*
-Copyright: 2010-2011 Michael Zanetti <michael_zanetti at gmx.net>
-           2009 Frank Scheffold <fscheffold at googlemail.com>
-License: GPL-2+
-
-Files: tests/*
+Files: dataengines/*
 Copyright: 2010 Frank Scheffold <fscheffold at googlemail.com>
-License: GPL-2+
+License: LGPL-2.0
 
 Files: kremotecontrol-version.h
 Copyright: 1998-1999 Preston Brown <pbrown at kde.org>
            2000-2004 Cornelius Schumacher <schumacher at kde.org>
 License: GPL-2+
 
-Files: *
-Copyright: 2010 Frank Scheffold <fscheffold at googlemail.com>
-           2010-2011 Michael Zanetti <michael_zanetti at gmx.net>
-           2002 Gav Wood <gav at kde.org>
-License: GPL-2+
-
 Files: debian/*
 Copyright: 2012 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 License: LGPL-2.0
@@ -86,4 +55,4 @@ License: GPL-2+
  51 Franklin Street, 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-2".
\ No newline at end of file
+ can be found in "/usr/share/common-licenses/GPL-2".

-- 
kremotecontrol packaging



More information about the pkg-kde-commits mailing list