# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1313054920 -7200
# Node ID 2d68cee8aec4823e08266d8e9ff3da2536407422
# Parent  5b7f909b732e6b00ed96b1878890df5686d248a9
Updated the packaging in an attempt to work with Debian unstable and to provide
a non-native package with separation between upstream source patches and patches
adding packaging files.

diff -r 5b7f909b732e -r 2d68cee8aec4 README.txt
--- a/README.txt	Sat Jun 25 17:19:38 2011 +0200
+++ b/README.txt	Thu Aug 11 11:28:40 2011 +0200
@@ -26,17 +26,8 @@
 
 cp -R ../shedskin-packaging/debian/ .
 
-Since some problems have arisen in Shed Skin 0.5 with distutils, package data
-installation and byte-compilation performed by Debian's python-central post-
-installation scripts, the setup script needs to be patched:
-
-cp ../shedskin-packaging/setup.py.diff .
-patch -p0 < setup.py.diff
-
-The shedskin.shared module also needs to be patched:
-
-cp ../shedskin-packaging/shared.py.diff .
-patch -p0 < shared.py.diff
+There are patches in debian/patches which should be applied when pbuilder is
+run. These should not need to be applied manually.
 
 Using pbuilder, try and build the package (this example is using my signing
 key):
@@ -51,6 +42,11 @@
 the changes file (used by dput when uploading a package to a Debian package
 repository/archive).
 
+For a different distribution:
+
+pdebuild --auto-debsign --debsign-k 9F308B3C --debbuildopts -sa \
+    -- --distribution squeeze
+
 Some files will appear in /var/cache/pbuilder/result/ (such as the binary
 package files), whereas others will appear in the parent directory.
 
diff -r 5b7f909b732e -r 2d68cee8aec4 debian/control
--- a/debian/control	Sat Jun 25 17:19:38 2011 +0200
+++ b/debian/control	Thu Aug 11 11:28:40 2011 +0200
@@ -5,13 +5,14 @@
 Build-Depends: debhelper (>= 5.0.38)
 Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-docutils
 XS-Python-Version: all
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
+Homepage:http://code.google.com/p/shedskin/
 Vcs-Git: git://gitorious.org/shedskin/mainline.git
 Vcs-Browser: http://gitorious.org/shedskin/mainline
 
 Package: shedskin
 Architecture: all
-Depends: ${python:Depends}, libgc-dev (>= 6.8), libpcre3-dev (>= 7.6), g++, make, python-dev
+Depends: ${misc:Depends}, ${python:Depends}, libgc-dev (>= 6.8), libpcre3-dev (>= 7.6), g++, make, python-dev
 XB-Python-Version: ${python:Versions}
 Description: Python-to-C++ compiler designed to speed up Python programs
  Shed Skin converts programs written in a static subset of Python to C++.
diff -r 5b7f909b732e -r 2d68cee8aec4 debian/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/series	Thu Aug 11 11:28:40 2011 +0200
@@ -0,0 +1,2 @@
+setup.py.patch
+shared.py.patch
diff -r 5b7f909b732e -r 2d68cee8aec4 debian/patches/setup.py.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/setup.py.patch	Thu Aug 11 11:28:40 2011 +0200
@@ -0,0 +1,12 @@
+Moved library files under the control of the Debian packaging infrastructure.
+Index: shedskin_0.8/setup.py
+===================================================================
+--- shedskin_0.8.orig/setup.py	2011-07-14 23:46:11.000000000 +0200
++++ shedskin_0.8/setup.py	2011-07-14 23:58:37.000000000 +0200
+@@ -25,5 +25,5 @@
+       scripts=['scripts/shedskin'],
+       cmdclass={'test':run_tests},
+       packages=['shedskin'],
+-      package_data={'shedskin': ['lib/*.cpp', 'lib/*.hpp', 'lib/*.py', 'lib/os/*.cpp', 'lib/os/*.hpp', 'lib/os/*.py', 'FLAGS*', 'illegal']},
++      package_data={'shedskin': ['FLAGS*', 'illegal']},
+      )
diff -r 5b7f909b732e -r 2d68cee8aec4 debian/patches/shared.py.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/shared.py.patch	Thu Aug 11 11:28:40 2011 +0200
@@ -0,0 +1,14 @@
+Moved the libraries to a shared location.
+Index: shedskin_0.8/shedskin/shared.py
+===================================================================
+--- shedskin_0.8.orig/shedskin/shared.py	2011-07-15 00:01:49.000000000 +0200
++++ shedskin_0.8/shedskin/shared.py	2011-07-15 00:01:59.000000000 +0200
+@@ -39,7 +39,7 @@
+         self.total_iterations = 0
+         self.lambdawrapper = {}
+         self.sysdir = '/'.join(__file__.split(os.sep)[:-1])
+-        self.libdir = connect_paths(self.sysdir, 'lib')
++        self.libdir = connect_paths('/usr/share/shedskin', 'lib')
+         self.main_mod = 'test'
+         illegal_file = file(os.path.join(self.sysdir, 'illegal'))
+         self.cpp_keywords = set([line.strip() for line in illegal_file])
diff -r 5b7f909b732e -r 2d68cee8aec4 debian/source/format
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/format	Thu Aug 11 11:28:40 2011 +0200
@@ -0,0 +1,1 @@
+3.0 (quilt)
diff -r 5b7f909b732e -r 2d68cee8aec4 debian/watch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/watch	Thu Aug 11 11:28:40 2011 +0200
@@ -0,0 +1,5 @@
+version=3
+opts=\
+downloadurlmangle=s|.*[?]name=(.*?)&.*|http://shedskin.googlecode.com/files/$1|,\
+filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
+http://code.google.com/p/shedskin/downloads/detail[?]name=shedskin-([0-9.]+).tgz&.*