From 4d86ebb587dc4f822569ecab3d4d25a5b3ca3939 Mon Sep 17 00:00:00 2001 From: "Anselmo Lacerda S. de Melo" Date: Sat, 29 May 2010 17:35:24 -0300 Subject: shoplist: Updating debian files for PR1.2 Signed-off-by: Anselmo Lacerda S. de Melo --- shoplist/debian/changelog | 6 +++ shoplist/debian/control | 11 +++--- shoplist/debian/qtmobiledemo-shoplist.install | 2 - shoplist/debian/rules | 53 +++++++++++++++++++++++---- shoplist/shoplist.pro | 31 +++++++++++++++- 5 files changed, 88 insertions(+), 15 deletions(-) delete mode 100644 shoplist/debian/qtmobiledemo-shoplist.install diff --git a/shoplist/debian/changelog b/shoplist/debian/changelog index 90a4967..c1f052f 100644 --- a/shoplist/debian/changelog +++ b/shoplist/debian/changelog @@ -1,3 +1,9 @@ +qtmobiledemo-shoplist (0.2-maemo1) unstable; urgency=low + + * Updated for Maemo 5 PR 1.2 + + -- Anselmo Lacerda S. de Melo Sat, 29 May 2010 16:30:24 -0300 + qtmobiledemo-shoplist (0.1-maemo1) unstable; urgency=low * First package for Maemo5 in extras-devel. diff --git a/shoplist/debian/control b/shoplist/debian/control index 3b528f2..e68964d 100644 --- a/shoplist/debian/control +++ b/shoplist/debian/control @@ -1,14 +1,15 @@ Source: qtmobiledemo-shoplist -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-shoplist -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: ShopList XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c diff --git a/shoplist/debian/qtmobiledemo-shoplist.install b/shoplist/debian/qtmobiledemo-shoplist.install deleted file mode 100644 index 5e3d3f2..0000000 --- a/shoplist/debian/qtmobiledemo-shoplist.install +++ /dev/null @@ -1,2 +0,0 @@ -images/icon-shoplist.png usr/share/pixmaps/ -shoplist.desktop usr/share/applications/hildon/ diff --git a/shoplist/debian/rules b/shoplist/debian/rules index f02b1d7..11eaad3 100755 --- a/shoplist/debian/rules +++ b/shoplist/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)/shoplist.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-shoplist 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/shoplist/shoplist.pro b/shoplist/shoplist.pro index 0522f0c..d5b9965 100644 --- a/shoplist/shoplist.pro +++ b/shoplist/shoplist.pro @@ -1,6 +1,20 @@ TEMPLATE = app TARGET = +# All generated files goes same directory +OBJECTS_DIR = build +MOC_DIR = build +UI_DIR = build +DESTDIR = build + +INSTALLS += desktop +desktop.path = /usr/share/applications/hildon +desktop.files = data/shoplist.desktop + +INSTALLS += icon64 +icon64.path = /usr/share/icons/hicolor/64x64/apps +icon64.files = data/icon-shoplist.png + include(src/src.pri) include(../shared/shared.pri) @@ -10,9 +24,24 @@ INSTALLS += target RESOURCES += resources.qrc QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 +# S60 symbian { TARGET.EPOCHEAPSIZE = 0x20000 \ 0x2000000 TARGET.UID3 = 0xe1234568 - ICON = images/icon-shoplist.svg + ICON = data/icon-shoplist.svg +} + +# 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 } -- cgit v1.2.3