# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1263424237 -3600
# Node ID bdd6d830f089a6ceae786168f773214e4d01c42e
# Parent  f70da426aa32a0756806058bc6689f11f2f6347e
Updated copyright and licensing information.
Touched the changelog.
Fixed the docs.
Removed test.py from the packaging project.

diff -r f70da426aa32 -r bdd6d830f089 debian/changelog
--- a/debian/changelog	Mon Jan 11 02:06:56 2010 +0100
+++ b/debian/changelog	Thu Jan 14 00:10:37 2010 +0100
@@ -28,4 +28,4 @@
   * Several cleanups, removing about 100 lines again
   * Large amount of bugfixes
 
- -- Paul Boddie <paul@boddie.org.uk>  Mon, 11 Jan 2010 01:36:57 +0100
+ -- Paul Boddie <paul@boddie.org.uk>  Thu, 14 Jan 2010 00:07:52 +0100
diff -r f70da426aa32 -r bdd6d830f089 debian/copyright
--- a/debian/copyright	Mon Jan 11 02:06:56 2010 +0100
+++ b/debian/copyright	Thu Jan 14 00:10:37 2010 +0100
@@ -4,7 +4,7 @@
 
 The origin of the package is:
 
-  http://shedskin.googlecode.com
+  http://shedskin.googlecode.com/
 
 Package author:
 
@@ -14,16 +14,36 @@
 
 This package is comprised of two parts:
 
-  - the Shed Skin compiler, plus testing framework (*.py)
-  - a C++ implementation of the Python builtins and libraries (*.?pp)
+  - the Shed Skin compiler, plus testing framework (shedskin/*.py, unit.py)
+  - a C++ implementation of the Python builtins and libraries
+    (shedskin/lib/*.?pp, shedskin/lib/os/*.?pp)
+
+--------
 
-Concerning the Shed Skin compiler, plus testing framework (*.py):
+Concerning the Shed Skin compiler, plus testing framework (shedskin/*.py, unit.py):
+
+Copyright (c) 2005-2010 Mark Dufour
+
+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.
 
-Copyright 2005-2007 Mark Dufour; License GNU GPL version 3 or later
+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, see <http://www.gnu.org/licenses/>.
 
-Concerning the C++ implementation of Python builtins and libraries (*.?pp):
+--------
 
-Copyright (c) 2005, 2006 M. Dufour
+Concerning the C++ implementation of Python builtins and libraries
+(shedskin/lib/*.?pp, shedskin/lib/os/*.?pp), except as otherwise mentioned
+below:
+
+Copyright (c) 2005-2010 M. Dufour
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,3 +62,28 @@
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+--------
+
+Concerning the C++ implementation of Python itertools and heapq libraries
+(lib/(itertools|heapq).?pp):
+
+Copyright (c) 2009 Jérémie Roquet <arkanosis@gmail.com>
+
+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 rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -r f70da426aa32 -r bdd6d830f089 debian/docs
--- a/debian/docs	Mon Jan 11 02:06:56 2010 +0100
+++ b/debian/docs	Thu Jan 14 00:10:37 2010 +0100
@@ -4,5 +4,5 @@
 doc/voidspace.css
 doc/LICENSE
 testdata
-debian/test.py
+test.py
 unit.py
diff -r f70da426aa32 -r bdd6d830f089 debian/test.py
--- a/debian/test.py	Mon Jan 11 02:06:56 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-print 'hello, world!'