[bollin] r5481 committed - * Build depend on libarpack,libcolpack and use the same sse disable ta...

[bol...@googlecode.com]

Revision: 5481
Author: Soeren.Sonnenburg
Date: Tue Jul 8 17:17:56 2014 UTC
Log: * Build depend on libarpack,libcolpack and use the same sse
disable tactics
for i386 archs as for the shogun package.
* Build depend on libjson-c-dev instead of libjson0-dev (Closes: #745012)
* Add build-dependency on colpack.
http://code.google.com/p/bollin/source/detail?r=5481

Modified:
/python-shogun/trunk/debian/changelog
/python-shogun/trunk/debian/control
/python-shogun/trunk/debian/rules

=======================================
--- /python-shogun/trunk/debian/changelog Sat Jul 5 05:58:26 2014 UTC
+++ /python-shogun/trunk/debian/changelog Tue Jul 8 17:17:56 2014 UTC
@@ -1,3 +1,17 @@
+python-shogun (3.2.0-4) unstable; urgency=low
+
+ * Build depend on libarpack,libcolpack and use the same sse disable
tactics
+ for i386 archs as for the shogun package.
+
+ -- Soeren Sonnenburg <so...@debian.org> Tue, 08 Jul 2014 19:16:41 +0200
+
+python-shogun (3.2.0-3) unstable; urgency=low
+
+ * Build depend on libjson-c-dev instead of libjson0-dev (Closes: #745012)
+ * Add build-dependency on colpack.
+
+ -- Soeren Sonnenburg <so...@debian.org> Sat, 05 Jul 2014 20:55:00 +0200
+
python-shogun (3.2.0-2) unstable; urgency=low

* Require swig version >= 3.0
=======================================
--- /python-shogun/trunk/debian/control Sat Jul 5 18:50:56 2014 UTC
+++ /python-shogun/trunk/debian/control Tue Jul 8 17:17:56 2014 UTC
@@ -5,18 +5,18 @@
Build-Depends: libatlas-base-dev [!powerpc !alpha !arm !armel !armhf !sh4]
| liblapack-dev,
libeigen3-dev, debhelper (>= 9), libreadline-dev | libreadline5-dev,
libblas-dev,
libglpk-dev, libnlopt-dev, libshogun-dev (>= 3.2.0~), liblzo2-dev,
zlib1g-dev, liblzma-dev,
- libxml2-dev, libjson0-dev, cmake, libarpack2-dev, libsnappy-dev,
+ libxml2-dev, libjson-c-dev | libjson0-dev, cmake, libarpack2-dev,
libsnappy-dev,
libhdf5-dev (>= 1.8.8~) | libhdf5-serial-dev, swig3.0 (>= 3.0.2-1~),
python-numpy (>= 1:1.7.1-1~), python-all-dev (>= 2.7.0-1~),
- libprotobuf-dev, protobuf-compiler, libcurl4-gnutls-dev, libbz2-dev,
+ libprotobuf-dev, protobuf-compiler, libcurl4-gnutls-dev, libbz2-dev,
libcolpack-dev,
clang-3.4 [mips mipsel powerpc]
#python3-numpy (>= 1:1.7.1-1~), python3-all-dev (>= 3.3.0-1~),
X-Python-Version: >= 2.7
#X-Python3-Version: >= 3.3
Standards-Version: 3.9.5
Homepage: http://www.shogun-toolbox.org
-Vcs-Svn: http://bollin.googlecode.com/svn/shogun/trunk/
-Vcs-Browser: http://bollin.googlecode.com/svn/shogun/trunk/
+Vcs-Svn: http://bollin.googlecode.com/svn/python-shogun/trunk/
+Vcs-Browser: http://bollin.googlecode.com/svn/python-shogun/trunk/

Package: python-shogun
Architecture: any
=======================================
--- /python-shogun/trunk/debian/rules Sat Jul 5 18:38:43 2014 UTC
+++ /python-shogun/trunk/debian/rules Tue Jul 8 17:17:56 2014 UTC
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-ARCH=$(shell /bin/uname -m)
+ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

ifeq ($(ARCH),$(filter $(ARCH),powerpc mips mipsel))
CC=/usr/bin/clang
@@ -9,6 +9,10 @@
CXX=/usr/bin/g++
endif

+ifeq ($(ARCH),$(filter $(ARCH),i386 hurd-i386 kfreebsd-i386))
+ DISABLE_SSE="-DDISABLE_SSE=ON"
+endif
+
all:
echo ${CXX}

@@ -20,7 +24,8 @@
ln -s /usr/include/shogun shogun
dh_auto_configure -- -DENABLE_CCACHE=FALSE -DCMAKE_SKIP_RPATH=TRUE \
-DBUILD_EXAMPLES=OFF -DUSE_SVMLIGHT=OFF -DPythonStatic=ON
-DPythonModular=ON \
- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
-DSWIG_EXECUTABLE=/usr/bin/swig3.0
+ -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
-DSWIG_EXECUTABLE=/usr/bin/swig3.0 \
+ $(DISABLE_SSE)

override_dh_install:
$(MAKE) -C doc examples