Merge lp:~nik90/osmtouch/add-debian-packaging into lp:osmtouch

Proposed by Nekhelesh Ramananthan
Status: Merged
Merged at revision: 69
Proposed branch: lp:~nik90/osmtouch/add-debian-packaging
Merge into: lp:osmtouch
Diff against target: 137 lines (+74/-6)
9 files modified
Makefile (+0/-3)
OSMTouch.desktop (+4/-3)
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+22/-0)
debian/copyright (+28/-0)
debian/install (+6/-0)
debian/rules (+7/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~nik90/osmtouch/add-debian-packaging
Reviewer Review Type Date Requested Status
ybon Pending
Review via email: mp+212899@code.launchpad.net

Commit message

Added debian packaging so that we can include OSMTouch in a PPA for desktop users.

I moved OSMTouch64.png icon from the icon directory to the root folder since this is the format followed by other ubuntu touch apps. Also in the .desktop file, the icon location should not have any path specified there.

This MP should not affect the click package creation in any way. It adds debian packaging which will coexist with the click package.

I tested the .deb package creation and installed it on my 14.04 laptop. The debian packaging works as expected.

Description of the change

Added debian packaging so that we can include OSMTouch in a PPA for desktop users.

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Note: The Makefile has been modified to remove the qmltestrunner since I found no unit tests and hence it fails while running the makefile during debian packaging.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-01-23 21:15:30 +0000
3+++ Makefile 2014-03-26 17:04:25 +0000
4@@ -14,8 +14,5 @@
5 chmod +x tests/autopilot/run
6 tests/autopilot/run
7
8-check:
9- qmltestrunner -input tests/unit
10-
11 run:
12 /usr/bin/qmlscene $@ OSMTouch.qml
13
14=== modified file 'OSMTouch.desktop'
15--- OSMTouch.desktop 2014-01-23 21:15:30 +0000
16+++ OSMTouch.desktop 2014-03-26 17:04:25 +0000
17@@ -1,8 +1,9 @@
18 [Desktop Entry]
19 Name=OSMTouch
20-Comment=Very simple OpenStreetMap based map app
21-Exec=qmlscene $@ OSMTouch.qml
22-Icon=icons/OSMTouch64.png
23+Comment=A very simple OpenStreetMap based map app.
24+Exec=qmlscene $@ /usr/share/osmtouch/OSMTouch.qml
25+Icon=OSMTouch64.png
26 Terminal=false
27 Type=Application
28+Keywords=Maps,Navigation,OpenStreetMap,Location;
29 X-Ubuntu-Touch=true
30
31=== renamed file 'icons/OSMTouch64.png' => 'OSMTouch64.png'
32=== added directory 'debian'
33=== added file 'debian/changelog'
34--- debian/changelog 1970-01-01 00:00:00 +0000
35+++ debian/changelog 2014-03-26 17:04:25 +0000
36@@ -0,0 +1,5 @@
37+osmtouch (0.1.2) trusty; urgency=medium
38+
39+ * Initial desktop release
40+
41+ -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Sat, 22 Mar 2014 16:37:57 +0100
42
43=== added file 'debian/compat'
44--- debian/compat 1970-01-01 00:00:00 +0000
45+++ debian/compat 2014-03-26 17:04:25 +0000
46@@ -0,0 +1,1 @@
47+9
48
49=== added file 'debian/control'
50--- debian/control 1970-01-01 00:00:00 +0000
51+++ debian/control 2014-03-26 17:04:25 +0000
52@@ -0,0 +1,22 @@
53+Source: osmtouch
54+Section: utils
55+Priority: extra
56+Maintainer: Yohan Boniface <yohanboniface@free.fr>
57+Build-Depends: debhelper (>= 9.0.0)
58+Standards-Version: 3.9.5
59+Homepage: https://launchpad.net/osmtouch
60+Vcs-Bzr: https://code.launchpad.net/~yohanboniface/osmtouch/trunk
61+
62+Package: osmtouch
63+Architecture: all
64+Depends: ${misc:Depends},
65+ qtdeclarative5-hud1.0,
66+ qtdeclarative5-qtquick2-plugin,
67+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
68+ qtdeclarative5-qtlocation-plugin,
69+ qtdeclarative5-qtpositioning-plugin,
70+ qmlscene
71+Description: OSM application
72+ OpenStreetMap is a map of the world, created by people like you and
73+ free to use under an open license. This application brings
74+ OpenStreetMap to your Ubuntu desktop.
75
76=== added file 'debian/copyright'
77--- debian/copyright 1970-01-01 00:00:00 +0000
78+++ debian/copyright 2014-03-26 17:04:25 +0000
79@@ -0,0 +1,28 @@
80+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
81+Upstream-Name: osmtouch
82+Source: https://launchpad.net/osmtouch
83+
84+Files: *
85+Copyright: 2014 Yohan Boniface <yohanboniface@free.fr>
86+License: WTFPL
87+
88+Files: debian/*
89+Copyright: 2014 Nekhelesh Ramananthan <nik90@ubuntu.com>
90+License: GPL-3.0
91+
92+License: GPL-3.0
93+ This program is free software: you can redistribute it and/or modify
94+ it under the terms of the GNU General Public License as published by
95+ the Free Software Foundation, either version 3 of the License, or
96+ (at your option) any later version.
97+ .
98+ This package is distributed in the hope that it will be useful,
99+ but WITHOUT ANY WARRANTY; without even the implied warranty of
100+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
101+ GNU General Public License for more details.
102+ .
103+ You should have received a copy of the GNU General Public License
104+ along with this program. If not, see <http://www.gnu.org/licenses/>.
105+ .
106+ On Debian systems, the complete text of the GNU General
107+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
108
109=== added file 'debian/install'
110--- debian/install 1970-01-01 00:00:00 +0000
111+++ debian/install 2014-03-26 17:04:25 +0000
112@@ -0,0 +1,6 @@
113+OSMTouch.desktop usr/share/applications/
114+OSMTouch.qml usr/share/osmtouch/
115+OSMTouch64.png usr/share/icons/hicolor/192x192/apps/
116+components usr/share/osmtouch/
117+models usr/share/osmtouch/
118+icons usr/share/osmtouch/
119
120=== added file 'debian/rules'
121--- debian/rules 1970-01-01 00:00:00 +0000
122+++ debian/rules 2014-03-26 17:04:25 +0000
123@@ -0,0 +1,7 @@
124+#!/usr/bin/make -f
125+# -*- makefile -*-
126+# Uncomment this to turn on verbose mode.
127+#export DH_VERBOSE=1
128+
129+%:
130+ dh $@
131
132=== added directory 'debian/source'
133=== added file 'debian/source/format'
134--- debian/source/format 1970-01-01 00:00:00 +0000
135+++ debian/source/format 2014-03-26 17:04:25 +0000
136@@ -0,0 +1,1 @@
137+3.0 (native)

Subscribers

People subscribed via source and target branches