[Python-modules-commits] r14103 - in packages/python-pygraphviz/trunk/debian (3 files)

Sun Aug 1 20:31:09 UTC 2010

Date: Sunday, August 1, 2010 @ 20:31:01
  Author: morph
Revision: 14103

* debian/control
  - bump Standards-Version to 3.9.1
    + removed references to BSD licenses from debian/copyright

Modified:
  packages/python-pygraphviz/trunk/debian/changelog
  packages/python-pygraphviz/trunk/debian/control
  packages/python-pygraphviz/trunk/debian/copyright

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================

--- packages/python-pygraphviz/trunk/debian/changelog	2010-08-01 20:18:13 UTC (rev 14102)
+++ packages/python-pygraphviz/trunk/debian/changelog	2010-08-01 20:31:01 UTC (rev 14103)
@@ -4,8 +4,11 @@
   * debian/copyright
     - updated download location
     - updated upstream copyright years
+  * debian/control
+    - bump Standards-Version to 3.9.1
+      + removed references to BSD licenses from debian/copyright
 
- -- Sandro Tosi <morph at debian.org>  Sun, 01 Aug 2010 22:00:56 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 01 Aug 2010 22:30:10 +0200
 
 python-pygraphviz (0.99.1-2) unstable; urgency=low
 

Modified: packages/python-pygraphviz/trunk/debian/control
===================================================================
--- packages/python-pygraphviz/trunk/debian/control	2010-08-01 20:18:13 UTC (rev 14102)
+++ packages/python-pygraphviz/trunk/debian/control	2010-08-01 20:31:01 UTC (rev 14103)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-support (>= 0.6.4), python-all-dev (>= 2.3.5-11), libgraphviz-dev, python-setuptools, pkg-config
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 XS-Python-Version: >= 2.5
 Homepage: http://networkx.lanl.gov/pygraphviz/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pygraphviz/trunk/

Modified: packages/python-pygraphviz/trunk/debian/copyright
===================================================================
--- packages/python-pygraphviz/trunk/debian/copyright	2010-08-01 20:18:13 UTC (rev 14102)
+++ packages/python-pygraphviz/trunk/debian/copyright	2010-08-01 20:31:01 UTC (rev 14103)
@@ -18,42 +18,58 @@
 
 License:
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
 
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
 
-Notice:
-    This software and ancillary information (herein called SOFTWARE )
-    called pygraphviz is made available under the terms described
-    here. The SOFTWARE has been approved for release with associated LA-CC
-    number 04-073.
+     * 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.
 
-    Unless otherwise indicated, this SOFTWARE has been authored by an
-    employee or employees of the University of California, operator of the
-    Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
-    the U.S. Department of Energy. The U.S. Government has rights to use,
-    reproduce, and distribute this SOFTWARE. The public may copy,
-    distribute, prepare derivative works and publicly display this
-    SOFTWARE without charge, provided that this Notice and any statement
-    of authorship are reproduced on all copies. Neither the Government nor
-    the University makes any warranty, express or implied, or assumes any
-    liability or responsibility for the use of this SOFTWARE.
+     * Neither the name of the <ORGANIZATION> nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
 
-    If SOFTWARE is modified to produce derivative works, such modified
-    SOFTWARE should be clearly marked, so as not to confuse it with the
-    version available from Los Alamos National Laboratory.
 
+   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.
+
+
+Notice
+------
+   This software and ancillary information (herein called SOFTWARE )
+   called pygraphviz is made available under the terms described
+   here. The SOFTWARE has been approved for release with associated LA-CC
+   number 04-073.
+
+   Unless otherwise indicated, this SOFTWARE has been authored by an
+   employee or employees of the University of California, operator of the
+   Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
+   the U.S. Department of Energy. The U.S. Government has rights to use,
+   reproduce, and distribute this SOFTWARE. The public may copy,
+   distribute, prepare derivative works and publicly display this
+   SOFTWARE without charge, provided that this Notice and any statement
+   of authorship are reproduced on all copies. Neither the Government nor
+   the University makes any warranty, express or implied, or assumes any
+   liability or responsibility for the use of this SOFTWARE.
+
+   If SOFTWARE is modified to produce derivative works, such modified
+   SOFTWARE should be clearly marked, so as not to confuse it with the
+   version available from Los Alamos National Laboratory.
+
 The licensing terms of doc/examples/miles_dat.txt.gz are a bit different:
 
     This file miles_dat.txt is part of PyGraphviz and is distributed
@@ -67,9 +83,6 @@
     This file may be freely copied but please do not change it in any way!
     (Checksum parameters 696,295999341)
 
-On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
-
 The Debian packaging is:
   Â© 2006-2008, Cyril Brulebois <kibi at debian.org>
   Â© 2010, Sandro Tosi <morph at debian.org>


