New version, including standard dbus service and building smoothly also under debian...

git-svn-id: file:///svnroot/wifihood/trunk@65 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifiscand/Makefile b/wifiscand/Makefile
index 7d82bbb..4df58c7 100644 (file)
--- a/wifiscand/Makefile
+++ b/wifiscand/Makefile
@@ -1,8 +1,8 @@
 
 PREFIX = /usr
 
-OSSO_CFLAGS = $(shell pkg-config --cflags libosso)
-OSSO_LDFLAGS = $(shell pkg-config --libs libosso)
+OSSO_CFLAGS = $(shell pkg-config --silence-errors --cflags libosso)
+OSSO_LDFLAGS = $(shell pkg-config --silence-errors --libs libosso)
 
 DBUS_CFLAGS = $(shell pkg-config --cflags dbus-1)
 DBUS_LDFLAGS = $(shell pkg-config --libs dbus-1)
@@ -11,8 +11,8 @@ GLIB_CFLAGS = $(shell pkg-config --cflags glib-2.0)
 GLIB_LDFLAGS = $(shell pkg-config --libs glib-2.0)
 
 CPPFLAGS = 
-CFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS)
-LDFLAGS = -liw $(DBUS_LDFLAGS) $(GLIB_LDFLAGS)
+CFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(OSSO_CFLAGS)
+LDFLAGS = -liw $(DBUS_LDFLAGS) $(GLIB_LDFLAGS) $(OSSO_LDFLAGS)
 
 default:
 

diff --git a/wifiscand/debian/changelog b/wifiscand/debian/changelog
index 1e86a16..7cf731b 100644 (file)
--- a/wifiscand/debian/changelog
+++ b/wifiscand/debian/changelog
@@ -1,3 +1,11 @@
+wifiscand (1.3-1) fremantle; urgency=low
+
+  * Allow scan to return more than 25 Aps
+  * Use standard wireless library
+  * Modified to build also in standard debian
+
+ -- Javier Palacios <javiplx@gmail.com>  Sun, 17 Oct 2010 13:06:49 +0200
+
 wifiscand (1.1-1) fremantle; urgency=low
 
   * Added new method to separate daemon and actual scanning start

diff --git a/wifiscand/debian/control b/wifiscand/debian/control
index 51f4c38..c6d259d 100644 (file)
--- a/wifiscand/debian/control
+++ b/wifiscand/debian/control
@@ -1,13 +1,13 @@
 Source: wifiscand
 Section: main
 Priority: optional
-Maintainer: Javier Palacios <javiplx@gmai.com>
-Build-Depends: libiw-dev, libosso-dev, debhelper (>= 4.0.0)
+Maintainer: Javier Palacios <javiplx@gmail.com>
+Build-Depends: libiw-dev, libosso-dev [armel], debhelper (>= 4.0.0)
 Standards-Version: 3.6.1
 
 Package: wifiscand
 Architecture: any
-Depends: libiw30, libosso1, ${shlibs:Depends}, ${misc:Depends}
+Depends: libiw30 [armel], libiw29 [!armel], libosso1 [armel], ${shlibs:Depends}, ${misc:Depends}
 Description: Wireless Scanning daemon
  OSSO/DBus service for wireless scanning
 

diff --git a/wifiscand/debian/rules b/wifiscand/debian/rules
index 4d72a01..15ce999 100755 (executable)
--- a/wifiscand/debian/rules
+++ b/wifiscand/debian/rules
@@ -34,7 +34,12 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE) wifiscand CPPFLAGS="-DHAVE_LIBOSSO"
+       pkg-config --exists libosso ; \
+               if [ $? -eq 0 ] ; then \
+               echo $(MAKE) wifiscand CPPFLAGS="-DHAVE_LIBOSSO" ; \
+               else \
+               echo $(MAKE) wifiscand ; \
+               fi
 
        touch build-stamp