changes in build system...

diff --git a/.gitignore b/.gitignore
index fa5e246..2c12a13 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 Makefile
 googlelatitude.pro.user
-src/moc_*.cpp
-src/*.o
-src/GoogleLatitude*
+build/*

diff --git a/data/googlelatitude.desktop b/data/googlelatitude.desktop
new file mode 100644 (file)
index 0000000..c8bdf84
--- /dev/null
+++ b/data/googlelatitude.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.1
+Type=Application
+Name=Google Latitude Update
+Exec=/usr/bin/googlelatitude
+Icon=googlelatitude
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+

diff --git a/debian/control b/debian/control
index 09c6888..ff5e7de 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,4 +11,12 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Google Latitude Updater
  A Google Latitude Updater in QT4.
+ Features:
+  - Retrive location using:
+   + IP
+   + Cell Tower (gsm/wcdma)
+   + Gps
+  - Manual Update
+  - View Location of Friend
+  - View and Search on Google Maps
 XB-Maemo-Display-Name: Google Latitude Updater

diff --git a/debian/dirs b/debian/dirs
index e772481..80507f1 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
 usr/bin
+usr/share/applications/hildon

diff --git a/debian/rules b/debian/rules
index ad1ab6f..26cb05f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,53 +11,58 @@
 
 APPNAME := googlelatitude
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-builddir:
-       mkdir -p builddir
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+       # qmake
+       /opt/qt4-maemo5/bin/qmake-qt4
+       touch configure-stamp
 
-builddir/Makefile: builddir
-       cd builddir && /opt/qt4-maemo5/bin/qmake-qt4 PREFIX=/usr ../$(APPNAME).pro
-#      cd builddir && qmake-qt4 PREFIX=/usr ../$(APPNAME).pro
 build: build-stamp
-
-build-stamp: builddir/Makefile
+build-stamp: configure-stamp  
        dh_testdir
-       cd builddir && $(MAKE)
+       $(MAKE)
        touch $@
 
-clean:
+clean: 
        dh_testdir
        dh_testroot
-       rm -f build-stamp
-       rm -rf builddir
-       dh_clean
+       rm -f build-stamp configure-stamp
+       -$(MAKE) clean
+       dh_clean 
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_clean -k 
        dh_installdirs
-       cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
+       $(MAKE) DESTDIR=$(CURDIR)/debian/$(APPNAME) install
 
 binary-indep: build install
-
 binary-arch: build install
        dh_testdir
        dh_testroot
+       dh_installchangelogs 
        dh_installdocs
        dh_installexamples
+#      dh_install
+#      dh_installmenu
+#      dh_installdebconf       
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_python
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
        dh_installman
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
+#      dh_perl
+#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol

diff --git a/googlelatitude.pro b/googlelatitude.pro
index 0541317..a667d92 100644 (file)
--- a/googlelatitude.pro
+++ b/googlelatitude.pro
@@ -1,9 +1,23 @@
-QMAKEVERSION = $$[QMAKE_VERSION]
-ISQT4 = $$find(QMAKEVERSION, ^[2-9])
-isEmpty( ISQT4 ) {
-   error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
-}
-
-TEMPLATE = subdirs
-SUBDIRS  = src
+TARGET       = googlelatitude
+HEADERS     += src/latitude.h src/glatitude.h src/gps.h src/gpsfake.h
+SOURCES     += src/main.cpp src/latitude.cpp src/glatitude.cpp src/gps.cpp
+FORMS       += 
+
+OBJECTS_DIR = build
+MOC_DIR     = build
+UI_DIR      = build
+DESTDIR     = build
+
+TEMPLATE    = app
+QT          += network webkit
+INCLUDEPATH +=
+LIBS        +=
+DEFINES     +=
+CONFIG      += link_pkgconfig
+PKGCONFIG   += glib-2.0 liblocation
+
+install_app.commands = $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)/usr/bin/$(QMAKE_TARGET)
+install_dsk.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET).desktop $(DESTDIR)/usr/share/applications/hildon/$(QMAKE_TARGET).desktop
+install.depends = $(TARGET) install_app install_dsk
+QMAKE_EXTRA_TARGETS += install install_app install_dsk
 

diff --git a/src/googlelatitude.desktop b/src/googlelatitude.desktop
deleted file mode 100644 (file)
index 4ae4d9b..0000000
--- a/src/googlelatitude.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.1
-Type=Application
-Name=Google Latitude Update
-Exec=/usr/bin/GoogleLatitude
-Icon=googlelatitude
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-

diff --git a/src/latitude.cpp b/src/latitude.cpp
index 42f26b9..40a0a13 100644 (file)
--- a/src/latitude.cpp
+++ b/src/latitude.cpp
@@ -124,9 +124,9 @@ void LatitudeGUI::show_lat() {
     layout_location->addRow(tr("acc :"), location_acc);
 
     // source button
-    QPushButton *source_loc = new QPushButton(tr("Auto &loc"));
-    QPushButton *source_cell = new QPushButton(tr("Auto &cell"));
-    QPushButton *source_gps = new QPushButton(tr("Auto &gps"));
+    QPushButton *source_loc = new QPushButton(tr("Update with &IP"));
+    QPushButton *source_cell = new QPushButton(tr("Update with &Cell"));
+    QPushButton *source_gps = new QPushButton(tr("Update with &Gps"));
     // source layout
     QHBoxLayout *layout_source = new QHBoxLayout();
     layout_source->addWidget(source_loc);

diff --git a/src/src.pro b/src/src.pro
deleted file mode 100644 (file)
index 53ac347..0000000
--- a/src/src.pro
+++ /dev/null
@@ -1,40 +0,0 @@
-QT += network
-QT += webkit
-CONFIG += link_pkgconfig
-PKGCONFIG += glib-2.0 \
-    liblocation
-TARGET = GoogleLatitude
-TEMPLATE = app
-SOURCES += main.cpp \
-    latitude.cpp \
-    glatitude.cpp \
-    gps.cpp
-HEADERS += latitude.h \
-    glatitude.h \
-    gps.h
-HEADERS += gpsfake.h
-
-unix { 
-    isEmpty(PREFIX):PREFIX = /usr/local
-    BINDIR = $$PREFIX/bin
-    DATADIR = $$PREFIX/share
-    DEFINES += DATADIR=\"$$DATADIR\" \
-        PKGDATADIR=\"$$PKGDATADIR\"
-    INSTALLS += target \
-        desktop \
-        iconxpm \
-        icon26 \
-        icon40 \
-        icon64
-    target.path = $$BINDIR
-    desktop.path = $$DATADIR/applications/hildon
-    desktop.files += $${TARGET}.desktop
-    iconxpm.path = $$DATADIR/pixmap
-    iconxpm.files += ../data/maemo/$${TARGET}.xpm
-    icon26.path = $$DATADIR/icons/hicolor/26x26/apps
-    icon26.files += ../data/26x26/$${TARGET}.png
-    icon40.path = $$DATADIR/icons/hicolor/40x40/apps
-    icon40.files += ../data/40x40/$${TARGET}.png
-    icon64.path = $$DATADIR/icons/hicolor/64x64/apps
-    icon64.files += ../data/64x64/$${TARGET}.png
-}