Updated packaging files in debian folder.

diff --git a/zouba/ReittiopasImages.qrc b/zouba/ReittiopasImages.qrc
deleted file mode 100644 (file)
index 17992f6..0000000
--- a/zouba/ReittiopasImages.qrc
+++ /dev/null
@@ -1,10 +0,0 @@
-<RCC>
-    <qresource prefix="/reittiopas">
-        <file alias="bus">data/icons/reittiopas/maemo-mapper-bus.png</file>
-        <file alias="ferry">data/icons/reittiopas/maemo-mapper-ferry.png</file>
-        <file alias="metro">data/icons/reittiopas/maemo-mapper-metro.png</file>
-        <file alias="train">data/icons/reittiopas/maemo-mapper-train.png</file>
-        <file alias="tram">data/icons/reittiopas/maemo-mapper-tram.png</file>
-        <file alias="walk">data/icons/reittiopas/maemo-mapper-walk.png</file>
-    </qresource>
-</RCC>

diff --git a/zouba/data/ReittiopasImages.qrc b/zouba/data/ReittiopasImages.qrc
new file mode 100644 (file)
index 0000000..44fdfe8
--- /dev/null
+++ b/zouba/data/ReittiopasImages.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/reittiopas">
+        <file alias="bus">icons/reittiopas/pic_bus.png</file>
+        <file alias="ferry">icons/reittiopas/pic_ferry.png</file>
+        <file alias="metro">icons/reittiopas/pic_metro.png</file>
+        <file alias="train">icons/reittiopas/pic_train.png</file>
+        <file alias="tram">icons/reittiopas/pic_tram.png</file>
+        <file alias="walk">icons/reittiopas/pic_walk.png</file>
+    </qresource>
+</RCC>

diff --git a/zouba/data/icons/reittiopas/maemo-mapper-bus.png b/zouba/data/icons/reittiopas/maemo-mapper-bus.png
deleted file mode 100644 (file)
index bcfffb3..0000000
Binary files a/zouba/data/icons/reittiopas/maemo-mapper-bus.png and /dev/null differ

diff --git a/zouba/data/icons/reittiopas/maemo-mapper-ferry.png b/zouba/data/icons/reittiopas/maemo-mapper-ferry.png
deleted file mode 100644 (file)
index 1037242..0000000
Binary files a/zouba/data/icons/reittiopas/maemo-mapper-ferry.png and /dev/null differ

diff --git a/zouba/data/icons/reittiopas/maemo-mapper-metro.png b/zouba/data/icons/reittiopas/maemo-mapper-metro.png
deleted file mode 100644 (file)
index 89f27b8..0000000
Binary files a/zouba/data/icons/reittiopas/maemo-mapper-metro.png and /dev/null differ

diff --git a/zouba/data/icons/reittiopas/maemo-mapper-train.png b/zouba/data/icons/reittiopas/maemo-mapper-train.png
deleted file mode 100644 (file)
index c696721..0000000
Binary files a/zouba/data/icons/reittiopas/maemo-mapper-train.png and /dev/null differ

diff --git a/zouba/data/icons/reittiopas/maemo-mapper-tram.png b/zouba/data/icons/reittiopas/maemo-mapper-tram.png
deleted file mode 100644 (file)
index 082ed73..0000000
Binary files a/zouba/data/icons/reittiopas/maemo-mapper-tram.png and /dev/null differ

diff --git a/zouba/data/icons/reittiopas/maemo-mapper-walk.png b/zouba/data/icons/reittiopas/maemo-mapper-walk.png
deleted file mode 100644 (file)
index bd026e1..0000000
Binary files a/zouba/data/icons/reittiopas/maemo-mapper-walk.png and /dev/null differ

diff --git a/zouba/data/icons/reittiopas/pic_bus.png b/zouba/data/icons/reittiopas/pic_bus.png
new file mode 100644 (file)
index 0000000..626047c
Binary files /dev/null and b/zouba/data/icons/reittiopas/pic_bus.png differ

diff --git a/zouba/data/icons/reittiopas/pic_ferry.png b/zouba/data/icons/reittiopas/pic_ferry.png
new file mode 100644 (file)
index 0000000..4df8f06
Binary files /dev/null and b/zouba/data/icons/reittiopas/pic_ferry.png differ

diff --git a/zouba/data/icons/reittiopas/pic_metro.png b/zouba/data/icons/reittiopas/pic_metro.png
new file mode 100644 (file)
index 0000000..69d634e
Binary files /dev/null and b/zouba/data/icons/reittiopas/pic_metro.png differ

diff --git a/zouba/data/icons/reittiopas/pic_train.png b/zouba/data/icons/reittiopas/pic_train.png
new file mode 100644 (file)
index 0000000..9aea394
Binary files /dev/null and b/zouba/data/icons/reittiopas/pic_train.png differ

