[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 02/06: t/scripts/spellintian.t: Relicense as GPLv2+



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

jwilk pushed a commit to branch master
in repository lintian.

commit 66d51adfc66bbe410d02692e5b0fc10093ea1c43
Author: Jakub Wilk <jwilk@debian.org>
Date:   Mon Sep 19 20:11:32 2016 +0200

    t/scripts/spellintian.t: Relicense as GPLv2+
---
 debian/changelog        |  4 ++++
 debian/copyright        | 21 ---------------------
 t/scripts/spellintian.t | 30 ++++++++++++++----------------
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5aacdc0..6bc85e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ lintian (2.5.48) UNRELEASED; urgency=low
       hardening-check.
   * debian/copyright:
     + [JW] Add Paul Wise.
+    + [JW] Remove now-unneeded separate entry for spellintian.t.
 
   * helpers/coll/hardening-info-helper:
     + [NT] Removed.
@@ -51,6 +52,9 @@ lintian (2.5.48) UNRELEASED; urgency=low
   * profiles/debian/ftp-master-auto-reject.profile:
     + [JW] Refresh against current rule set.
 
+  * t/scripts/spellintian.t:
+    + [JW] Relicense as GPLv2+, like the rest of Lintian.
+
  -- Jakub Wilk <jwilk@debian.org>  Mon, 12 Sep 2016 11:16:53 +0200
 
 lintian (2.5.47) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index c89c6f5..a1499cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -76,24 +76,3 @@ License: GPL-2+
  or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
  You can also obtain it by writing to the Free Software Foundation, Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Files: t/scripts/spellintian.t
-Copyright: 2014 Jakub Wilk <jwilk@jwilk.net>
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the “Software”), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, 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.
diff --git a/t/scripts/spellintian.t b/t/scripts/spellintian.t
index c658fc2..5cccbaf 100755
--- a/t/scripts/spellintian.t
+++ b/t/scripts/spellintian.t
@@ -1,24 +1,22 @@
 #!/usr/bin/perl
 
-# Copyright © 2014 Jakub Wilk <jwilk@jwilk.net>
+# Copyright © 2014-2016 Jakub Wilk <jwilk@jwilk.net>
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the “Software”), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
+# This program is free software.  It is distributed 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.
 #
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
+# 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.
 #
-# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, 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.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, you can find it on the World Wide
+# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 use strict;
 use warnings;

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


Reply to: