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
=== modified file 'Makefile'
--- Makefile 2014-01-23 21:15:30 +0000
+++ Makefile 2014-03-26 17:04:25 +0000
@@ -14,8 +14,5 @@
14 chmod +x tests/autopilot/run14 chmod +x tests/autopilot/run
15 tests/autopilot/run15 tests/autopilot/run
1616
17check:
18 qmltestrunner -input tests/unit
19
20run:17run:
21 /usr/bin/qmlscene $@ OSMTouch.qml18 /usr/bin/qmlscene $@ OSMTouch.qml
2219
=== modified file 'OSMTouch.desktop'
--- OSMTouch.desktop 2014-01-23 21:15:30 +0000
+++ OSMTouch.desktop 2014-03-26 17:04:25 +0000
@@ -1,8 +1,9 @@
1[Desktop Entry]1[Desktop Entry]
2Name=OSMTouch2Name=OSMTouch
3Comment=Very simple OpenStreetMap based map app3Comment=A very simple OpenStreetMap based map app.
4Exec=qmlscene $@ OSMTouch.qml4Exec=qmlscene $@ /usr/share/osmtouch/OSMTouch.qml
5Icon=icons/OSMTouch64.png5Icon=OSMTouch64.png
6Terminal=false6Terminal=false
7Type=Application7Type=Application
8Keywords=Maps,Navigation,OpenStreetMap,Location;
8X-Ubuntu-Touch=true9X-Ubuntu-Touch=true
910
=== renamed file 'icons/OSMTouch64.png' => 'OSMTouch64.png'
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2014-03-26 17:04:25 +0000
@@ -0,0 +1,5 @@
1osmtouch (0.1.2) trusty; urgency=medium
2
3 * Initial desktop release
4
5 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Sat, 22 Mar 2014 16:37:57 +0100
06
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2014-03-26 17:04:25 +0000
@@ -0,0 +1,1 @@
19
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2014-03-26 17:04:25 +0000
@@ -0,0 +1,22 @@
1Source: osmtouch
2Section: utils
3Priority: extra
4Maintainer: Yohan Boniface <yohanboniface@free.fr>
5Build-Depends: debhelper (>= 9.0.0)
6Standards-Version: 3.9.5
7Homepage: https://launchpad.net/osmtouch
8Vcs-Bzr: https://code.launchpad.net/~yohanboniface/osmtouch/trunk
9
10Package: osmtouch
11Architecture: all
12Depends: ${misc:Depends},
13 qtdeclarative5-hud1.0,
14 qtdeclarative5-qtquick2-plugin,
15 qtdeclarative5-ubuntu-ui-toolkit-plugin,
16 qtdeclarative5-qtlocation-plugin,
17 qtdeclarative5-qtpositioning-plugin,
18 qmlscene
19Description: OSM application
20 OpenStreetMap is a map of the world, created by people like you and
21 free to use under an open license. This application brings
22 OpenStreetMap to your Ubuntu desktop.
023
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2014-03-26 17:04:25 +0000
@@ -0,0 +1,28 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: osmtouch
3Source: https://launchpad.net/osmtouch
4
5Files: *
6Copyright: 2014 Yohan Boniface <yohanboniface@free.fr>
7License: WTFPL
8
9Files: debian/*
10Copyright: 2014 Nekhelesh Ramananthan <nik90@ubuntu.com>
11License: GPL-3.0
12
13License: GPL-3.0
14 This program is free software: you can redistribute it and/or modify
15 it under the terms of the GNU General Public License as published by
16 the Free Software Foundation, either version 3 of the License, or
17 (at your option) any later version.
18 .
19 This package is distributed in the hope that it will be useful,
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 GNU General Public License for more details.
23 .
24 You should have received a copy of the GNU General Public License
25 along with this program. If not, see <http://www.gnu.org/licenses/>.
26 .
27 On Debian systems, the complete text of the GNU General
28 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
029
=== added file 'debian/install'
--- debian/install 1970-01-01 00:00:00 +0000
+++ debian/install 2014-03-26 17:04:25 +0000
@@ -0,0 +1,6 @@
1OSMTouch.desktop usr/share/applications/
2OSMTouch.qml usr/share/osmtouch/
3OSMTouch64.png usr/share/icons/hicolor/192x192/apps/
4components usr/share/osmtouch/
5models usr/share/osmtouch/
6icons usr/share/osmtouch/
07
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2014-03-26 17:04:25 +0000
@@ -0,0 +1,7 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3# Uncomment this to turn on verbose mode.
4#export DH_VERBOSE=1
5
6%:
7 dh $@
08
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2014-03-26 17:04:25 +0000
@@ -0,0 +1,1 @@
13.0 (native)

Subscribers

People subscribed via source and target branches