diff --git a/zouba/data/icons/reittiopas/pic_tram.png b/zouba/data/icons/reittiopas/pic_tram.png
new file mode 100644 (file)
index 0000000..bc8668f
Binary files /dev/null and b/zouba/data/icons/reittiopas/pic_tram.png differ

diff --git a/zouba/data/icons/reittiopas/pic_walk.png b/zouba/data/icons/reittiopas/pic_walk.png
new file mode 100644 (file)
index 0000000..68dcaac
Binary files /dev/null and b/zouba/data/icons/reittiopas/pic_walk.png differ

diff --git a/zouba/data/icons/reittiopas/svg/all.svg b/zouba/data/icons/reittiopas/svg/all.svg
deleted file mode 100644 (file)
index 75104f9..0000000
--- a/zouba/data/icons/reittiopas/svg/all.svg
+++ /dev/null
@@ -1,586 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="129.32375"
-   height="21.637915"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.46"
-   sodipodi:docname="maemo-mapper-reittiopas-icons.svg"
-   sodipodi:version="0.32"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2824"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2906"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2935"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3036"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3050"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3072"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3152"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3227"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3342"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4135"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="63.727377"
-     inkscape:cy="-20.537488"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1050"
-     inkscape:window-height="800"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="false"
-     showborder="false" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-235.07788,-517.92067)">
-    <g
-       id="g2886"
-       transform="translate(0.17849731,2.8162323)"
-       inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/128x128/maemo-mapper-bus.png"
-       inkscape:export-xdpi="577.42999"
-       inkscape:export-ydpi="577.42999">
-      <g
-         inkscape:export-ydpi="289.17194"
-         inkscape:export-xdpi="289.17194"
-         inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/64x64/maemo-mapper-bus.png"
-         id="g2875">
-        <rect
-           style="fill:#193695;fill-opacity:1;stroke:none"
-           id="rect2830"
-           width="19.950514"
-           height="19.918922"
-           x="344.27261"
-           y="516.82343"
-           ry="1.9571706" />
-        <g
-           id="g2861">
-          <rect
-             ry="1.022532"
-             y="519.99615"
-             x="348.30356"
-             height="12.991072"
-             width="12.008929"
-             id="rect2834"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#193695;fill-opacity:1;stroke:none"
-             id="rect2836"
-             width="9.9107151"
-             height="7.0535717"
-             x="349.35266"
-             y="521.29083"
-             ry="0.55518919" />
-          <path
-             transform="matrix(0.82857143,0,0,0.82857143,59.934301,90.790155)"
-             d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-             sodipodi:ry="0.78125"
-             sodipodi:rx="0.78125"
-             sodipodi:cy="530.91132"
-             sodipodi:cx="351.0491"
-             id="path2838"
-             style="fill:#193695;fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#193695;fill-opacity:1;stroke:none"
-             id="path2840"
-             sodipodi:cx="351.0491"
-             sodipodi:cy="530.91132"
-             sodipodi:rx="0.78125"
-             sodipodi:ry="0.78125"
-             d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-             transform="matrix(0.82857143,0,0,0.82857143,66.94323,90.790155)" />
-        </g>
-        <g
-           id="g2871"
-           transform="translate(-0.02231234,0)">
-          <rect
-             ry="0.55518919"
-             y="532.18359"
-             x="349.46426"
-             height="2.7232144"
-             width="1.9196428"
-             id="rect2867"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect2869"
-             width="1.9196428"
-             height="2.7232144"
-             x="357.27676"
-             y="532.18359"
-             ry="0.55518919" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g3013"
-       transform="translate(-0.22271729,0.45124205)"
-       inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/16x16/maemo-mapper-ferry.png"
-       inkscape:export-xdpi="72.292984"
-       inkscape:export-ydpi="72.292984">
-      <rect
-         ry="1.9571706"
-         y="519.18842"
-         x="321.0069"
-         height="19.918922"
-         width="19.950514"
-         id="rect2830-8"
-         style="fill:#00aee7;fill-opacity:1;stroke:none" />
-      <g
-         transform="matrix(1,0,0,1.0495379,0.09152746,-26.219436)"
-         id="g3000">
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m 323.46875,531.584 1,2.68488 c 0,0.57804 0.79864,1.05356 1.8125,1.05356 l 9.21875,0 c 1.01386,0 1.8125,-0.47552 1.8125,-1.05356 l 1,-2.68488 c -0.79721,-1.03549 -2.04097,-0.98088 -3.38143,-1.2167 -1.34047,-0.23581 -2.77764,-0.76207 -3.96169,-0.76207 -1.28107,0.0837 -2.69996,0.6115 -4.02671,0.8272 -1.32675,0.21569 -2.56137,0.11922 -3.47392,1.15157 z"
-           id="rect2963"
-           sodipodi:nodetypes="cccccczczc" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m 325.78125,524.6169 0,4.98621 c 0,0 1.69271,0 2.53906,0 0.84636,0 2.53906,-0.36414 2.53906,-0.36414 l 2.53907,0.36414 2.53906,0 0,-4.98621 -10.15625,0 z"
-           id="rect2967"
-           sodipodi:nodetypes="ccsccccc" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect2969"
-           width="2.4622469"
-           height="3.6390722"
-           x="329.62543"
-           y="521.94464"
-           ry="0.58786494" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect2971"
-           width="15.783633"
-           height="0.75527918"
-           x="322.99881"
-           y="535.60834"
-           ry="0.37763959" />
-        <g
-           id="g2992"
-           transform="matrix(1,0,0,1.0875465,0.03067094,-46.956752)">
-          <g
-             id="g2982">
-            <rect
-               style="fill:#00aee7;fill-opacity:1;stroke:none"
-               id="rect2974"
-               width="1.2946428"
-               height="1.25"
-               x="326.60712"
-               y="527.80859"
-               ry="0.26785016" />
-            <rect
-               ry="0.26785016"
-               y="527.80859"
-               x="328.4375"
-               height="1.25"
-               width="1.2946428"
-               id="rect2976"
-               style="fill:#00aee7;fill-opacity:1;stroke:none" />
-          </g>
-          <g
-             transform="translate(5.3125,0)"
-             id="g2986">
-            <rect
-               ry="0.26785016"
-               y="527.80859"
-               x="326.60712"
-               height="1.25"
-               width="1.2946428"
-               id="rect2988"
-               style="fill:#00aee7;fill-opacity:1;stroke:none" />
-            <rect
-               style="fill:#00aee7;fill-opacity:1;stroke:none"
-               id="rect2990"
-               width="1.2946428"
-               height="1.25"
-               x="328.4375"
-               y="527.80859"
-               ry="0.26785016" />
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       id="g3132"
-       inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/16x16/maemo-mapper-metro.png"
-       inkscape:export-xdpi="72.18"
-       inkscape:export-ydpi="72.18"
-       transform="translate(-4.5146484,0.36194761)">
-      <rect
-         style="fill:#fb6500;fill-opacity:1;stroke:none"
-         id="rect2830-8-3"
-         width="19.950514"
-         height="19.918922"
-         x="301.6319"
-         y="519.27771"
-         ry="1.9571706" />
-      <g
-         transform="translate(0,-0.9709661)"
-         id="g3122">
-        <g
-           id="g3112"
-           transform="matrix(1,0,0,0.91065292,-0.44642857,47.285796)">
-          <g
-             transform="translate(3.9285734,-2.4107084)"
-             id="g3102">
-            <rect
-               ry="1.022532"
-               y="525.15234"
-               x="302.12054"
-               height="12.991072"
-               width="12.008929"
-               id="rect2834-4"
-               style="fill:#ffffff;fill-opacity:1;stroke:none" />
-            <rect
-               style="fill:#fb6500;fill-opacity:1;stroke:none"
-               id="rect2836-7"
-               width="9.9107151"
-               height="7.0535717"
-               x="303.16965"
-               y="526.44702"
-               ry="0.55518919" />
-            <g
-               transform="translate(0.08929196,0)"
-               id="g3108">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#fb6500;fill-opacity:1;stroke:none"
-                 id="path2838-7"
-                 sodipodi:cx="351.0491"
-                 sodipodi:cy="530.91132"
-                 sodipodi:rx="0.78125"
-                 sodipodi:ry="0.78125"
-                 d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-                 transform="matrix(0.82857144,0,0,0.82857144,13.215563,96.660648)" />
-              <path
-                 transform="matrix(0.82857144,0,0,0.82857144,21.11735,96.660648)"
-                 d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-                 sodipodi:ry="0.78125"
-                 sodipodi:rx="0.78125"
-                 sodipodi:cy="530.91132"
-                 sodipodi:cx="351.0491"
-                 id="path2840-3"
-                 style="fill:#fb6500;fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect3120"
-           width="5"
-           height="1.4285715"
-           x="309.10715"
-           y="535.66571"
-           ry="0.28573519" />
-      </g>
-    </g>
-    <g
-       id="g3194"
-       transform="translate(0.1237101,0)">
-      <g
-         id="g3191" />
-    </g>
-    <g
-       id="g3205"
-       inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/128x128/maemo-mapper-train.png"
-       inkscape:export-xdpi="577.42999"
-       inkscape:export-ydpi="577.42999"
-       transform="translate(-4.0641876,0.36194761)">
-      <g
-         transform="translate(-24.117392,0)"
-         id="g3158"
-         inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/16x16/maemo-mapper-metro.png"
-         inkscape:export-xdpi="72.18"
-         inkscape:export-ydpi="72.18">
-        <rect
-           style="fill:#ce1141;fill-opacity:1;stroke:none"
-           id="rect3160"
-           width="19.950514"
-           height="19.918922"
-           x="301.6319"
-           y="519.27771"
-           ry="1.9571706" />
-        <g
-           transform="translate(0,-0.9709661)"
-           id="g3162">
-          <g
-             id="g3164"
-             transform="matrix(1,0,0,0.91065292,-0.44642857,47.285796)">
-            <g
-               transform="translate(3.9285734,-2.4107084)"
-               id="g3166">
-              <path
-                 id="rect3168"
-                 d="m 303.13525,524.40901 c -0.56648,0 -1,0.48549 -1,1.0795 l 0,11.47873 c 0,0.59401 0.43352,1.07951 1,1.07951 l 1.25,0 0,0.57573 -1.09375,0 c -0.1583,0 -0.28125,0.14157 -0.28125,0.32385 l 0,1.00754 c 0,0.18228 0.12295,0.32385 0.28125,0.32385 l 9.65625,0 c 0.1583,0 0.28125,-0.14157 0.28125,-0.32385 l 0,-1.00754 c 0,-0.18228 -0.12295,-0.32385 -0.28125,-0.32385 l -1.0625,0 0,-0.57573 1.21875,0 c 0.56648,0 1.03125,-0.4855 1.03125,-1.07951 l 0,-11.47873 c 0,-0.59401 -0.46477,-1.0795 -1.03125,-1.0795 l -9.96875,0 z m 2.625,13.63774 4.71875,0 0,0.57573 -4.71875,0 0,-0.57573 z"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
-              <rect
-                 style="fill:#ce1141;fill-opacity:1;stroke:none"
-                 id="rect3170"
-                 width="9.9107151"
-                 height="6.3672514"
-                 x="303.16965"
-                 y="527.1333"
-                 ry="0.50116861" />
-              <g
-                 transform="translate(0.08929196,0)"
-                 id="g3172">
-                <g
-                   transform="translate(-0.0453027,0)"
-                   id="g3180">
-                  <path
-                     transform="matrix(1.0087656,0,0,1.0087656,-50.052442,0.9935338)"
-                     d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-                     sodipodi:ry="0.78125"
-                     sodipodi:rx="0.78125"
-                     sodipodi:cy="530.91132"
-                     sodipodi:cx="351.0491"
-                     id="path3174"
-                     style="fill:#ce1141;fill-opacity:1;stroke:none"
-                     sodipodi:type="arc" />
-                  <path
-                     sodipodi:type="arc"
-                     style="fill:#ce1141;fill-opacity:1;stroke:none"
-                     id="path3176"
-                     sodipodi:cx="351.0491"
-                     sodipodi:cy="530.91132"
-                     sodipodi:rx="0.78125"
-                     sodipodi:ry="0.78125"
-                     d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-                     transform="matrix(1.0087656,0,0,1.0087656,-42.038036,0.9935338)" />
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <rect
-         ry="0.50116861"
-         y="522.22827"
-         x="285.83798"
-         height="1.2053572"
-         width="3.3035715"
-         id="rect3203"
-         style="fill:#ce1141;fill-opacity:1;stroke:none" />
-    </g>
-    <g
-       id="g3319"
-       inkscape:export-filename="/home/salva/Desktop/maemo-mapper-reittiopas-icons/16x16/maemo-mapper-tram.png"
-       inkscape:export-xdpi="72.18"
-       inkscape:export-ydpi="72.18"
-       transform="translate(-4.2450714,0.36194761)">
-      <rect
-         style="fill:#00ab67;fill-opacity:1;stroke:none"
-         id="rect3237"
-         width="19.950514"
-         height="19.918922"
-         x="254.02846"
-         y="519.27771"
-         ry="1.9571706" />
-      <g
-         transform="translate(0.04464286,-0.1382311)"
-         id="g3306">
-        <g
-           id="g3293"
-           transform="translate(0.29258313,23.758674)">
-          <g
-             transform="matrix(0.84216366,0,0,0.96504877,1.2023017,-4.800965)"
-             id="g3239">
-            <g
-               id="g3241"
-               transform="matrix(1,0,0,0.91065292,-0.44642857,47.285796)">
-              <g
-                 transform="translate(3.9285734,-2.4107084)"
-                 id="g3243">
-                <path
-                   sodipodi:nodetypes="cccccccccccccccccccccccccc"
-                   id="path3245"
-                   d="m 303.13525,524.40901 c -0.56648,0 -1,0.48549 -1,1.0795 l 0,11.47873 c 0,0.59401 0.43352,1.07951 1,1.07951 l 1.25,0 0,1.15991 -1.75637,0 c -0.1583,0 -0.28125,0.14157 -0.28125,0.32385 l 0,0.42336 c 0,0.18228 0.12295,0.32385 0.28125,0.32385 l 11.29955,0 c 0.1583,0 0.28125,-0.14157 0.28125,-0.32385 l 0,-0.42336 c 0,-0.18228 -0.12295,-0.32385 -0.28125,-0.32385 l -2.04318,0 0,-1.15991 1.21875,0 c 0.56648,0 1.03125,-0.4855 1.03125,-1.07951 l 0,-11.47873 c 0,-0.59401 -0.46477,-1.0795 -1.03125,-1.0795 l -9.96875,0 z m 2.625,13.63774 4.71875,0 0,1.15991 -4.71875,0 0,-1.15991 z"
-                   style="fill:#ffffff;fill-opacity:1;stroke:none" />
-                <rect
-                   style="fill:#00ac67;fill-opacity:1;stroke:none"
-                   id="rect3247"
-                   width="9.2215891"
-                   height="7.8404045"
-                   x="303.56168"
-                   y="525.86334"
-                   ry="0.61712098" />
-                <g
-                   transform="translate(0.08929196,0)"
-                   id="g3249">
-                  <g
-                     transform="translate(-0.0453027,0)"
-                     id="g3251">
-                    <path
-                       transform="matrix(1.0087656,0,0,1.0087656,-50.052442,0.9935338)"
-                       d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-                       sodipodi:ry="0.78125"
-                       sodipodi:rx="0.78125"
-                       sodipodi:cy="530.91132"
-                       sodipodi:cx="351.0491"
-                       id="path3253"
-                       style="fill:#00ab67;fill-opacity:1;stroke:none"
-                       sodipodi:type="arc" />
-                    <path
-                       sodipodi:type="arc"
-                       style="fill:#00ab67;fill-opacity:1;stroke:none"
-                       id="path3255"
-                       sodipodi:cx="351.0491"
-                       sodipodi:cy="530.91132"
-                       sodipodi:rx="0.78125"
-                       sodipodi:ry="0.78125"
-                       d="m 351.83035,530.91132 c 0,0.43147 -0.34977,0.78125 -0.78125,0.78125 -0.43147,0 -0.78125,-0.34978 -0.78125,-0.78125 0,-0.43148 0.34978,-0.78125 0.78125,-0.78125 0.43148,0 0.78125,0.34977 0.78125,0.78125 z"
-                       transform="matrix(1.0087656,0,0,1.0087656,-42.038036,0.9935338)" />
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect3304"
-           width="3.7053573"
-           height="1.1607143"
-           x="262.10638"
-           y="521.4693"
-           ry="0.40181187" />
-      </g>
-    </g>
-    <g
-       id="g3497"
-       transform="translate(11.111678,22.728432)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:none"
-         id="rect2498"
-         width="19.950514"
-         height="19.918922"
-         x="215.25363"
-         y="496.51663"
-         ry="1.9571706" />
-      <g
-         transform="matrix(7.9656517e-2,0,0,8.8314679e-2,215.34234,496.56756)"
-         id="g3486">
-        <g
-           id="g8150"
-           transform="matrix(25.900445,0,0,-25.900445,134.32984,53.145434)">
-          <path
-             d="M 0,0 C 0.326,-0.025 0.611,0.219 0.637,0.543 C 0.663,0.869 0.42,1.154 0.094,1.18 C -0.232,1.205 -0.518,0.963 -0.543,0.637 C -0.568,0.311 -0.325,0.025 0,0"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path8152" />
-        </g>
-        <g
-           id="g8154"
-           transform="matrix(25.900445,0,0,-25.900445,121.35393,59.4179)">
-          <path
-             d="M 0,0 C 0.116,0.08 0.26,0.135 0.415,0.123 C 0.618,0.105 0.786,-0.02 0.886,-0.174 L 1.484,-1.357 L 2.298,-1.918 C 2.368,-1.971 2.41,-2.059 2.403,-2.152 C 2.392,-2.299 2.263,-2.408 2.115,-2.396 C 2.071,-2.395 2.036,-2.377 1.993,-2.357 L 1.104,-1.746 C 1.077,-1.723 1.056,-1.697 1.038,-1.666 L 0.813,-1.223 L 0.547,-2.404 L 1.597,-3.645 C 1.62,-3.684 1.636,-3.727 1.646,-3.771 L 1.929,-5.27 C 1.928,-5.303 1.933,-5.324 1.931,-5.352 C 1.913,-5.572 1.72,-5.736 1.499,-5.719 C 1.317,-5.705 1.181,-5.568 1.138,-5.402 L 0.87,-3.998 L 0.019,-3.064 L -0.181,-3.975 C -0.187,-4.018 -0.243,-4.107 -0.261,-4.145 L -1.078,-5.523 C -1.161,-5.65 -1.297,-5.73 -1.454,-5.719 C -1.675,-5.701 -1.84,-5.508 -1.822,-5.287 C -1.817,-5.225 -1.791,-5.16 -1.769,-5.115 L -1.007,-3.838 L -0.374,-1.025 L -0.788,-1.361 L -1.007,-2.363 C -1.036,-2.49 -1.153,-2.596 -1.292,-2.584 C -1.438,-2.572 -1.549,-2.445 -1.538,-2.297 L -1.532,-2.262 L -1.271,-1.094 C -1.257,-1.041 -1.228,-0.998 -1.188,-0.965 L 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path8156" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>

