[med-svn] r17846 - trunk/packages/pynast/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-08-26 06:22:27 +0000 (Tue, 26 Aug 2014)
New Revision: 17846

Modified:
   trunk/packages/pynast/trunk/debian/changelog
   trunk/packages/pynast/trunk/debian/copyright
Log:
Upload with updated d/copyright (GPL -> BSD)


Modified: trunk/packages/pynast/trunk/debian/changelog
===================================================================
--- trunk/packages/pynast/trunk/debian/changelog	2014-08-26 06:21:42 UTC (rev 17845)
+++ trunk/packages/pynast/trunk/debian/changelog	2014-08-26 06:22:27 UTC (rev 17846)
@@ -1,6 +1,7 @@
 pynast (1.2.2-1) unstable; urgency=medium
 
   * New upsteam version now on Github (adapted d/watch)
+  * debian/copyright: License change from GPL to BSD
   * rename source package from python-pynast to pynast
   * cme fix dpkg-control
   * debian/patches/do_not_install_privacy_breaching_scripts.patch: Do not

Modified: trunk/packages/pynast/trunk/debian/copyright
===================================================================
--- trunk/packages/pynast/trunk/debian/copyright	2014-08-26 06:21:42 UTC (rev 17845)
+++ trunk/packages/pynast/trunk/debian/copyright	2014-08-26 06:22:27 UTC (rev 17846)
@@ -1,35 +1,44 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: PyNAST
-Upstream-Contact: Greg Caporaso <gregcaporaso at gmail.com>, Rob Knight <rob at spot.colorado.edu>
+Upstream-Contact: PyNAST Development Team <gregcaporaso at gmail.com>
 Source: http://pynast.sorceforge.net
 
 Files: *
-Copyright: © 2010, The PyNAST Project
-		Greg Caporaso <gregcaporaso at gmail.com>
-		Kyle Bittinger
-		Rob Knight <rob at spot.colorado.edu>
-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.
+Copyright: 2010-2013 PyNAST Development Team
+ 	Greg Caporaso <gregcaporaso at gmail.com>
+ 	Kyle Bittinger
+ 	Rob Knight <rob at spot.colorado.edu>
+License: BSD
+
+Files: debian/*
+Copyright: 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>,
+    2011 Steffen Moeller <moeller at debian.org>,
+         Tim Booth <tbooth at ceh.ac.uk>,
+    2011-2014 Andreas Tille <tille at debian.org>
+License: BSD
+
+License: BSD
+ PyNAST is licensed under the terms of the Modified BSD License (also known as
+ New or Revised BSD), as follows:
  .
- 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.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name PyNAST nor the names of its contributors may be used to
+      endorse or promote products derived from this software without specific
+      prior written permission.
  .
- 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'.
-
-Files: debian/*
-Copyright: © 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>,
-	   © 2011 Steffen Moeller <moeller at debian.org>,
-	          Tim Booth <tbooth at ceh.ac.uk>,
-	          Andreas Tille <tille at debian.org>
-License: GPL-2
- Same as the software itself.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE PYNAST DEVELOPMENT TEAM BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.