[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-17-g4e91db3

[Radostan Riedel]

The following commit has been merged in the master branch:
commit e13373356c65539ab3d5f4f48211073cc0fa537e
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Sat Jul 14 16:40:19 2012 +0200

    Remove correct-boost-build-target path

diff --git a/debian/patches/0005-adding-setup_py.patch b/debian/patches/0004-adding-setup_py.patch
similarity index 100%
rename from debian/patches/0005-adding-setup_py.patch
rename to debian/patches/0004-adding-setup_py.patch
diff --git a/debian/patches/0004-correct-boost-build-target.patch b/debian/patches/0004-correct-boost-build-target.patch
deleted file mode 100644
index 54f3e70..0000000
--- a/debian/patches/0004-correct-boost-build-target.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sat, 30 Jun 2012 16:02:19 +0200
-Subject: correct-boost-build-target
-
----
- cctbx_sources/boost_adaptbx/SConscript |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
-index 866b1c1..11048d5 100644
---- a/cctbx_sources/boost_adaptbx/SConscript
-+++ b/cctbx_sources/boost_adaptbx/SConscript
-@@ -35,9 +35,9 @@ def build_boost_thread():
-                    lo="boost/libs/thread/src/libboost_thread.lo",
-                    dylib="lib/libboost_thread.dylib")
-   env.Repository(os.path.dirname(env_etc.boost_dist))
--  env.SharedLibrary(
--    target='#lib/boost_thread',
--    source=source)
-+  #env.SharedLibrary(
-+  #  target='#lib/boost_thread',
-+  #  source=source)
- 
- build_boost_thread()
- 
-@@ -235,10 +235,10 @@ object/function_doc_signature.cpp
-   bpl_dll_sources = [os.path.join(prefix, path) for path in bpl_dll_sources]
-   #
-   env.Repository(os.path.dirname(env_etc.boost_dist))
--  if (env_etc.static_bpl):
--    env.StaticLibrary(target="#lib/boost_python", source=bpl_dll_sources)
--  else:
--    env.SharedLibrary(target="#lib/boost_python", source=bpl_dll_sources)
-+  #if (env_etc.static_bpl):
-+  #  env.StaticLibrary(target="#lib/boost_python", source=bpl_dll_sources)
-+  #else:
-+  #  env.SharedLibrary(target="#lib/boost_python", source=bpl_dll_sources)
-   if (bool(int(ARGUMENTS.get("boost_python_tests", "0")))):
-     warn_if_unexpected_md5_hexdigest(
-       path=libtbx.env.under_dist("boost", "libs/python/test/Jamfile.v2"),
--- 
diff --git a/debian/patches/0006-adding-shlib-versioning.patch b/debian/patches/0005-adding-shlib-versioning.patch
similarity index 99%
rename from debian/patches/0006-adding-shlib-versioning.patch
rename to debian/patches/0005-adding-shlib-versioning.patch
index 2cfe4dd..a50e171 100644
--- a/debian/patches/0006-adding-shlib-versioning.patch
+++ b/debian/patches/0005-adding-shlib-versioning.patch
@@ -10,7 +10,7 @@ Subject: adding-shlib-versioning
  4 files changed, 92 insertions(+)
 
 diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
-index 11048d5..4cba06d 100644
+index 866b1c1..0d95318 100644
 --- a/cctbx_sources/boost_adaptbx/SConscript
 +++ b/cctbx_sources/boost_adaptbx/SConscript
 @@ -51,6 +51,9 @@ if (not env_etc.no_boost_python):
diff --git a/debian/patches/0007-upstream-fix-for-declaration-errors-in-gcc4.7.patch b/debian/patches/0006-upstream-fix-for-declaration-errors-in-gcc4.7.patch
similarity index 100%
rename from debian/patches/0007-upstream-fix-for-declaration-errors-in-gcc4.7.patch
rename to debian/patches/0006-upstream-fix-for-declaration-errors-in-gcc4.7.patch
diff --git a/debian/patches/0008-fix-for-gcc4.7-compilation-error.patch b/debian/patches/0007-fix-for-gcc4.7-compilation-error.patch
similarity index 100%
rename from debian/patches/0008-fix-for-gcc4.7-compilation-error.patch
rename to debian/patches/0007-fix-for-gcc4.7-compilation-error.patch
diff --git a/debian/patches/series b/debian/patches/series
index e714241..7728ae1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
 0001-remove-hardcoded-libtbx_build-env.patch
 0002-fix-opengl-header-missing-gltbx.patch
 0003-correct-paths-in-dispatcher-creation.patch
-0004-correct-boost-build-target.patch
-0005-adding-setup_py.patch
-0006-adding-shlib-versioning.patch
-0007-upstream-fix-for-declaration-errors-in-gcc4.7.patch
-0008-fix-for-gcc4.7-compilation-error.patch
+0004-adding-setup_py.patch
+0005-adding-shlib-versioning.patch
+0006-upstream-fix-for-declaration-errors-in-gcc4.7.patch
+0007-fix-for-gcc4.7-compilation-error.patch

-- 
Packaging for cctbx