diff --git a/zouba/debian/README b/zouba/debian/README
index 86f57e5..f2c42e5 100644 (file)
--- a/zouba/debian/README
+++ b/zouba/debian/README
@@ -3,4 +3,4 @@ The Debian Package zouba
 
 Comments regarding the Package
 
- -- Max Waterman <davidmaxwaterman@jeeves>  Tue, 23 Mar 2010 20:11:34 +0200
+ -- Niko Böckerman <niko.bockerman@gmail.com>  Sat, 18 Sep 2010 23:03:59 +0300

diff --git a/zouba/debian/README.Debian b/zouba/debian/README.Debian
index ce6b0b0..9f63d3b 100644 (file)
--- a/zouba/debian/README.Debian
+++ b/zouba/debian/README.Debian
@@ -3,4 +3,4 @@ zouba for Debian
 
 <possible notes regarding this package - if none, delete this file>
 
- -- Max Waterman <davidmaxwaterman@jeeves>  Tue, 23 Mar 2010 20:11:34 +0200
+ -- Niko Böckerman <niko.bockerman@gmail.com>  Sat, 18 Sep 2010 23:03:59 +0300

diff --git a/zouba/debian/changelog b/zouba/debian/changelog
index a37b5e8..2d61549 100644 (file)
--- a/zouba/debian/changelog
+++ b/zouba/debian/changelog
@@ -1,3 +1,16 @@
+zouba (0.10.0-1) unstable; urgency=low
+
+  * Fixed icon in debian/control.
+
+ -- Niko Böckerman <niko.bockerman@gmail.com>  Sat, 18 Sep 2010 23:03:59 +0300
+
+zouba (0.10.0) unstable; urgency=low
+
+  * Ui completely redone.
+  * Saving locations is possible.
+
+ -- Niko Böckerman <niko.bockerman@gmail.com>  Sat, 18 Sep 2010 23:03:59 +0300
+
 zouba (0.9) unstable; urgency=low
 
   * added notification for address resolution failure and no route

