From 836e269542a4bb874436ddacd170e19fb20f8e31 Mon Sep 17 00:00:00 2001 From: "Anselmo Lacerda S. de Melo" Date: Sat, 29 May 2010 21:10:27 -0300 Subject: mybudget: updated for Maemo5 PR 1.2 Signed-off-by: Anselmo Lacerda S. de Melo --- mybudget/debian/changelog | 6 +++ mybudget/debian/control | 11 +++--- mybudget/debian/qtmobiledemo-mybudget.install | 3 -- mybudget/debian/rules | 53 ++++++++++++++++++++++---- mybudget/maemo/mybudget-icon.png | Bin 0 -> 4493 bytes mybudget/mybudget-icon.png | Bin 4493 -> 0 bytes mybudget/mybudget.pro | 51 ++++++++++++++++++++----- mybudget/shared2.pri | 13 +++++++ mybudget/src/src.pri | 29 +++----------- 9 files changed, 118 insertions(+), 48 deletions(-) delete mode 100644 mybudget/debian/qtmobiledemo-mybudget.install create mode 100755 mybudget/maemo/mybudget-icon.png delete mode 100755 mybudget/mybudget-icon.png create mode 100644 mybudget/shared2.pri diff --git a/mybudget/debian/changelog b/mybudget/debian/changelog index e5c7a60..b3862ed 100644 --- a/mybudget/debian/changelog +++ b/mybudget/debian/changelog @@ -1,3 +1,9 @@ +qtmobiledemo-mybudget (0.4-maemo1) unstable; urgency=low + + * Updated for Maemo PR 1.2 + + -- Anselmo Lacerda S. de Melo Mon, 29 May 2010 18:00:43 -0300 + qtmobiledemo-mybudget (0.3-maemo1) unstable; urgency=low * First package for Maemo5 repositories. diff --git a/mybudget/debian/control b/mybudget/debian/control index 658d3cd..ac70f24 100644 --- a/mybudget/debian/control +++ b/mybudget/debian/control @@ -1,14 +1,15 @@ Source: qtmobiledemo-mybudget -Section: apps -Priority: optional +Section: user/Other +Priority: extra Maintainer: Jesus Sanchez-Palencia -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-mybudget -Section: user/other +Section: user/Other Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui +Depends: ${shlibs:Depends}, ${misc:Depends} XB-Maemo-Display-Name: Qt Mobile Demo: MyBudget XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c diff --git a/mybudget/debian/qtmobiledemo-mybudget.install b/mybudget/debian/qtmobiledemo-mybudget.install deleted file mode 100644 index 0a5e883..0000000 --- a/mybudget/debian/qtmobiledemo-mybudget.install +++ /dev/null @@ -1,3 +0,0 @@ -maemo/mybudget.desktop usr/share/applications/hildon/ -mybudget-icon.png usr/share/pixmaps/ -maemo/start_mybudget.sh usr/bin/ diff --git a/mybudget/debian/rules b/mybudget/debian/rules index 7af054f..cb495ff 100755 --- a/mybudget/debian/rules +++ b/mybudget/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)/mybudget.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-mybudget 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/mybudget/maemo/mybudget-icon.png b/mybudget/maemo/mybudget-icon.png new file mode 100755 index 0000000..637401f Binary files /dev/null and b/mybudget/maemo/mybudget-icon.png differ diff --git a/mybudget/mybudget-icon.png b/mybudget/mybudget-icon.png deleted file mode 100755 index 637401f..0000000 Binary files a/mybudget/mybudget-icon.png and /dev/null differ diff --git a/mybudget/mybudget.pro b/mybudget/mybudget.pro index 5837591..7166676 100644 --- a/mybudget/mybudget.pro +++ b/mybudget/mybudget.pro @@ -1,15 +1,41 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Mon Aug 31 16:16:21 2009 -###################################################################### - TEMPLATE = app TARGET = +# All generated files goes same directory +OBJECTS_DIR = build +MOC_DIR = build +UI_DIR = build +DESTDIR = build + RESOURCES += images/images.qrc include(src/src.pri) + include(../shared/shared.pri) +include(shared2.pri) + +isEmpty(PREFIX) { + PREFIX = "/usr/local" +} + +INSTALLS += target +target.path = $$PREFIX/bin + +INSTALLS += desktop +desktop.path = /usr/share/applications/hildon +desktop.files = maemo/mybudget.desktop + +INSTALLS += icon64 +icon64.path = /usr/share/icons/hicolor/64x64/apps +icon64.files = maemo/mybudget-icon.png +INSTALLS += initsh +initsh.path = /usr/bin/ +initsh.files = maemo/start_mybudget.sh + +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 + +# S60 symbian { isEmpty(NODEPLOYMENT) { TARGET.UID3 = 0xe1234566 @@ -21,11 +47,16 @@ symbian { } } -isEmpty(PREFIX) { - PREFIX = "/usr/local" -} +# 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 -target.path = $$PREFIX/bin -INSTALLS += target -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 + # Clean all but Makefile + compiler_clean.commands = -$(DEL_FILE) $(TARGET) + + QMAKE_EXTRA_TARGETS += debian-all debian-src debian-bin compiler_clean +} diff --git a/mybudget/shared2.pri b/mybudget/shared2.pri new file mode 100644 index 0000000..33be0f0 --- /dev/null +++ b/mybudget/shared2.pri @@ -0,0 +1,13 @@ +INCLUDEPATH += ../shared +HEADERS += \ + ../shared/model.h \ + ../shared/listview.h \ + ../shared/scrollbar.h \ + ../shared/pageslider.h \ + ../shared/flickablearea.h +SOURCES += \ + ../shared/model.cpp \ + ../shared/listview.cpp \ + ../shared/scrollbar.cpp \ + ../shared/pageslider.cpp \ + ../shared/flickablearea.cpp diff --git a/mybudget/src/src.pri b/mybudget/src/src.pri index d118f67..8aa1966 100644 --- a/mybudget/src/src.pri +++ b/mybudget/src/src.pri @@ -9,18 +9,8 @@ HEADERS += src/pdata.h \ src/widgets/listexpenses.h \ src/widgets/coingraphicwidget.h \ src/widgets/timelinemenu.h \ - src/widgets/titlebar.h \ - ../shared/utils.h \ - ../shared/model.h \ - ../shared/label.h \ - ../shared/listview.h \ - ../shared/button.h \ - ../shared/scrollbar.h \ - ../shared/kineticscroll.h \ - ../shared/pageslider.h \ - ../shared/flickablearea.h \ - ../shared/pixmapwidget.h \ - ../shared/dataresource.h + src/widgets/titlebar.h + INCLUDEPATH += src src/widgets @@ -36,14 +26,7 @@ SOURCES += src/main.cpp \ src/widgets/coingraphicwidget.cpp \ src/widgets/timelinemenu.cpp \ src/widgets/titlebar.cpp \ - ../shared/utils.cpp \ - ../shared/model.cpp \ - ../shared/label.cpp \ - ../shared/listview.cpp \ - ../shared/button.cpp \ - ../shared/scrollbar.cpp \ - ../shared/kineticscroll.cpp \ - ../shared/pageslider.cpp \ - ../shared/flickablearea.cpp \ - ../shared/pixmapwidget.cpp \ - ../shared/dataresource.cpp + + + + -- cgit v1.2.3