diff options
author | Adriano Rezende <adriano.rezende@openbossa.org> | 2009-11-17 19:04:59 -0300 |
---|---|---|
committer | Adriano Rezende <adriano.rezende@openbossa.org> | 2009-11-17 19:06:05 -0300 |
commit | 3187e481111d446fe0e2a3bfd12e693a757dc47c (patch) | |
tree | 3bd8a33cae714d23dc0a7fa66c7f2c2541b77b1f /weather | |
parent | f7b51ba9a7ff88629d430d49b5785c17f8271ba8 (diff) |
Added maemo support with debian package files
Signed-off-by: Adriano Rezende <adriano.rezende@openbossa.org>
Diffstat (limited to 'weather')
-rw-r--r-- | weather/debian/changelog | 5 | ||||
-rw-r--r-- | weather/debian/compat | 1 | ||||
-rw-r--r-- | weather/debian/control | 12 | ||||
-rwxr-xr-x | weather/debian/rules | 10 | ||||
-rw-r--r-- | weather/debian/weather.install | 3 | ||||
-rw-r--r-- | weather/main.cpp | 3 | ||||
-rw-r--r-- | weather/settings.cpp | 6 | ||||
-rw-r--r-- | weather/titlebar.cpp | 2 | ||||
-rw-r--r-- | weather/weather.desktop | 8 | ||||
-rw-r--r-- | weather/weather.ini | 2 | ||||
-rw-r--r-- | weather/weather.pro | 4 |
11 files changed, 48 insertions, 8 deletions
diff --git a/weather/debian/changelog b/weather/debian/changelog new file mode 100644 index 0000000..ab4e562 --- /dev/null +++ b/weather/debian/changelog @@ -0,0 +1,5 @@ +weather (0.1-1) unstable; urgency=low + + * Initial release. + + -- Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Wed, 29 Aug 2009 16:47:57 -0300 diff --git a/weather/debian/compat b/weather/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/weather/debian/compat @@ -0,0 +1 @@ +5 diff --git a/weather/debian/control b/weather/debian/control new file mode 100644 index 0000000..ff85b31 --- /dev/null +++ b/weather/debian/control @@ -0,0 +1,12 @@ +Source: weather +Section: apps +Priority: optional +Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> +Build-Depends: debhelper (>= 4), libqt4-maemo5-dev +Standards-Version: 3.8.1 + +Package: weather +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui, libqt4-maemo5-network +Description: Weather + Weather diff --git a/weather/debian/rules b/weather/debian/rules new file mode 100755 index 0000000..b299893 --- /dev/null +++ b/weather/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/qmake.mk + +DEB_BUILDDIR = debian/builddeb +DEB_QMAKE_ARGS = $(CURDIR)/weather.pro -r PREFIX=/usr + +clean:: + rm -fr $(DEB_BUILDDIR) diff --git a/weather/debian/weather.install b/weather/debian/weather.install new file mode 100644 index 0000000..25a20f4 --- /dev/null +++ b/weather/debian/weather.install @@ -0,0 +1,3 @@ +weather.desktop usr/share/applications/hildon/ +weather.ini usr/share/applications/ +images/icon-weather.png usr/share/pixmaps/ diff --git a/weather/main.cpp b/weather/main.cpp index c98ded2..2b9bcdf 100644 --- a/weather/main.cpp +++ b/weather/main.cpp @@ -49,6 +49,7 @@ #include "symbiannetwork.h" #endif + int main(int argc, char **argv) { qRegisterMetaType<ForecastData>("ForecastData"); @@ -61,7 +62,7 @@ int main(int argc, char **argv) #ifdef Q_OS_SYMBIAN const bool connected = connect(); #else - const bool connected = true; + const bool connected = false; #endif if (connected) diff --git a/weather/settings.cpp b/weather/settings.cpp index fe1008a..32b3071 100644 --- a/weather/settings.cpp +++ b/weather/settings.cpp @@ -35,8 +35,10 @@ #include <QTimer> #include <QDebug> -#ifdef Q_OS_SYMBIAN +#if defined(Q_OS_SYMBIAN) #define SETTINGS_FILE "c://data/weather.ini" +#elif defined(Q_WS_MAEMO_5) +#define SETTINGS_FILE "/usr/share/applications/weather.ini" #else #define SETTINGS_FILE "weather.ini" #endif @@ -54,7 +56,7 @@ Settings *Settings::instance() QSize Settings::windowSize() { -#ifdef QT_ARCH_ARM +#ifdef Q_OS_SYMBIAN static const QSize result(QApplication::desktop()->screenGeometry().size()); #else static const QSize result(instance()->m_settings.value("windowSize").toSize()); diff --git a/weather/titlebar.cpp b/weather/titlebar.cpp index 53b695d..c38377a 100644 --- a/weather/titlebar.cpp +++ b/weather/titlebar.cpp @@ -49,8 +49,6 @@ void CloseButton::mousePressEvent(QGraphicsSceneMouseEvent *event) QCoreApplication::instance()->quit(); } -// TitleBar - TitleBar::TitleBar(QGraphicsItem *parent) : QGraphicsPixmapItem(PixmapLoader::getPic("title_bar"), parent) { diff --git a/weather/weather.desktop b/weather/weather.desktop new file mode 100644 index 0000000..b4725d0 --- /dev/null +++ b/weather/weather.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Weather +Categories=Applications +Exec=/usr/bin/weather +Icon=icon-weather +X-Icon-path=/usr/share/pixmaps/ +X-Osso-Type=application/x-executable diff --git a/weather/weather.ini b/weather/weather.ini index 51bb0a0..9962eb2 100644 --- a/weather/weather.ini +++ b/weather/weather.ini @@ -1,5 +1,5 @@ [General] -windowSize=@Size(360 640) +windowSize=@Size(480 800) [Cities] NOXX0029=0 diff --git a/weather/weather.pro b/weather/weather.pro index 2a16410..4d97afb 100644 --- a/weather/weather.pro +++ b/weather/weather.pro @@ -9,7 +9,7 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 include(../shared/shared.pri) -symbian { +symbian { LIBS += -lesock \ -lconnmon \ -lcone \ @@ -25,7 +25,7 @@ symbian { 0x2000000 TARGET.UID3 = 0xe1234567 } -unix { +unix { OBJECTS_DIR = tmp MOC_DIR = tmp } |