diff --git a/zouba/debian/control b/zouba/debian/control
index bb9a57f..c8b5a2c 100644 (file)
--- a/zouba/debian/control
+++ b/zouba/debian/control
@@ -1,13 +1,13 @@
 Source: zouba
 Section: user/navigation
 Priority: extra
-Maintainer: Max Waterman <davidmaxwaterman@fastmail.co.uk>
-Build-Depends: libqt4-dev, libqtm-bearer, libqtm-location, debhelper (>= 5)
+Maintainer: Niko Böckerman <niko.bockerman@gmail.com>
+Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-bearer, libqtm-location, libqtm-dev
 Standards-Version: 3.7.3
 Homepage: 
 
 Package: zouba
-Architecture: armel
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Tells you which bus is next (in Helsinki area).
  Allows you to easily find how to get the bus home. Uses HSL Journey Planner API <http://developer.reittiopas.fi/pages/en/home.php>. Uses GPS for current location. Uses Qt and QtMobility.
@@ -18,95 +18,75 @@ Description: Tells you which bus is next (in Helsinki area).
 # For example following XB-Maemo-Icon-26 field content is an output
 # from command: $ mad base64 zouba/src/data/48x48/zouba.png
 XB-Maemo-Icon-26:
- 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
- fkKRvhUB4/uOiEv3HtsjPrZPkUXfEELotVpN7Nu3L15YWIiVUkkcxzKOY2s4
- HFZ7vV7VdV3R7XZ/sLa2JjqdTiWzY0HaRR8DXiQdDd7NrS8qg1VXAB8vuS3d
- NCGE0DQt1nU9klImhmHIYrFodTqd2c3NzaVer2f2er3W+vr6oNVqTYRhaJG2
- /W9l0PXLvv9dLZUBk8EH214bR30sYpxicZIkcS6XE6Zpmo7jzLRarR39fr/q
- OM7m+vp6q9Fo5IIgKAOvkzaik0CTd5Eqb7YE6RVictlzVwQndalSLperzs/P
- LxYKhR2WZU1qmuZubGx0VldXdd/3K6T+/TzpxNj4eYBvhy1fBj3uAdvBEy4V
- 8JyUck+hUJizbds3DGOt2Wzqg8FgfM/4EvAs6W3HzyxV3mz9H8WDYRQx8Afu
- AAAAGXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBHSU1QV4EOFwAAACV0RVh0
- Y3JlYXRlLWRhdGUAMjAxMC0wMy0yNFQwNToyODo0MyswMjowMPMmiCkAAAAl
- dEVYdG1vZGlmeS1kYXRlADIwMTAtMDMtMjRUMDU6Mjg6NDMrMDI6MDCsl/4d
- AAAAAElFTkSuQmCC
- ====
+ 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
+ l/4dAAAAAElFTkSuQmCC

