# HG changeset patch # User Paul Boddie # Date 1322514117 -3600 # Node ID bba6c534f8e6810d35e29e23b33aa08dbd82642d # Parent c8c59cdb72507a4b60eac7ccc49e17a5654b4ae8 Removed redundant patches and updated the current repository version. diff -r c8c59cdb7250 -r bba6c534f8e6 README.txt --- a/README.txt Sun Nov 27 18:45:02 2011 +0100 +++ b/README.txt Mon Nov 28 22:01:57 2011 +0100 @@ -19,9 +19,9 @@ One can also try and persuade Gitorious to yield a file by visiting the following address: -http://gitorious.org/shedskin/mainline/archive-tarball/30ac2af +http://gitorious.org/shedskin/mainline/archive-tarball/a3f8f54 -The digest string can be replaced with a tag: +The digest string can be replaced with a tag (if available): http://gitorious.org/shedskin/mainline/archive-tarball/0.9 @@ -30,7 +30,7 @@ Unpack the archive: cd .. -tar zxf shedskin-mainline-30ac2af.tar.gz +tar zxf shedskin-mainline-a3f8f54.tar.gz mv shedskin-mainline shedskin_0.9 Make a copy of the archive for Debian non-native packaging purposes: @@ -96,7 +96,7 @@ Release Git Changeset ------- ------------- -0.9-1 30ac2afab36d38c0574124ca029e0cd2bfe023ae +0.9-1 a3f8f54590d4099c4ec66669296d5169a7f652ff 0.9 31b8214b451d87fae5ec7194a7b4430daa3f49ce 0.8-1 d7cf784f5e12952a5630f6b78b3155995c825a38 0.8 7f7388c3dfab40dc1776cfd6334dd41bdaa62beb diff -r c8c59cdb7250 -r bba6c534f8e6 debian/patches/makefile.py.patch --- a/debian/patches/makefile.py.patch Sun Nov 27 18:45:02 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Description: Put the compilation flags in a standard configuration location. -Author: Paul Boddie ---- a/shedskin/makefile.py -+++ b/shedskin/makefile.py -@@ -67,7 +67,7 @@ - elif getgx().msvc: flags = connect_paths(getgx().sysdir, 'FLAGS.msvc') - elif sys.platform == 'win32': flags = connect_paths(getgx().sysdir, 'FLAGS.mingw') - elif sys.platform == 'darwin': flags = connect_paths(getgx().sysdir, 'FLAGS.osx') -- else: flags = connect_paths(getgx().sysdir, 'FLAGS') -+ else: flags = '/etc/shedskin/FLAGS' # use a common location on Debian - - for line in file(flags): - line = line[:-1] diff -r c8c59cdb7250 -r bba6c534f8e6 debian/patches/series --- a/debian/patches/series Sun Nov 27 18:45:02 2011 +0100 +++ b/debian/patches/series Mon Nov 28 22:01:57 2011 +0100 @@ -1,3 +1,1 @@ setup.py.patch -shared.py.patch -makefile.py.patch diff -r c8c59cdb7250 -r bba6c534f8e6 debian/patches/shared.py.patch --- a/debian/patches/shared.py.patch Sun Nov 27 18:45:02 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Description: Put the libraries in a specific shared location. -Author: Paul Boddie ---- a/shedskin/shared.py -+++ b/shedskin/shared.py -@@ -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])