[pktools] 02/05: Update copyright file, move licenses to stand-alone paragraphs.

Mon Mar 2 23:31:02 UTC 2015

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

sebastic pushed a commit to branch master
in repository pktools.

commit 7f9684b0274b6dcf4af1e530e1f502fd499c7e6d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 2 23:37:22 2015 +0100

    Update copyright file, move licenses to stand-alone paragraphs.
---
 debian/changelog |   1 +
 debian/copyright | 231 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 118 insertions(+), 114 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 567dfc3..2c5a611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pktools (2.6.2-1) UNRELEASED; urgency=medium
   * Update Vcs-Browser URL to use cgit instead of gitweb.
   * Add patch to not install deprecated utilities.
   * Update my email to @debian.org address.
+  * Update copyright file, move licenses to stand-alone paragraphs.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Jan 2015 09:24:30 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 749e0df..15e335f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,25 +5,11 @@ Source: http://download.savannah.gnu.org/releases/pktools/
 
 Files: *
 Copyright: 2008-2014, Pieter Kempeneers <kempenep at gmail.com>
-License: GPL-3.0+
- pktools 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.
- .
- pktools 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.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+License: GPL-3+
 
 Files: configure
 Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
 License: fsf-unlimited-configure
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
 
 Files: compile
  config.guess
@@ -31,34 +17,85 @@ Files: compile
  depcomp
  missing
 Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-2.0+ with Autoconf exception
- This file 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 program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
- 02110-1301, USA.
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that program.
- .
- 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-2+ with Autoconf exception
 
 Files: install-sh
 Copyright: 1994, X Consortium
-License: X11
+License: install-sh
+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
+License: GPL-2+ with Libtool exception
+
+Files: m4/ax_lib_gdal.m4
+Copyright: 2011, Mateusz Loskot <mateusz at loskot.net>
+           2011, Alessandro Candini <candini at meeo.it>
+License: ax_lib_gdal
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
+
+Files: m4/libtool.m4
+ m4/lt~obsolete.m4
+ m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
+License: fsf-unlimited
+
+Files: aclocal.m4
+Copyright: 1996-2013, Free Software Foundation, Inc.
+License: fsf-unlimited-disclaimer
+
+Files: Makefile.in
+ src/algorithms/Makefile.in
+ src/apps/Makefile.in
+ src/base/Makefile.in
+ src/fileclasses/Makefile.in
+ src/imageclasses/Makefile.in
+ src/lasclasses/Makefile.in
+Copyright: 1994-2013, Free Software Foundation, Inc.
+License: fsf-unlimited-makefile
+
+Files: src/algorithms/myfann_cpp.h
+Copyright: 2004-2006, <freegoldbar at yahoo,com>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2013, Francesco Paolo Lovergine <frankie at debian.org>
+License: GPL-3+
+
+License: fsf-unlimited
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+License: fsf-unlimited-disclaimer
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+
+License: fsf-unlimited-configure
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+License: fsf-unlimited-makefile
+ This Makefile.in is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+
+License: install-sh
  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
@@ -91,9 +128,32 @@ License: X11
  This script is compatible with the BSD install script, but was written
  from scratch.
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
-License: GPL-2.0+ with Libtool exception
+License: GPL-2+ with Autoconf exception
+ This file 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 program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that program.
+ .
+ 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-2+ with Libtool exception
  GNU Libtool 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
@@ -118,62 +178,24 @@ License: GPL-2.0+ with Libtool exception
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: m4/ax_lib_gdal.m4
-Copyright: 2011, Mateusz Loskot <mateusz at loskot.net>
- 2011, Alessandro Candini <candini at meeo.it>
-License: ax_lib_gdal
- Copying and distribution of this file, with or without modification, are
- permitted in any medium without royalty provided the copyright notice
- and this notice are preserved. This file is offered as-is, without any
- warranty.
-
-Files: m4/libtool.m4
- m4/lt~obsolete.m4
- m4/ltoptions.m4
- m4/ltsugar.m4
- m4/ltversion.m4
-Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
-License: fsf-unlimited
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
-Files: aclocal.m4
-Copyright: 1996-2013, Free Software Foundation, Inc.
-License: fsf-unlimited-disclaimer
- This file is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
+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 3 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, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-Files: Makefile.in
- src/algorithms/Makefile.in
- src/apps/Makefile.in
- src/base/Makefile.in
- src/fileclasses/Makefile.in
- src/imageclasses/Makefile.in
- src/lasclasses/Makefile.in
-Copyright: 1994-2013, Free Software Foundation, Inc.
-License: fsf-unlimited-makefile
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
+ 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.
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-Files: src/algorithms/myfann_cpp.h
-Copyright: 2004-2006, <freegoldbar at yahoo,com>
 License: LGPL-2.1+
- Fast Artificial Neural Network (fann) C++ Wrapper
- Copyright (C) 2004-2006 created by freegoldbar (at) yahoo dot com
- .
  This wrapper is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -187,22 +209,3 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
 
-Files: debian/*
-Copyright: 2013, Francesco Paolo Lovergine <frankie at debian.org>
-License: GPL-3.0+
- 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 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 program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 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/pkg-grass/pktools.git

