[SCM] kcron packaging branch, master, updated. debian/4.11.2-1-2-gcdd918f

Maximiliano Curia maxy at alioth.debian.org
Mon Oct 21 13:15:55 UTC 2013


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

The following commit has been merged in the master branch:
commit cdd918f0ccc3afbda0670ace2ed2d126b8397e0c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Oct 21 15:15:38 2013 +0200

    Update debian/copyright, thanks to Ansgar Burchardt.
---
 debian/changelog |    1 +
 debian/copyright |   17 +----------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 812875e..3ec298b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kcron (4:4.11.2-1r1) UNRELEASED; urgency=low
 
   * 
+  * Update debian/copyright, thanks to Ansgar Burchardt.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 21 Oct 2013 15:13:00 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 1ef7683..c4ad8c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,13 +6,10 @@ Source: http://www.kde.org/download/
 Files: *
 Copyright: 1999, Gary Meyer <gary at meyer.net>
            1999, Robert Berry <rjmber at ntlworld.com>
+           2000, Morgan N. Sandquist <morga at pipeline.com>
            2007, Nicolas Ternisien <nicolas.ternisien at gmail.com>
 License: GPL-2+
 
-Files: doc/*
-Copyright: 2000, Morgan N. Sandquist <morga at pipeline.com>
-License: GFDL-1.2+
-
 Files: debian/*
 Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
@@ -33,15 +30,3 @@ License: GPL-2+
  .
  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: 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".
-

-- 
kcron packaging



More information about the pkg-kde-commits mailing list