Merge branch 'extras-devel-package'

Conflicts:
	debian/changelog

diff --combined debian/changelog
index ddb962e,bff7281..f21e9a4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,4 +1,9 @@@
 +situare (0.7-0) unstable; urgency=low
 +  * Situare Beta Release (Intermediate build)
 +
-  -- Kaj Wallin <kaj.wallin@ixonos.com>  Mon, 16 Jun 2010 08:20:00 +0300
++ -- Kaj Wallin <kaj.wallin@ixonos.com>  Sat, 19 Jun 2010 08:20:00 +0300
 +
- situare (0.6-2) unstable; urgency=low
+ situare (0.6-5) unstable; urgency=low
    * Situare Beta Release
  
    * New Features:
@@@ -21,7 -16,7 +21,7 @@@
      - 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, 16 Jun 2010 08:20: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 --combined src/src.pro
index 4508491,b459829..45c54d2
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -50,9 -50,7 +50,9 @@@ SOURCES += main.cpp 
      ui/userinfopanel.cpp \
      ui/zoombutton.cpp \
      ui/zoombuttonpanel.cpp \
 -    user/user.cpp
 +    user/user.cpp \
 +    map/mapscroller.cpp \
 +    ui/fullscreenbutton.cpp
  HEADERS += common.h \
      engine/engine.h \
      facebookservice/facebookauthentication.h \
@@@ -100,9 -98,7 +100,9 @@@
      ui/sidepanelbase.h \
      ui/zoombutton.h \
      ui/zoombuttonpanel.h \
 -    user/user.h
 +    user/user.h \
 +    map/mapscroller.h \
 +    ui/fullscreenbutton.h
  QT += network \
      webkit
  DEFINES += QT_NO_DEBUG_OUTPUT
@@@ -122,7 -118,7 +122,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 \
@@@ -133,6 -129,7 +133,7 @@@
                     gps/geocoordinate.h
          CONFIG += link_pkgconfig
          PKGCONFIG += glib-2.0 liblocation
+         LIBS += -llocation
      } else {
          SOURCES += gps/gpspositionprivatestub.cpp \
                     network/networkhandlerprivatestub.cpp