[SCM] Packaging for pytables branch, master, updated. debian/2.3.1-2-2-g0334983

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 03349834ef298f553ecb6b9ba35ff405eacc58ca
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Jan 28 22:14:55 2012 +0100

    New patch for enabling bzip2 and lzo compressors

diff --git a/debian/changelog b/debian/changelog
index 9671c35..7e1d166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 pytables (2.3.1-3) unstable; urgency=low
 
   * Set Vcs-* fields in the control file (Closes: 657766)
+  * New patch for enabling bzip2 and lzo compressors (Closes: #657789)
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 28 Jan 2012 18:55:12 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 28 Jan 2012 22:13:18 +0100
 
 pytables (2.3.1-2) unstable; urgency=low
 
diff --git a/debian/patches/multi-arch.patch b/debian/patches/multi-arch.patch
new file mode 100644
index 0000000..301efe4
--- /dev/null
+++ b/debian/patches/multi-arch.patch
@@ -0,0 +1,30 @@
+Improve multi-arch support and enable bzip2 and lzo compressors.
+See #657789 and https://github.com/PyTables/PyTables/issues/124
+
+--- a/setup.py
++++ b/setup.py
+@@ -9,6 +9,7 @@
+ import re
+ import warnings
+ import subprocess
++import platform
+ 
+ # Using ``setuptools`` enables lots of goodies, such as building eggs.
+ if 'FORCE_SETUPTOOLS' in os.environ:
+@@ -127,8 +128,14 @@
+     add_from_flags("LDFLAGS", "-L", default_library_dirs)
+     default_library_dirs.extend(
+         os.path.join(_tree, _arch)
+-        for _tree in ('/', '/usr', '/usr/local')
+-        for _arch in ('lib64', 'lib') )
++            for _tree in ('/', '/usr', '/usr/local')
++                for _arch in ('lib64', 'lib')
++    )
++    machine = platform.machine()
++    default_library_dirs.extend(
++        os.path.join(_tree, "lib", "%s-linux-gnu" % machine)
++            for _tree in ('/', '/usr', '/usr/local')
++    )
+     default_runtime_dirs = default_library_dirs
+ 
+ elif os.name == 'nt':
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..caae65a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+multi-arch.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..ea3c2fb
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,3 @@
+unapply-patches
+abort-on-upstream-changes
+

-- 
Packaging for pytables