Fix single instance, use meegotouch icon

diff --git a/application/application.pro b/application/application.pro
index 39088da..45bbf23 100644 (file)
--- a/application/application.pro
+++ b/application/application.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-VERSION = 0.5.0
+VERSION = 0.5.1
 USE_RESOURCES = 0
 
 QT += webkit network
@@ -126,6 +126,7 @@ OTHER_FILES += \
     resources/fremantle/applications/quandoparte.desktop \
     icons/48x48/quandoparte.png \
     icons/64x64/quandoparte.png \
+    icons/80x80/quandoparte.png \
     icons/scalable/quandoparte.svg \
     icons/quandoparte.png \
     resources/quandoparte.css \
@@ -182,12 +183,10 @@ unix:!symbian {
 }
 
 unix:!symbian {
-    css.files = resources/$${TARGET}.css resources/arrivals.css resources/departures.css
     i18n.files = $$replace(TRANSLATIONS, .ts, .qm)
     stations.files = resources/stations/stations.qpl
 
     i18n.path = $$DATADIR/i18n
-    css.path = $$DATADIR/css
     stations.path = $$DATADIR/stations
 
     icon48.files = icons/48x48/$${TARGET}.png
@@ -199,15 +198,27 @@ unix:!symbian {
     iconscalable.path = /usr/share/icons/hicolor/scalable/apps
 
     INSTALLS += icon48
-    INSTALLS += icon64
     INSTALLS += iconscalable
     !contains(USE_RESOURCES,1) {
-        INSTALLS += css
         INSTALLS += i18n
         INSTALLS += stations
     }
 }
 
+maemo5 {
+    css.files = resources/$${TARGET}.css resources/arrivals.css resources/departures.css
+    css.path = $$DATADIR/css
+    !contains(USE_RESOURCES,1) {
+        INSTALLS += css
+    }
+}
+
+harmattan {
+    icon80.files = icons/80x80/$${TARGET}.png
+    icon80.path = /usr/share/icons/hicolor/meegotouch/apps
+    INSTALLS += icon80
+}
+
 !contains(USE_RESOURCES,1) {
     harmattan {
         qml.files = resources/harmattan/qml/*.qml resources/harmattan/qml/*.js

diff --git a/application/icons/80x80/quandoparte.png b/application/icons/80x80/quandoparte.png
new file mode 100644 (file)
index 0000000..7f4face
Binary files /dev/null and b/application/icons/80x80/quandoparte.png differ

diff --git a/application/resources/harmattan/applications/quandoparte.desktop b/application/resources/harmattan/applications/quandoparte.desktop
index f2e44c3..f3bcdcb 100644 (file)
--- a/application/resources/harmattan/applications/quandoparte.desktop
+++ b/application/resources/harmattan/applications/quandoparte.desktop
@@ -4,8 +4,8 @@ Version=1.0
 Type=Application
 Terminal=false
 Name=Quando Parte
-Exec=/usr/bin/invoker --type=d -s /opt/quandoparte/bin/quandoparte
-Icon=/usr/share/icons/hicolor/scalable/apps/quandoparte.svg
+Exec=/usr/bin/invoker --single-instance --type=d -s /opt/quandoparte/bin/quandoparte
+Icon=/usr/share/icons/hicolor/meegotouch/apps/quandoparte.png
 X-Window-Icon=
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Type=application/x-executable

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 5df0df4..f3baedc 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,3 +1,8 @@
+quandoparte (0.5.1) unstable; urgency=low
+  * Fix single instance startup
+
+ -- Luciano Montanaro <mikelima@zaphod>  Sat, 28 Jul 2012 20:18:47 +0200
+
 quandoparte (0.5.0) unstable; urgency=low
   * Public release
   * Fixed the searchbar hiding/unhiding animation

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index 8ba4152..19ece88 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -40,7 +40,7 @@ install: build
        dh_clean -k 
        dh_installdirs
        # Add here commands to install the package into debian/quandoparte.
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quandoparte install
+       $(MAKE)  INSTALL_ROOT="$(CURDIR)"/debian/quandoparte install
 
 
 # Build architecture-independent files here.

diff --git a/www/index.html b/www/index.html
index 4bb4adb..207c996 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -46,7 +46,7 @@
                </div>
                <div class="footer">
                        <div class="copy">© 2011, 2012 Luciano Montanaro</div>
-                       <div class="note">The program is maintained in the <a href="https://garage.maemo.org/projects/quandoparte/">Maemo Garage</a>.</div>     
+                       <div class="note">The program is maintained in the <a href="https://garage.maemo.org/projects/quandoparte/">Maemo Garage</a>.</div> 
                </div>
        </body>
 </html>

diff --git a/www/screenshots.html b/www/screenshots.html
index 9c18eab..54180b7 100644 (file)
--- a/www/screenshots.html
+++ b/www/screenshots.html
@@ -25,7 +25,8 @@
                        <div id="screenshot-list"></div>
                </div>
                <div class="footer">
-                       <div class="copy">© 2011 Luciano Montanaro</div>
+                       <div class="copy">© 2011, 2012 Luciano Montanaro</div>
+                       <div class="note">The program is maintained in the <a href="https://garage.maemo.org/projects/quandoparte/">Maemo Garage</a>.</div> 
                </div>
        </body>
 </html>