# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1320603672 -3600
# Node ID 8769d411ef36b889541da06fb74282fcba4297ff
# Parent  3959303f812224aa90b933e7f5eb06d7940dc6ce
Fixed copyright declarations and added details for the packaging files.
Fixed regular expression usage in the file declarations.
Made the install manifest more concise.

diff -r 3959303f8122 -r 8769d411ef36 debian/control
--- a/debian/control	Sun Oct 16 20:38:03 2011 +0200
+++ b/debian/control	Sun Nov 06 19:21:12 2011 +0100
@@ -2,9 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Paul Boddie <paul@boddie.org.uk>
-Build-Depends: debhelper (>=7.0.50~), python-all (>= 2.6.6-3~), python-docutils
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-docutils
 Standards-Version: 3.9.2
-Homepage:http://code.google.com/p/shedskin/
+Homepage: http://code.google.com/p/shedskin/
 Vcs-Hg: http://hgweb.boddie.org.uk/shedskin-packaging
 Vcs-Browser: http://hgweb.boddie.org.uk/shedskin-packaging
 
diff -r 3959303f8122 -r 8769d411ef36 debian/copyright
--- a/debian/copyright	Sun Oct 16 20:38:03 2011 +0200
+++ b/debian/copyright	Sun Nov 06 19:21:12 2011 +0100
@@ -6,7 +6,7 @@
 Comment: This package was debianized by Paul Boddie <paul@boddie.org.uk>.
 
 Files: *
-Copyright: Copyright 2005-2010 Mark Dufour
+Copyright: 2005-2010 Mark Dufour
 License: GPL-3+
  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
@@ -26,8 +26,30 @@
  `/usr/share/common-licenses/GPL-3'.
 Comment: Shed Skin compiler, plus testing framework
 
+Files: debian/*
+Copyright: 2011 Paul Boddie
+License: Expat
+ 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.
+Comment: Debian packaging files
+
 Files: shedskin/lib/*.?pp shedskin/lib/os/*.?pp
-Copyright: Copyright 2005-2010 Mark Dufour
+Copyright: 2005-2010 Mark Dufour
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -49,8 +71,8 @@
 Comment: C++ implementation of Python builtins and libraries
  (except as otherwise mentioned below)
 
-Files: shedskin/lib/(itertools|heapq).?pp
-Copyright: Copyright 2009 Jérémie Roquet <arkanosis@gmail.com>
+Files: shedskin/lib/itertools.?pp shedskin/lib/heapq.?pp
+Copyright: 2009 Jérémie Roquet <arkanosis@gmail.com>
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +94,7 @@
 Comment: C++ implementation of Python itertools and heapq libraries
 
 Files: shedskin/lib/random.cpp
-Copyright: Copyright 1997-2002 Makoto Matsumoto, Takuji Nishimura
+Copyright: 1997-2002 Makoto Matsumoto, Takuji Nishimura
 License: BSD-3-clause
  All rights reserved.
  .
diff -r 3959303f8122 -r 8769d411ef36 debian/shedskin.install
--- a/debian/shedskin.install	Sun Oct 16 20:38:03 2011 +0200
+++ b/debian/shedskin.install	Sun Nov 06 19:21:12 2011 +0100
@@ -1,8 +1,1 @@
-shedskin/lib/*.cpp usr/share/shedskin/lib/
-shedskin/lib/*.hpp usr/share/shedskin/lib/
-shedskin/lib/builtin/*.cpp usr/share/shedskin/lib/builtin/
-shedskin/lib/builtin/*.hpp usr/share/shedskin/lib/builtin/
-shedskin/lib/*.py usr/share/shedskin/lib/
-shedskin/lib/os/*.cpp usr/share/shedskin/lib/os/
-shedskin/lib/os/*.hpp usr/share/shedskin/lib/os/
-shedskin/lib/os/*.py usr/share/shedskin/lib/os/
+shedskin/lib usr/share/shedskin/lib/