diff --git a/zouba/debian/copyright b/zouba/debian/copyright
index 5765b41..f0fe087 100644 (file)
--- a/zouba/debian/copyright
+++ b/zouba/debian/copyright
@@ -1,5 +1,5 @@
-This package was debianized by Max Waterman <davidmaxwaterman@jeeves> on
-Tue, 23 Mar 2010 20:11:34 +0200.
+This package was debianized by Niko Böckerman <niko.bockerman@gmail.com> on
+Sat, 29 Jan 2011 16:37:59 +0300.
 
 It was downloaded from <url://example.com>
 
@@ -15,25 +15,26 @@ Copyright:
 
 License:
 
-    This package is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this package; if not, write to the Free Software
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2011, Niko Böckerman <niko.bockerman@gmail.com> and
+is licensed under the GPL, see above.
 
-The Debian packaging is (C) 2010, Max Waterman <davidmaxwaterman@jeeves> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 
 # Please also look if there are files or directories which have a
 # different copyright/license attached and list them here.

diff --git a/zouba/debian/files b/zouba/debian/files
deleted file mode 100644 (file)
index a44eb77..0000000
--- a/zouba/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-zouba_0.9_armel.deb user/navigation extra

diff --git a/zouba/debian/manpage.1.ex b/zouba/debian/manpage.1.ex
index bca658d..f5895ad 100644 (file)
--- a/zouba/debian/manpage.1.ex
+++ b/zouba/debian/manpage.1.ex
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH ZOUBA SECTION "March 23, 2010"
+.TH ZOUBA SECTION "September 18, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -55,5 +55,5 @@ available via the Info system.
 .SH AUTHOR
 zouba was written by <upstream author>.
 .PP
