[Python-modules-commits] [flask-login] 01/02: Revert the relicensing of debian/; it is GPL-2+ again.

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository flask-login.

commit 23fd75241252972dcd20b5f4187397f18499354b
Author: Carl Suster <carl at contraflo.ws>
Date:   Tue Jan 10 15:13:03 2017 +1100

    Revert the relicensing of debian/; it is GPL-2+ again.
---
 debian/changelog |  2 +-
 debian/copyright | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14d3de8..28b664b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ flask-login (0.4.0-1) unstable; urgency=medium
   * New maintainer (Closes: #836501).
   * Update d/compat to 10.
   * Switch to using dh-python.
-  * Relicense debian/* as Expat to match upstream.
+  * Add myself to d/copyright for debian/.
   * Change d/watch to follow GitHub releases.
   * Change homepage to GitHub.
   * Build the Python 3 module (Closes: #802614).
diff --git a/debian/copyright b/debian/copyright
index e2ed620..8257a0c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ License: Expat
 Files: debian/*
 Copyright: 2013 Tonnerre Lombard <tonnerre at ancient-solutions.com>
            2017 Carl Suster <carl at contraflo.ws>
-License: Expat
+License: GPL-2+
 
 License: Expat
  Permission is hereby granted, free of charge, to any person
@@ -32,3 +32,25 @@ License: Expat
  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
+
+License: GPL-2+
+ 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 (at your option) any later
+ version.
+ .
+ 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
+ .
+ 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'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask-login.git