Fixed debian packaging.

diff --git a/debian b/debian
index 840fa20..3fa3469 120000 (symlink)
--- a/debian
+++ b/debian
@@ -1 +1 @@
-qtc_packaging/debian_fremantle
\ No newline at end of file
+qtc_packaging/debian_harmattan
\ No newline at end of file

diff --git a/medard.desktop b/medard.desktop
index 3bb23af..e011597 100644 (file)
--- a/medard.desktop
+++ b/medard.desktop
@@ -4,8 +4,8 @@ Version=1.0
 Type=Application
 Terminal=false
 Name=Medard
-Exec=/opt/usr/bin/medard
-Icon=medard
+Exec=/opt/medard/bin/medard
+Icon=/usr/share/icons/hicolor/64x64/apps/medard.png
 X-Window-Icon=
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Type=application/x-executable

diff --git a/medard.pro b/medard.pro
index c2bc3e4..242cead 100644 (file)
--- a/medard.pro
+++ b/medard.pro
@@ -39,17 +39,24 @@ TRANSLATIONS += \
     translations/medard_sk.ts
 
 unix:!symbian {
-    DEPLOYMENTFOLDERS = translations
+    target.path = /opt/medard/bin
+
+    desktop.files = medard.desktop
+
+    icon.files = medard.png
+    icon.path = /usr/share/icons/hicolor/64x64/apps
+
+    translations.files = translations/*.qm
+    translations.path = /opt/medard/share/l10n
+
     maemo 5 {
         DEFINES += Q_WS_MAEMO_5
+        desktop.path  = /usr/share/applications/hildon
     } else {
         DEFINES += Q_WS_MAEMO_6
         CONFIG += meegotouch
+        desktop.path  = /usr/share/applications
     }
 }
 
-translations.source = \
-    translations/medard_cs.qm \
-    translations/medard_en.qm \
-    translations/medard_sk.qm
-
+INSTALLS += target desktop icon translations
\ No newline at end of file

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 2f2175f..9def960 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,4 +1,4 @@
-medard (0.2-1) harmattan; urgency=low
+medard (0.2.0) harmattan; urgency=low
 
   * Initial Harmattan Release.
 

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index d9b426d..332d996 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -9,14 +9,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
-
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
+       qmake PREFIX=/opt/medard # Uncomment this line for use without Qt Creator
 
        touch configure-stamp
 
@@ -65,7 +61,7 @@ binary-arch: build install
        dh_installexamples
 #      dh_install
 #      dh_installmenu
-#      dh_installdebconf       
+#      dh_installdebconf
 #      dh_installlogrotate
 #      dh_installemacsen
 #      dh_installpam

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index fa9c02d..6f71c3d 100644 (file)
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -32,7 +32,7 @@ AboutDialog::AboutDialog(QGraphicsItem *parent) : MMessageBox("", M::OkButton)
 
     setObjectName("messageBox");
 
-    setTitle("Medard 0.2\n");
+    setTitle("Medard 0.2.0\n");
     setText(tr("Copyright(c) 2011 Roman Moravcik") +
             tr("\n"
                "Weather data:\n"

diff --git a/src/main.cpp b/src/main.cpp
index 539b54e..1a49f53 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 
     QString translatorFileName = "medard_" + QLocale::system().name();
     QTranslator translator;
-    if (translator.load(translatorFileName, "/opt/usr/share/medard/"))
+    if (translator.load(translatorFileName, "/opt/medard/share/l10n/"))
         app.installTranslator(&translator);
 
 #ifdef Q_WS_MAEMO_6