1.1 --- a/README.txt Sat Jun 25 17:19:38 2011 +0200
1.2 +++ b/README.txt Thu Aug 11 11:28:40 2011 +0200
1.3 @@ -26,17 +26,8 @@
1.4
1.5 cp -R ../shedskin-packaging/debian/ .
1.6
1.7 -Since some problems have arisen in Shed Skin 0.5 with distutils, package data
1.8 -installation and byte-compilation performed by Debian's python-central post-
1.9 -installation scripts, the setup script needs to be patched:
1.10 -
1.11 -cp ../shedskin-packaging/setup.py.diff .
1.12 -patch -p0 < setup.py.diff
1.13 -
1.14 -The shedskin.shared module also needs to be patched:
1.15 -
1.16 -cp ../shedskin-packaging/shared.py.diff .
1.17 -patch -p0 < shared.py.diff
1.18 +There are patches in debian/patches which should be applied when pbuilder is
1.19 +run. These should not need to be applied manually.
1.20
1.21 Using pbuilder, try and build the package (this example is using my signing
1.22 key):
1.23 @@ -51,6 +42,11 @@
1.24 the changes file (used by dput when uploading a package to a Debian package
1.25 repository/archive).
1.26
1.27 +For a different distribution:
1.28 +
1.29 +pdebuild --auto-debsign --debsign-k 9F308B3C --debbuildopts -sa \
1.30 + -- --distribution squeeze
1.31 +
1.32 Some files will appear in /var/cache/pbuilder/result/ (such as the binary
1.33 package files), whereas others will appear in the parent directory.
1.34
2.1 --- a/debian/control Sat Jun 25 17:19:38 2011 +0200
2.2 +++ b/debian/control Thu Aug 11 11:28:40 2011 +0200
2.3 @@ -5,13 +5,14 @@
2.4 Build-Depends: debhelper (>= 5.0.38)
2.5 Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-docutils
2.6 XS-Python-Version: all
2.7 -Standards-Version: 3.8.4
2.8 +Standards-Version: 3.9.2
2.9 +Homepage:http://code.google.com/p/shedskin/
2.10 Vcs-Git: git://gitorious.org/shedskin/mainline.git
2.11 Vcs-Browser: http://gitorious.org/shedskin/mainline
2.12
2.13 Package: shedskin
2.14 Architecture: all
2.15 -Depends: ${python:Depends}, libgc-dev (>= 6.8), libpcre3-dev (>= 7.6), g++, make, python-dev
2.16 +Depends: ${misc:Depends}, ${python:Depends}, libgc-dev (>= 6.8), libpcre3-dev (>= 7.6), g++, make, python-dev
2.17 XB-Python-Version: ${python:Versions}
2.18 Description: Python-to-C++ compiler designed to speed up Python programs
2.19 Shed Skin converts programs written in a static subset of Python to C++.
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/debian/patches/series Thu Aug 11 11:28:40 2011 +0200
3.3 @@ -0,0 +1,2 @@
3.4 +setup.py.patch
3.5 +shared.py.patch
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/debian/patches/setup.py.patch Thu Aug 11 11:28:40 2011 +0200
4.3 @@ -0,0 +1,12 @@
4.4 +Moved library files under the control of the Debian packaging infrastructure.
4.5 +Index: shedskin_0.8/setup.py
4.6 +===================================================================
4.7 +--- shedskin_0.8.orig/setup.py 2011-07-14 23:46:11.000000000 +0200
4.8 ++++ shedskin_0.8/setup.py 2011-07-14 23:58:37.000000000 +0200
4.9 +@@ -25,5 +25,5 @@
4.10 + scripts=['scripts/shedskin'],
4.11 + cmdclass={'test':run_tests},
4.12 + packages=['shedskin'],
4.13 +- package_data={'shedskin': ['lib/*.cpp', 'lib/*.hpp', 'lib/*.py', 'lib/os/*.cpp', 'lib/os/*.hpp', 'lib/os/*.py', 'FLAGS*', 'illegal']},
4.14 ++ package_data={'shedskin': ['FLAGS*', 'illegal']},
4.15 + )
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/debian/patches/shared.py.patch Thu Aug 11 11:28:40 2011 +0200
5.3 @@ -0,0 +1,14 @@
5.4 +Moved the libraries to a shared location.
5.5 +Index: shedskin_0.8/shedskin/shared.py
5.6 +===================================================================
5.7 +--- shedskin_0.8.orig/shedskin/shared.py 2011-07-15 00:01:49.000000000 +0200
5.8 ++++ shedskin_0.8/shedskin/shared.py 2011-07-15 00:01:59.000000000 +0200
5.9 +@@ -39,7 +39,7 @@
5.10 + self.total_iterations = 0
5.11 + self.lambdawrapper = {}
5.12 + self.sysdir = '/'.join(__file__.split(os.sep)[:-1])
5.13 +- self.libdir = connect_paths(self.sysdir, 'lib')
5.14 ++ self.libdir = connect_paths('/usr/share/shedskin', 'lib')
5.15 + self.main_mod = 'test'
5.16 + illegal_file = file(os.path.join(self.sysdir, 'illegal'))
5.17 + self.cpp_keywords = set([line.strip() for line in illegal_file])
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/debian/source/format Thu Aug 11 11:28:40 2011 +0200
6.3 @@ -0,0 +1,1 @@
6.4 +3.0 (quilt)
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/debian/watch Thu Aug 11 11:28:40 2011 +0200
7.3 @@ -0,0 +1,5 @@
7.4 +version=3
7.5 +opts=\
7.6 +downloadurlmangle=s|.*[?]name=(.*?)&.*|http://shedskin.googlecode.com/files/$1|,\
7.7 +filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
7.8 +http://code.google.com/p/shedskin/downloads/detail[?]name=shedskin-([0-9.]+).tgz&.*