weather: Updated for Maemo 5 PR 1.2

Signed-off-by: Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>

5 files changed, 99 insertions, 26 deletions

diff --git a/weather/debian/changelog b/weather/debian/changelog
index 3a105de..0be5466 100644
--- a/weather/debian/changelog
+++ b/weather/debian/changelog
@@ -1,3 +1,9 @@
+qtmobiledemo-weather (0.2-maemo1) unstable; urgency=low
+
+  * Updated for PR 1.2
+
+ -- Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>  Mon, 29 May 2010 18:05:56 -0300
+
 qtmobiledemo-weather (0.1-maemo1) unstable; urgency=low
 
   * First package for Maemo5 in extras-devel.
diff --git a/weather/debian/control b/weather/debian/control
index c45cc93..dbece41 100644
--- a/weather/debian/control
+++ b/weather/debian/control
@@ -1,14 +1,15 @@
 Source: qtmobiledemo-weather
-Section: apps
-Priority: optional
+Section: user/Other
+Priority: extra
 Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
-Build-Depends: debhelper (>= 4), libgconf2-dev, libdbus-glib-1-dev, libdbus-1-dev, libglib2.0-dev, libqt4-maemo5-dev
+Build-Depends: debhelper (>= 5), libgconf2-dev, libdbus-glib-1-dev, libdbus-1-dev, libglib2.0-dev, libqt4-dev
 Standards-Version: 3.8.1
+Homepage: http://qt.gitorious.org/qt-labs/mobile-demos
 
 Package: qtmobiledemo-weather
-Section: user/other
+Section: user/Other
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui, libqt4-maemo5-network
+Depends: ${shlibs:Depends}, ${misc:Depends}
 XB-Maemo-Display-Name: Qt Mobile Demo: Weather
 XB-Maemo-Icon-26:
   iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c
diff --git a/weather/debian/qtmobiledemo-weather.install b/weather/debian/qtmobiledemo-weather.install
deleted file mode 100644
index 25a20f4..0000000
--- a/weather/debian/qtmobiledemo-weather.install
+++ /dev/null
@@ -1,3 +0,0 @@
-weather.desktop usr/share/applications/hildon/
-weather.ini usr/share/applications/
-images/icon-weather.png usr/share/pixmaps/
diff --git a/weather/debian/rules b/weather/debian/rules
index 2dc8b6a..960b926 100755
--- a/weather/debian/rules
+++ b/weather/debian/rules
@@ -1,11 +1,50 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	qmake -r PREFIX=/usr
+	touch configure-stamp
 
-QMAKE = /opt/qt4-maemo5/bin/qmake
-DEB_BUILDDIR = debian/builddeb
-DEB_QMAKE_ARGS = $(CURDIR)/weather.pro -r PREFIX=/usr
+build: build-stamp
 
-clean::
-	rm  -fr $(DEB_BUILDDIR)
+build-stamp: configure-stamp
+	dh_testdir
+
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	-$(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/qtmobiledemo-weather install
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/weather/weather.pro b/weather/weather.pro
index 4d97afb..e2ec896 100644
--- a/weather/weather.pro
+++ b/weather/weather.pro
@@ -1,34 +1,50 @@
 TEMPLATE = app
+
+QT += network xml
+
 TARGET = weather
-QT += network \
-    xml
 target.path = $$PREFIX/bin
 INSTALLS += target
+
+INSTALLS    += desktop
+desktop.path  = /usr/share/applications/hildon
+desktop.files  = data/weather.desktop
+
+INSTALLS    += icon64
+icon64.path  = /usr/share/icons/hicolor/64x64/apps
+icon64.files  = data/icon-weather.png
+
+INSTALLS    += inifile
+inifile.path  = /usr/share/applications/
+inifile.files  = data/weather.ini
+
 RESOURCES += resources.qrc
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+DESTDIR = build
+VPATH += src
 
 include(../shared/shared.pri)
 
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+
 symbian {
     LIBS += -lesock \
         -lconnmon \
         -lcone \
         -lavkon
-    addFiles.sources = weather.ini
+    addFiles.sources = data/weather.ini
     addFiles.path = c:\data
     DEPLOYMENT += addFiles
-    ICON = images/icon-weather.svg
-    OBJECTS_DIR = tmp
-    MOC_DIR = tmp
+    ICON = data/icon-weather.svg
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 \
         0x2000000
     TARGET.UID3 = 0xe1234567
 }
-unix {
-    OBJECTS_DIR = tmp
-    MOC_DIR = tmp
-}
+
 HEADERS += mainview.h \
     settings.h \
     forecastview.h \
@@ -91,3 +107,17 @@ SOURCES += mainview.cpp \
     xoapweatherresponse.cpp \
     forecastdata.cpp \
     fakecontentscreen.cpp
+
+# Maemo 5
+linux-g++-maemo5{
+  # Targets for debian source and binary package creation
+  debian-src.commands = dpkg-buildpackage -S -r -us -uc -d
+  debian-bin.commands = dpkg-buildpackage -b -r -uc -d
+  debian-all.depends = debian-src debian-bin
+
+
+  # Clean all but Makefile
+  compiler_clean.commands = -$(DEL_FILE) $(TARGET)
+
+  QMAKE_EXTRA_TARGETS += debian-all debian-src debian-bin compiler_clean
+}