[debian-edu-commits] debian-edu/ 01/02: include GPL-3+ so that update-copyright will use it

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit 010e3db55b8d04fb11864c9e00166388281a654f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jun 18 11:15:25 2016 +0200

    include GPL-3+ so that update-copyright will use it
---
 debian/changelog         |  3 ++-
 debian/copyright.licence | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c6cc6d3..d4e0427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 debian-edu-doc (1.902~20160604) UNRELEASED; urgency=medium
 
   [ Holger Levsen ]
-  * Add missing paragraph about GPL-3+ to debian/copyright, thanks lintian.
+  * Add missing paragraph about GPL-3+ to debian/copyright.licence, so that
+    the update-copyright target will include it in debian/copyright.
   * Update Debian Edu Stretch, Jessie and Wheezy manuals from the wiki.
   * Add Japanese Translation of the Debian Edu Stretch manual by victory.
   * Update Debian Edu Jessie and Stretch manuals from the wiki.
diff --git a/debian/copyright.licence b/debian/copyright.licence
index 82edce8..50837ea 100644
--- a/debian/copyright.licence
+++ b/debian/copyright.licence
@@ -19,3 +19,21 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ 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
+ (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 3 can be found in `/usr/share/common-licenses/GPL-3'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git