Fixed build-dependencies, made package compile also on x86

git-svn-id: file:///svnroot/tunertool/trunk@9 4bb5ff34-d565-4b58-9699-12000fa1827a

diff --git a/debian/control b/debian/control
index 5127ee7..59d408a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: tuner
-Section: user/extra
+Section: user/tools
 Priority: optional
 Maintainer: Josep Torra <jtorra@uoc.edu>
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev, libosso-dev (>= 1)
+Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev, libgtk2.0-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libosso-dev (>= 1)
 Standards-Version: 3.6.0
 
 Package: tuner

diff --git a/debian/rules b/debian/rules
index dc00473..d9926a0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,17 @@ export DH_VERBOSE=1
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-CFLAGS = -Wall -g -mcpu=arm926ej-s 
+CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
        CFLAGS += -O2
+       ifneq (,$(findstring $(DEB_HOST_ARCH),arm armel))
+               CFLAGS += -mcpu=arm926ej-s 
+       endif
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s