Modified debian/changelog, debian/control and src/src.pro.

diff --git a/debian/changelog b/debian/changelog
index c105a5d..bff7281 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-situare (0.6-1b) unstable; urgency=low
+situare (0.6-5) unstable; urgency=low
   * Situare Beta Release
 
   * New Features:
@@ -11,11 +11,12 @@ situare (0.6-1b) unstable; urgency=low
   * Following bug fixes from version 0.5-1
     - Version control cleaned up (#5532)
     - Update location dialog is fully visible (#5765)
+    - Friend group items are now properly released (#5831)
     - Location field shows always proper location (#5865)
     - Login e-mail field is now properly filled after failed login attempt (#5866)
     - Mouse event work properly over friends items on map (#5867)
 
- -- Kaj Wallin <kaj.wallin@ixonos.com>  Mon, 14 May 2010 08:54:00 +0300
+ -- Kaj Wallin <kaj.wallin@ixonos.com>  Fri, 18 Jun 2010 08:54:00 +0300
 
 situare (0.5-1) unstable; urgency=low
   * Alpha release

diff --git a/debian/control b/debian/control
index fc13f34..07dc18d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,23 @@
 Source: situare
 Section: user/navigation
 Priority: optional
-Maintainer: Kaj Wallin <kaj.wallin@ixonos.com>
-Build-Depends:
+Maintainer: Jussi Laitinen <jussi.laitinen@ixonos.com>
+Build-Depends: debhelper, libdbus-1-dev, icd2-dev, libx11-dev, libqt4-dev, libqjson-dev, liblocation-dev, libqtm-dev
 Standards-Version: 3.7.2
 
 Package: situare
-Architecture: any
+Architecture: armel
 Depends: ${shlibs:Depends}
 Description: This is the Situare client for Maemo.
  Situare application introduces a concept of social locating.
  It allows users to view, update and share their location
  using facebook accounts. Situare utilizes OpenStreetMap
  database for mapping and device GPS for automatic locating.
- Project home is located in http://www.assembla.cc/wiki/show/situare.
+ Project home is located in https://garage.maemo.org/projects/situare/.
  Check also www.situare.net.
- This application requires Qt4.6.2 libraries
 XSBC-Bugtracker: https://garage.maemo.org/tracker/?atid=5192&group_id=1420&func=browse
 XB-Maemo-Display-Name: Situare
-XB-Maemo-Upgrade-Description: Alpha release
+XB-Maemo-Upgrade-Description: Beta release
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAAA3X
  AAAN1wFCKJt4AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNn

diff --git a/src/src.pro b/src/src.pro
index 32d698b..b459829 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -118,7 +118,7 @@ simulator {
         SOURCES += network/networkhandlerprivate.cpp
         HEADERS += network/networkhandlerprivate.h
         QT += dbus
-        CONFIG += icd2
+        CONFIG += icd2 qdbus
         SOURCES += gps/gpspositionprivateliblocation.cpp \
                    gps/liblocationwrapper.cpp \
                    gps/geopositioninfo.cpp \
@@ -129,6 +129,7 @@ simulator {
                    gps/geocoordinate.h
         CONFIG += link_pkgconfig
         PKGCONFIG += glib-2.0 liblocation
+        LIBS += -llocation
     } else {
         SOURCES += gps/gpspositionprivatestub.cpp \
                    network/networkhandlerprivatestub.cpp