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

[kibi-guest at users.alioth.debian.org]

    Date: Monday, January 14, 2008 @ 20:56:18
  Author: kibi-guest
Revision: 4372

New upstream release, update copyright

Modified:
  packages/python-pygraphviz/trunk/debian/changelog
  packages/python-pygraphviz/trunk/debian/copyright
Deleted:
  packages/python-pygraphviz/trunk/debian/README.Debian

Deleted: packages/python-pygraphviz/trunk/debian/README.Debian
===================================================================
--- packages/python-pygraphviz/trunk/debian/README.Debian	2008-01-14 19:35:24 UTC (rev 4371)
+++ packages/python-pygraphviz/trunk/debian/README.Debian	2008-01-14 20:56:18 UTC (rev 4372)
@@ -1,8 +0,0 @@
-python-pygraphviz:
-------------------
-
-  * miles.dat is not included in the Debian tarball since it is not free
-    according to the Debian Free Software Guidelines. You can search for
-    “miles.dat Stanford GraphBase” using your favourite search engine.
-
- -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Tue, 06 Nov 2007 18:17:57 +0100

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================
--- packages/python-pygraphviz/trunk/debian/changelog	2008-01-14 19:35:24 UTC (rev 4371)
+++ packages/python-pygraphviz/trunk/debian/changelog	2008-01-14 20:56:18 UTC (rev 4372)
@@ -1,10 +1,21 @@
-python-pygraphviz (0.35.dfsg-3) UNRELEASED; urgency=low
+python-pygraphviz (0.36-1) UNRELEASED; urgency=low
 
-  * debian/control
-    - uniforming Vcs-Browser field
+  [ Sandro Tosi ]
+  * debian/control:
+     - Uniformize Vcs-Browser field.
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Thu, 03 Jan 2008 12:09:22 +0100
+  [ Cyril Brulebois ]
+  * New upstream release.
+  * debian/copyright:
+     - Update copyright years.
+     - Add full licensing terms for doc/examples/miles_dat.txt.gz
+     - Uniformize indentation, add some blank lines to ease reading.
+  * No longer repack:
+     - Not needed, since the license of miles.dat has been sorted out.
+     - Drop README.Debian accordingly.
 
+ -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Mon, 14 Jan 2008 18:56:45 +0100
+
 python-pygraphviz (0.35.dfsg-2) unstable; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/python-pygraphviz/trunk/debian/copyright
===================================================================
--- packages/python-pygraphviz/trunk/debian/copyright	2008-01-14 19:35:24 UTC (rev 4371)
+++ packages/python-pygraphviz/trunk/debian/copyright	2008-01-14 20:56:18 UTC (rev 4372)
@@ -4,16 +4,21 @@
 It was downloaded from https://networkx.lanl.gov/wiki/pygraphviz
 
 Upstream Authors:
+
     Aric Hagberg <hagberg at lanl.gov>
     Dan Schult <dschult at colgate.edu>
     Manos Renieris, http://www.cs.brown.edu/~er/
 
+
 Copyright:
-    Aric Hagberg, 2004-2007
-    Dan Schult, 2004-2007
-    Manos Renieris, 2004-2007
 
+    Aric Hagberg, 2004-2008
+    Dan Schult, 2004-2008
+    Manos Renieris, 2004-2008
+
+
 License:
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted under the terms of the BSD License.
 
@@ -29,33 +34,48 @@
     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.
+    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.
+    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.
+    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.
 
 
-On Debian systems, the complete text of the BSD License can be 
+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
+    with the same license as PyGraphviz.
+    Distributed with BSD license.
+    This file is not part of the Stanford GraphBase; the name has been
+    changed to avoid any confusion with files from that collection.
+    Original attribution:
+    File "miles.dat" from the Stanford GraphBase (C) 1993 Stanford University
+    Revised mileage data for highways in the United States and Canada, 1949
+    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:
-  (C) 2006-2007, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+  (C) 2006-2008, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-