[Blends-commit] [SCM] science branch, master, updated. 39e95987ebfc931d2b1092d3098881f20f0aeef3

[Andreas Tille]

The following commit has been merged in the master branch:
commit 39e95987ebfc931d2b1092d3098881f20f0aeef3
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 24 14:00:08 2014 +0100

    Fix copyright

diff --git a/debian/changelog b/debian/changelog
index 7a44e0a..5d4bb02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-science (1.2) UNRELEASED; urgency=medium
+
+  * d/copyright: DEP5
+
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Jan 2014 13:52:31 +0100
+
 debian-science (1.1) unstable; urgency=low
 
   [ Andreas Tille ]
diff --git a/debian/copyright b/debian/copyright
index c2d5915..f9d72b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,13 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Frederic Daniel Luc Lehobey <Frederic at Lehobey.net>,
- Andreas Tille <tille at debian.org>
-X-Debinized-Date: Mon, 23 Jul 2007 09:18:16 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: © 2007-2009 Frederic Daniel Luc Lehobey <Frederic at Lehobey.net>,
- Andreas Tille <tille at debian.org> and others
-License: GPL-2+
+           © 2007-2014 Andreas Tille <tille at debian.org>,
+           © 2009-2013 Sylvestre Ledru <sylvestre at debian.org> and others
+License: GPL-3+
  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 program is distributed in the hope that it will be useful,
@@ -20,5 +18,6 @@ License: GPL-2+
  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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
-X-Comment: On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-3'.

-- 
Debian Science Blend