[Python-modules-commits] r3433 - in /packages/pysubnettree/trunk/debian: changelog copyright

Mon Oct 15 03:37:44 UTC 2007

Author: kitterma-guest
Date: Mon Oct 15 03:37:43 2007
New Revision: 3433

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3433
Log:
Update for new upstream (fixes licensing problems). READY for upload.

Modified:
    packages/pysubnettree/trunk/debian/changelog
    packages/pysubnettree/trunk/debian/copyright

Modified: packages/pysubnettree/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pysubnettree/trunk/debian/changelog?rev=3433&op=diff
==============================================================================

--- packages/pysubnettree/trunk/debian/changelog (original)
+++ packages/pysubnettree/trunk/debian/changelog Mon Oct 15 03:37:43 2007
@@ -1,5 +1,5 @@
-pysubnettree (0.1-1) UNRELEASED; urgency=low
+pysubnettree (0.11-1) unstable; urgency=low
 
   * Initial Debian package
 
- -- Scott Kitterman <scott at kitterman.com>  Thu, 27 Sep 2007 00:22:34 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 14 Oct 2007 22:26:34 -0400

Modified: packages/pysubnettree/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/pysubnettree/trunk/debian/copyright?rev=3433&op=diff
==============================================================================
--- packages/pysubnettree/trunk/debian/copyright (original)
+++ packages/pysubnettree/trunk/debian/copyright Mon Oct 15 03:37:43 2007
@@ -8,26 +8,35 @@
 
 License:
 
-This is free software; you can redistribute it and/or modify it under the terms
-of the GNU General Public License (version 2), or (at your option) any later 
-version.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-    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.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
 
-    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.
+    * 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.
 
-    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.
+    * Neither the name of the International Computer Science
+      Institute nor the names of its contributors may be used to
+      endorse or promote products derived from this software without
+      specific prior written permission.
 
-On Debian systems, the complete text of the GPL v2 can be found here:
-  /usr/share/common-licenses/GPL-2
+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
+COPYRIGHT OWNER OR CONTRIBUTORS 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.
 
 patricia.c and patricia.h:
    Copyright (C) 1997, 1998, 1999  Dave Plonka <plonka at doit.wisc.edu>
@@ -63,5 +72,6 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
 
 The Debian packaging is (C) 2007, Scott Kitterman <scott at kitterman.com> and is 
-licensed under the GPL version 2 or later.  See above.
+licensed under the same terms as the upstream package (as described in the
+LICENSE file).  See above.
 


