[theano] 06/23: deb/rules: rearranged logically

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch master
in repository theano.

commit bf12752d66ab1c9687983cc60b86b194bede28fc
Author: Daniel Stender <stender at debian.org>
Date:   Mon Jul 11 14:29:07 2016 +0200

    deb/rules: rearranged logically
---
 debian/changelog |  3 ++-
 debian/rules     | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 308cfe7..03e5d48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ theano (0.7-6) UNRELEASED; urgency=medium
   * deb/rules:
     + add empty config.cxx to THEANO_FLAGS on some archs (which are not
       recognizing Theano's default flags "-m32" and "-m64").
+    + rearranged logically.
   * add deb/README.Debian (with info on disabling compilation).
 
- -- Daniel Stender <stender at debian.org>  Sun, 10 Jul 2016 22:01:15 +0200
+ -- Daniel Stender <stender at debian.org>  Mon, 11 Jul 2016 14:28:39 +0200
 
 theano (0.7-5) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 8befb84..db203cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,24 +3,24 @@
 #export DEB_BUILD_OPTIONS=nocheck
 export PYBUILD_NAME=theano
 
-export PYBUILD_INSTALL_ARGS=--install-scripts=/usr/share/{package}
-
-# g++ flags "-m32" and "-m64" are not recognized on this archs, let fall back to Python
-ifneq (,$(filter arm64 mips64el mips mipsel alpha hppa m68k,$(DEB_BUILD_ARCH)))
-   export THEANO_FLAGS=base_compiledir='.pybuild',device=cpu,mode=FAST_COMPILE,cxx=''
-else
-   export THEANO_FLAGS=base_compiledir='.pybuild',device=cpu,mode=FAST_COMPILE
-endif
-
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 
+export PYBUILD_INSTALL_ARGS=--install-scripts=/usr/share/{package}
+
 override_dh_auto_install:
 	dh_auto_install
 	rm -fv debian/python*-theano/usr/lib/python*/dist-packages/theano/misc/check_blas_many.sh
 
+# g++ flags "-m32" and "-m64" are not recognized on this archs, let fall back to Python
+ifneq (,$(filter arm64 mips64el mips mipsel alpha hppa m68k,$(DEB_BUILD_ARCH)))
+   export THEANO_FLAGS=base_compiledir='.pybuild',device=cpu,mode=FAST_COMPILE,cxx=''
+else
+   export THEANO_FLAGS=base_compiledir='.pybuild',device=cpu,mode=FAST_COMPILE
+endif
+
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom PYBUILD_TEST_ARGS='PYTHONPATH=. {interpreter} bin/theano-nose -v' dh_auto_test || true # a few errors remain
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/theano.git