hyperui: debian files, .pro updated

Build process updated, including ideas taken from the
project skeleton suggested by MADDE 0.6.72.

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

6 files changed, 127 insertions, 48 deletions

diff --git a/hyperui/debian/changelog b/hyperui/debian/changelog
index 53981a3..ab8f67d 100644
--- a/hyperui/debian/changelog
+++ b/hyperui/debian/changelog
@@ -1,3 +1,9 @@
+qtmobiledemo-hyperui (0.2-maemo1) unstable; urgency=low
+
+  * Package updated for Maemo 5 PR 1.2
+
+ -- Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>  Sat, 29 May 2010 00:55:15 -0300
+
 qtmobiledemo-hyperui (0.1-maemo1) unstable; urgency=low
 
   * First package for Maemo5 in extras-devel.
diff --git a/hyperui/debian/control b/hyperui/debian/control
index c994786..7db5aad 100644
--- a/hyperui/debian/control
+++ b/hyperui/debian/control
@@ -1,14 +1,15 @@
 Source: qtmobiledemo-hyperui
-Section: apps
-Priority: optional
+Section: user/Other
+Priority: extra
 Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
-Build-Depends: debhelper (>= 4), libqt4-maemo5-dev
+Build-Depends: debhelper (>= 5), libqt4-dev
 Standards-Version: 3.8.1
+Homepage: http://qt.gitorious.org/qt-labs/mobile-demos
 
 Package: qtmobiledemo-hyperui
-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: HyperUI
 XB-Maemo-Icon-26:
   iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c
diff --git a/hyperui/debian/qtmobiledemo-hyperui.install b/hyperui/debian/qtmobiledemo-hyperui.install
deleted file mode 100644
index 32f1de4..0000000
--- a/hyperui/debian/qtmobiledemo-hyperui.install
+++ /dev/null
@@ -1,2 +0,0 @@
-hyperui.desktop usr/share/applications/hildon/
-hyperui.png usr/share/pixmaps/
diff --git a/hyperui/debian/rules b/hyperui/debian/rules
index 0b8df12..2d60197 100755
--- a/hyperui/debian/rules
+++ b/hyperui/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 USE_RASTER=1
+	touch configure-stamp
 
-QMAKE = /opt/qt4-maemo5/bin/qmake
-DEB_BUILDDIR = debian/builddeb
-DEB_QMAKE_ARGS = $(CURDIR)/hyperui.pro -r PREFIX=/usr USE_RASTER=1
+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-hyperui 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/hyperui/hyperui.pro b/hyperui/hyperui.pro
index e99dab3..d7e972d 100644
--- a/hyperui/hyperui.pro
+++ b/hyperui/hyperui.pro
@@ -2,19 +2,35 @@ TEMPLATE = app
 TARGET = hyperui
 DEPENDPATH += .
 
-target.path = $$PREFIX/bin
+# All generated files goes same directory
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
+DESTDIR = build
+VPATH += src
 INSTALLS += target
+target.path = $$PREFIX/bin ##
 
-include(../shared/shared.pri)
+INSTALLS    += desktop
+desktop.path  = /usr/share/applications/hildon
+desktop.files  = data/hyperui.desktop
 
-symbian {
-    TARGET.UID3 = 0xe1234569
-    ICON = hyperui.svg
-    isEmpty(RESOLUTION) {
-        RESOLUTION = "640x360"
-    }
+INSTALLS    += icon64
+icon64.path  = /usr/share/icons/hicolor/64x64/apps
+icon64.files  = data/hyperui.png
+
+isEmpty(RESOLUTION) {
+    # N900 resolution
+    RESOLUTION = "800x480"
+}
+
+!isEmpty(USE_RASTER) {
+    DEFINES += USE_RASTER_GRAPHICS_SYSTEM
 }
 
+RESOURCES = resource/$$RESOLUTION/hyperui.qrc
+
 HEADERS += mainwindow.h \
            pagemenu.h \
            view.h \
@@ -25,14 +41,7 @@ HEADERS += mainwindow.h \
            draggablepreview.h \
            clockwidget.h \
            contactlist.h \
-           contactresource.h \
-           ../shared/utils.h \
-           ../shared/button.h \
-           ../shared/label.h \
-           ../shared/scrollarea.h \
-           ../shared/pixmapwidget.h \
-           ../shared/kineticscroll.h \
-           ../shared/dataresource.h
+           contactresource.h
 
 SOURCES += main.cpp \
            mainwindow.cpp \
@@ -45,21 +54,30 @@ SOURCES += main.cpp \
            draggablepreview.cpp \
            clockwidget.cpp \
            contactlist.cpp \
-           contactresource.cpp \
-           ../shared/utils.cpp \
-           ../shared/button.cpp \
-           ../shared/label.cpp \
-           ../shared/scrollarea.cpp \
-           ../shared/pixmapwidget.cpp \
-           ../shared/kineticscroll.cpp \
-           ../shared/dataresource.cpp
+           contactresource.cpp
 
-isEmpty(RESOLUTION) {
-    RESOLUTION = "800x480"
-}
+include(../shared/shared.pri)
 
-!isEmpty(USE_RASTER) {
-    DEFINES += USE_RASTER_GRAPHICS_SYSTEM
+# S60
+symbian {
+    TARGET.UID3 = 0xe1234569
+    ICON = data/hyperui.svg
+    isEmpty(RESOLUTION) {
+        # N97 resolution
+        RESOLUTION = "640x360"
+    }
 }
 
-RESOURCES = resource/$$RESOLUTION/hyperui.qrc
+# 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
+}
diff --git a/shared/shared.pri b/shared/shared.pri
index 5e79eb9..27b8068 100644
--- a/shared/shared.pri
+++ b/shared/shared.pri
@@ -1,9 +1,26 @@
-INCLUDEPATH += ../shared
-
 symbian {
     LIBS += -lconnmon -lcone -lavkon
+
 }
 
-HEADERS += ../shared/system.h
+INCLUDEPATH += ../shared
+
+HEADERS += \
+           ../shared/utils.h \
+           ../shared/button.h \
+           ../shared/label.h \
+           ../shared/scrollarea.h \
+           ../shared/pixmapwidget.h \
+           ../shared/kineticscroll.h \
+           ../shared/dataresource.h \
+           ../shared/system.h
 
-SOURCES += ../shared/system.cpp
+SOURCES += \
+           ../shared/utils.cpp \
+           ../shared/button.cpp \
+           ../shared/label.cpp \
+           ../shared/scrollarea.cpp \
+           ../shared/pixmapwidget.cpp \
+           ../shared/kineticscroll.cpp \
+           ../shared/dataresource.cpp \
+           ../shared/system.cpp