-This manual page was written by Max Waterman <davidmaxwaterman@jeeves>,
+This manual page was written by Niko Böckerman <niko.bockerman@gmail.com>,
 for the Debian project (but may be used by others).

diff --git a/zouba/debian/manpage.sgml.ex b/zouba/debian/manpage.sgml.ex
index bd2e519..d9236ac 100644 (file)
--- a/zouba/debian/manpage.sgml.ex
+++ b/zouba/debian/manpage.sgml.ex
@@ -20,12 +20,12 @@ manpage.1: manpage.sgml
   <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
   <!ENTITY dhsurname   "<surname>SURNAME</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>March 23, 2010</date>">
+  <!ENTITY dhdate      "<date>September 18, 2010</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>davidmaxwaterman@jeeves</email>">
-  <!ENTITY dhusername  "Max Waterman">
+  <!ENTITY dhemail     "<email>niko.bockerman@gmail.com</email>">
+  <!ENTITY dhusername  "Niko Böckerman">
   <!ENTITY dhucpackage "<refentrytitle>ZOUBA</refentrytitle>">
   <!ENTITY dhpackage   "zouba">
 

diff --git a/zouba/debian/manpage.xml.ex b/zouba/debian/manpage.xml.ex
index a9973bf..828baaa 100644 (file)
--- a/zouba/debian/manpage.xml.ex
+++ b/zouba/debian/manpage.xml.ex
@@ -48,8 +48,8 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
   <!ENTITY dhfirstname "FIRSTNAME">
   <!ENTITY dhsurname   "SURNAME">
   <!-- dhusername could also be set to "&firstname; &surname;". -->  
