Try to fix OBS + Aegis

diff --git a/LatitudeUpdater.pro b/LatitudeUpdater.pro
index ac2dd79..ee9982c 100644 (file)
--- a/LatitudeUpdater.pro
+++ b/LatitudeUpdater.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-exists($$QMAKE_INCDIR_QT"/../qmsystem2/qmkeys.h"):!contains(MEEGO_EDITION,harmattan): {
+linux-g++-maemo:!contains(MEEGO_EDITION,harmattan): {
         MEEGO_VERSION_MAJOR     = 1
         MEEGO_VERSION_MINOR     = 2
         MEEGO_VERSION_PATCH     = 0
@@ -8,19 +8,23 @@ exists($$QMAKE_INCDIR_QT"/../qmsystem2/qmkeys.h"):!contains(MEEGO_EDITION,harmat
         DEFINES               += MEEGO_EDITION_HARMATTAN
 }
 
+contains(QT_CONFIG, maemo5): {
+        SUBDIRS = LatitudeUpdater-daemon.pro LatitudeUpdater-widget.pro
+        DEFINES += GUIFOUND
+        message(Maemo5)
+}
 contains(MEEGO_EDITION,harmattan): {
-        SUBDIRS += LatitudeUpdater-daemon.pro
-        SUBDIRS += LatitudeUpdater-qml.pro
+        SUBDIRS = LatitudeUpdater-daemon.pro LatitudeUpdater-qml.pro
+        DEFINES += GUIFOUND
+        message(Maemo6)
 }
-
-contains(QT_CONFIG, maemo5): {
-        SUBDIRS += LatitudeUpdater-daemon.pro
-        SUBDIRS += LatitudeUpdater-widget.pro
+contains(CONFIG, simulator): {
+        SUBDIRS = LatitudeUpdater-daemon.pro
+        DEFINES += GUIFOUND
+        message(Simulator)
 }
 
-!contains(MEEGO_EDITION,harmattan):!contains(QT_CONFIG, maemo5): {
-        SUBDIRS += LatitudeUpdater-daemon.pro
-        SUBDIRS += LatitudeUpdater-qml.pro
-        SUBDIRS += LatitudeUpdater-widget.pro
+!contains(DEFINES, GUIFOUND): { {
+        SUBDIRS = LatitudeUpdater-daemon.pro LatitudeUpdater-widget.pro LatitudeUpdater-qml.pro
+        message(All Gui)
 }
-

diff --git a/qml/main.qml b/qml/main.qml
index b77d0f9..68112db 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -7,6 +7,4 @@ PageStackWindow {
     MainPage {
         id: mainPage
     }
-    showStatusBar: false
-    showToolBar: false
 }

diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control
index 05297bd..e001d21 100644 (file)
--- a/qtc_packaging/debian_harmattan/control
+++ b/qtc_packaging/debian_harmattan/control
@@ -2,7 +2,7 @@ Source: googlelatitude
 Section: user/navigation
 Priority: optional
 Maintainer: Rodrigo Linfati <rodrigo@linfati.cl>
-Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-dev, libqmsystem2-dev
+Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-dev, aegis-builder
 Standards-Version: 3.7.3
 Homepage: http://googlelatitude.garage.maemo.org/
 XSBC-Bugtracker: mailto:rodrigo@linfati.cl

diff --git a/qtc_packaging/debian_harmattan/googlelatitude.aegis b/qtc_packaging/debian_harmattan/googlelatitude.aegis
new file mode 100644 (file)
index 0000000..e950644
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/googlelatitude.aegis
@@ -0,0 +1,30 @@
+<!-- Generated by aegis-manifest 0.20110429-1+harmattan on 2011-08-04. -->
+<!-- To disable non-interactive creation of and updates to this file,
+     and adding of the resulting Aegis manifest into a Debian package,
+     replace this file with an empty (zero-length) file. -->
+<!-- The checksum is used for detecting any manual changes of the <aegis>
+     section. If the checksum is found and matches this section, file
+     contents will be updated without user interaction.
+     Modify the file or remove the checksum to disable this functionality. -->
+<!-- modified-checksum:44f3b8c5847ae5db21f364cc8de3e3f3 -->
+<aegis>
+       <request policy="add">
+               <!-- /usr/lib/libQtLocation.so.1:_ZN10QtMobility22QGeoPositionInfoSource19createDefaultSourceEP7QObject -->
+               <!-- /usr/lib/libQtLocation.so.1:_ZNK10QtMobility14QGeoCoordinate8latitudeEv -->
+               <!-- /usr/lib/libQtLocation.so.1:_ZNK10QtMobility14QGeoCoordinate9longitudeEv -->
+               <credential name="Location" />
+
+               <for path="/opt/linfati.com/bin/LatitudeUpdaterDaemon" />
+       </request>
+       <request policy="add">
+               <!-- Application uses QDeclarativeView or QDeclarativeEngine
+                    and inherited tokens discovered from QML imports. -->
+
+               <!-- /usr/lib/libQtLocation.so.1:_ZN10QtMobility22QGeoPositionInfoSource19createDefaultSourceEP7QObject -->
+               <!-- /usr/lib/libQtLocation.so.1:_ZNK10QtMobility14QGeoCoordinate8latitudeEv -->
+               <!-- /usr/lib/libQtLocation.so.1:_ZNK10QtMobility14QGeoCoordinate9longitudeEv -->
+               <credential name="Location" />
+
+               <for path="/opt/linfati.com/bin/LatitudeUpdaterQML" />
+       </request>
+</aegis>

diff --git a/qtc_packaging/debian_harmattan/rules.real b/qtc_packaging/debian_harmattan/rules.real
index a788d97..41efece 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules.real
+++ b/qtc_packaging/debian_harmattan/rules.real
@@ -70,6 +70,7 @@ binary-arch: build install
        dh_gencontrol
        dh_md5sums
        dh_builddeb
+       aegis-deb-add -control debian/googlelatitude/DEBIAN/control .. debian/googlelatitude.aegis=_aegis
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure