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

johanvdw-guest pushed a commit to branch master
in repository saga.

commit 398d710ebda78f5a6e6af6db91b7f70cd3a0761d
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Tue Oct 7 21:41:00 2014 +0200

    Revert "Temporarily disable building saga gui on arm"
    
    This reverts commit bdb9083eb61b448df44034db9de6a85ef3abf63e.
    
    Conflicts:
        debian/rules
---
 debian/libsaga-dev.install |  9 +++------
 debian/rules               | 10 +---------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/libsaga-dev.install b/debian/libsaga-dev.install
old mode 100755
new mode 100644
index 26ce97f..1dfc81a
--- a/debian/libsaga-dev.install
+++ b/debian/libsaga-dev.install
@@ -1,8 +1,5 @@
-#!/bin/bash 
-echo "src/saga_core/saga_api/*.h /usr/include/saga_api/
+src/saga_core/saga_api/*.h /usr/include/saga_api/
 src/saga_core/saga_gdi/*.h /usr/include/saga_gdi/
 debian/saga-depends /usr/bin/
-usr/lib/*/libsaga_api.so"
-if [ -f usr/lib/*/libsaga_gdi.so ]
- then echo "usr/lib/*/libsaga_gdi.so"
-fi
+usr/lib/*/libsaga_api.so
+usr/lib/*/libsaga_gdi.so
diff --git a/debian/rules b/debian/rules
index 1995355..ba1066e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,12 @@
 #!/usr/bin/make -f
 
 CFLAGS+=$(CPPFLAGS)
-DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 
2>/dev/null)
-ifeq ($(DEB_BUILD_ARCH_CPU), arm)
-    DISABLE_GUI := '--disable-gui'
-else ifeq ($(DEB_BUILD_ARCH_CPU), armhf)
-    DISABLE_GUI := '--disable-gui'
-else
-    DISABLE_GUI := ''
-endif
 
 %:
        dh $@ --with python2 --with autoreconf
 
 override_dh_auto_configure:
-       dh_auto_configure -- $(DISABLE_GUI) --enable-openmp --prefix=/usr 
--enable-python $(shell dpkg-buildflags --export=configure)
+       dh_auto_configure -- --prefix=/usr --enable-openmp --enable-python 
$(shell dpkg-buildflags --export=configure)
 
 VERSION := $(shell grep '^AC_INIT' configure.ac | \
        sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/saga.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to