-  <!ENTITY dhusername  "Max Waterman">
-  <!ENTITY dhemail     "davidmaxwaterman@jeeves">
+  <!ENTITY dhusername  "Niko Böckerman">
+  <!ENTITY dhemail     "niko.bockerman@gmail.com">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1) and
        http://www.tldp.org/HOWTO/Man-Page/q2.html. -->

diff --git a/zouba/debian/optify b/zouba/debian/optify
new file mode 100644 (file)
index 0000000..865faf1
--- /dev/null
+++ b/zouba/debian/optify
@@ -0,0 +1 @@
+auto

diff --git a/zouba/debian/rules b/zouba/debian/rules
index f8b4404..f90a2da 100755 (executable)
--- a/zouba/debian/rules
+++ b/zouba/debian/rules
@@ -9,37 +9,31 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+APPNAME := zouba
+builddir:
+       mkdir -p builddir
 
-
-
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       # Add here commands to configure the package.
-
-       qmake
-       touch configure-stamp
+builddir/Makefile: builddir
+       cd builddir && qmake-qt4 PREFIX=/usr ../$(APPNAME).pro
 
 
 build: build-stamp
 
-build-stamp: configure-stamp  
+build-stamp: builddir/Makefile
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/zouba.sgml > zouba.1
+       cd builddir && $(MAKE)
 
        touch $@
 
 clean: 
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
+       rm -f build-stamp
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) clean
+       rm -rf builddir
 
        dh_clean 
 
