[yade] 02/03: Drop unused architectures. (Closes: #793833)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository yade.

commit c490032b4ee29893ef0ac1e2d10fdc81b48d5bf8
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Oct 25 14:17:13 2015 +0100

    Drop unused architectures. (Closes: #793833)
---
 debian/control | 14 +++++++-------
 debian/rules   | 16 ++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 5397f14..32d3e09 100644
--- a/debian/control
+++ b/debian/control
@@ -11,16 +11,16 @@ Build-Depends: cmake,
                ipython,
                libboost-all-dev,
                libbz2-dev,
-               libcgal-dev [!armel],
+               libcgal-dev,
                libeigen3-dev (>= 3.2.1-2),
                libgl1-mesa-dev,
                libgts-dev,
                libloki-dev,
-               libmetis-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
-               libopenblas-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
-               libqglviewer-dev [!armel !armhf],
-               libsuitesparse-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
-               libvtk6-dev[!armel !armhf],
+               libmetis-dev [amd64 i386 powerpc],
+               libopenblas-dev [amd64 i386 powerpc],
+               libqglviewer-dev,
+               libsuitesparse-dev [amd64 i386 powerpc],
+               libvtk6-dev,
                libxi-dev,
                libxmu-dev,
                pyqt5-dev-tools,
@@ -28,7 +28,7 @@ Build-Depends: cmake,
                python-gts,
                python-imaging,
                python-matplotlib,
-               python-minieigen [!s390],
+               python-minieigen,
                python-numpy,
                python-sip,
                python-pyqt5,
diff --git a/debian/rules b/debian/rules
index 4111a37..0c3fe60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,6 @@ tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed,-no-keep-memory
 
-# Theses flags are neccessry for weak archs. See #733152
-ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hurd-i386 i386 kfreebsd-i386))
-	export DEB_CXXFLAGS_MAINT_APPEND = --param ggc-min-expand=20 --param ggc-min-heapsize=128000
-endif
-
-ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
-        export DEB_CXXFLAGS_MAINT_APPEND = --param ggc-min-expand=10 --param ggc-min-heapsize=128000
-endif
-
 # Check, whether Build-Depends-Indep are installed
 BUILD_DOC=$(shell dpkg -s python-sphinx | grep -q "^Status:.* installed$$" && echo yes)
 
@@ -35,6 +26,10 @@ extra_flags += \
 -DENABLE_SPH=ON
 
 override_dh_auto_configure:
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel amd64))
+	echo 'This architecture is not supported, exiting'
+	exit 2
+endif
 	dh_auto_configure -- $(extra_flags)
 	mkdir -p $(tmpDirMatplotLib)
 	mkdir -p $(tmpInstall)
@@ -43,9 +38,6 @@ override_dh_auto_configure:
 	-cat /proc/cpuinfo
 
 override_dh_auto_install:
-ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
-	sed '2d' -i $(CURDIR)/debian/python-yade.pyinstall
-endif
 	dh_auto_install
 	# generate manpages
 	help2man $(tmpInstall)/usr/bin/yade > yade.1

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