[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-29-g787f60e

Radostan Riedel raybuntu at googlemail.com
Fri Jul 20 22:00:08 UTC 2012


The following commit has been merged in the master branch:
commit 787f60e82f6c7b698e6c13cc5fb81db8f35c2451
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Fri Jul 20 23:58:08 2012 +0200

    Remove oversized parallelization option for scons

diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index 8e02c79..7c6bb19 100644
--- a/debian/patches/0010-adding-setup_py.patch
+++ b/debian/patches/0010-adding-setup_py.patch
@@ -138,7 +138,7 @@ index 0000000..2d20eb4
 +    return out, list(outext)
 diff --git a/setup.py b/setup.py
 new file mode 100755
-index 0000000..633cc0b
+index 0000000..3549da0
 --- /dev/null
 +++ b/setup.py
 @@ -0,0 +1,115 @@
@@ -207,7 +207,7 @@ index 0000000..633cc0b
 +sconsutils.PREFIX = '/usr/'
 +
 +# Build settings
-+sconsutils.scons_buildargv = [sys.executable, '/usr/bin/scons', '-j', '8']
++sconsutils.scons_buildargv = [sys.executable, '/usr/bin/scons']
 +
 +# Install settings
 +sconsutils.scons_installargv = [sys.executable, '/usr/bin/scons', 'install']

-- 
Packaging for cctbx



More information about the debian-science-commits mailing list