@@ -50,7 +44,7 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/zouba.
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/zouba install
+       cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
 
 
 # Build architecture-independent files here.
@@ -61,12 +55,12 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs 
+#      dh_installchangelogs 
        dh_installdocs
        dh_installexamples
 #      dh_install
 #      dh_installmenu
-#      dh_installdebconf       
+#      dh_installdebconf
 #      dh_installlogrotate
 #      dh_installemacsen
 #      dh_installpam
@@ -77,7 +71,7 @@ binary-arch: build install
 #      dh_installinfo
        dh_installman
        dh_link
-       dh_strip
+#      dh_strip
        dh_compress
        dh_fixperms
 #      dh_perl

diff --git a/zouba/debian/zouba.debhelper.log b/zouba/debian/zouba.debhelper.log
deleted file mode 100644 (file)
index 44e74eb..0000000
--- a/zouba/debian/zouba.debhelper.log
+++ /dev/null
@@ -1,432 +0,0 @@
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installdirs
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installdirs
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb

diff --git a/zouba/debian/zouba.tarlist b/zouba/debian/zouba.tarlist
deleted file mode 100644 (file)
index a1dcb65..0000000
--- a/zouba/debian/zouba.tarlist
+++ /dev/null
@@ -1,18 +0,0 @@
-755 root root . usr  /
-755 root root . usr/share  /
-755 root root . usr/share/doc  /
-755 root root . usr/share/doc/zouba  /
-644 root root . usr/share/doc/zouba/changelog.gz debian/zouba/usr/share/doc/zouba/changelog.gz
-644 root root . usr/share/doc/zouba/README.Debian debian/zouba/usr/share/doc/zouba/README.Debian
-644 root root . usr/share/doc/zouba/copyright debian/zouba/usr/share/doc/zouba/copyright
-755 root root . usr/share/applications  /
-755 root root . usr/share/applications/hildon  /
-644 root root . usr/share/applications/hildon/zouba.desktop debian/zouba/usr/share/applications/hildon/zouba.desktop
-755 root root . usr/share/icons  /
-755 root root . usr/share/icons/hicolor  /
-755 root root . usr/share/icons/hicolor/64x64  /
-755 root root . usr/share/icons/hicolor/64x64/apps  /
-644 root root . usr/share/icons/hicolor/64x64/apps/zouba.png debian/zouba/usr/share/icons/hicolor/64x64/apps/zouba.png
-755 root root . usr/bin  /
-755 root root . usr/bin/zouba  debian/zouba/usr/bin/zouba
-755 root root . usr/sbin  /

diff --git a/zouba/src/gui/routelegwidget.cpp b/zouba/src/gui/routelegwidget.cpp
index 52ac8df..cf7e11e 100644 (file)
--- a/zouba/src/gui/routelegwidget.cpp
+++ b/zouba/src/gui/routelegwidget.cpp
@@ -18,7 +18,7 @@ void RouteLegWidget::setDisplay(RouteLeg *leg)
 #ifdef Q_WS_MAEMO_5
     int picSize = 40;
 #else
-    int picSize = 20;
+    int picSize = 40;
 #endif
     if (leg->type == WALK)
     {

diff --git a/zouba/zouba.pro b/zouba/zouba.pro
index be52030..7806a45 100644 (file)
--- a/zouba/zouba.pro
+++ b/zouba/zouba.pro
@@ -68,7 +68,7 @@ CONFIG      += debug qt
 #MOBILITY    += location bearer
 QT=core gui network
 
-linux-g++-maemo5 {
+unix {
 SOURCES += \
     src/gui/favoriteselectiondialog.cpp \
     src/logic/gpslocation.cpp
@@ -85,19 +85,23 @@ CONFIG += mobility
 }
 
 INSTALLS    += target
-target.path  = /usr/bin/
+target.path  = /usr/bin
 
 INSTALLS    += desktop
 desktop.path  = /usr/share/applications/hildon
-desktop.files  = data/zouba.desktop
+desktop.files += data/zouba.desktop
 
-INSTALLS    += service
-service.path  = /usr/share/dbus-1/services
-service.files  = data/zouba.service
+#INSTALLS    += service
+#service.path  = /usr/share/dbus-1/services
+#service.files  = data/zouba.service
+
+INSTALLS    += icon48
+icon48.path = /usr/share/icons/hicolor/48x48/apps
+icon48.files += data/icons/48x48/zouba.png
 
 INSTALLS    += icon64
 icon64.path  = /usr/share/icons/hicolor/64x64/apps
-icon64.files  = data/64x64/zouba.png
+icon64.files += data/icons/64x64/zouba.png
 
 #
 # Targets for debian source and binary package creation
@@ -117,4 +121,4 @@ OTHER_FILES += \
     data/TODO.txt
 
 RESOURCES += \
-    ReittiopasImages.qrc
+    data/ReittiopasImages.qrc