Merge lp:~nik90/reminders-app/add-debian-click-packaging into lp:reminders-app

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: David Planella
Approved revision: 9
Merged at revision: 4
Proposed branch: lp:~nik90/reminders-app/add-debian-click-packaging
Merge into: lp:reminders-app
Diff against target: 281 lines (+129/-71)
14 files modified
Makefile (+0/-21)
README.txt (+8/-0)
apparmor/reminders-app.json (+6/-0)
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+30/-0)
debian/copyright (+46/-0)
debian/reminders-app-autopilot.install (+1/-0)
debian/reminders-app.install (+6/-0)
debian/rules (+21/-0)
debian/source/format (+1/-0)
reminders-app (+2/-0)
reminders-app.desktop (+2/-1)
tests/unit/tst_hellocomponent.qml (+0/-49)
To merge this branch: bzr merge lp:~nik90/reminders-app/add-debian-click-packaging
Reviewer Review Type Date Requested Status
David Planella Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+196022@code.launchpad.net

Commit message

- Added debian and click packaging support.
- Added temporary app icon taken from the project page

Description of the change

This MP adds debian and click packaging support.

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Just one thing after a first glance:

12 +#
13 +# Basic early stategy was to create two object (text boxs) with a connect
14 +# button for initial API connection. Simply place the request (service call) in the
15 +# lower text field, and the cloud API places requested call in text box.
16 +#
17 +# 1. Focus is on establishing communication with cloud API
18 +# 2. Create note through API
19 +# 3. Retrieve created note
20 +#

This no longer applies, so it might be worth removing it from the README.txt file or remove the file alltogether.

review: Needs Fixing
4. By Nekhelesh Ramananthan

Some fixes to debian packaging

5. By Nekhelesh Ramananthan

Fixed README.txt

6. By Nekhelesh Ramananthan

removed failing unit test

7. By Nekhelesh Ramananthan

Removed unnecessary makefile

8. By Nekhelesh Ramananthan

merge from master

9. By Nekhelesh Ramananthan

small fix to the debian/rules file

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Awesome stuff.

review: Approve
Revision history for this message
David Planella (dpm) wrote :

Builds fine here, but with the following Lintian warnings:

W: reminders-app source: diff-contains-bzr-control-dir .bzr
W: reminders-app source: debhelper-but-no-misc-depends reminders-app-autopilot
W: reminders-app source: missing-field-in-dep5-copyright license (paragraph at line 5)
W: reminders-app source: missing-license-text-in-dep5-copyright gpl-3 (paragraph at line 8)

I'll approve for now to get the packaging and Jenkins going, but we will need to address them after that.

review: Approve
Revision history for this message
David Planella (dpm) wrote :

Needed fixes filed as bug 1253459

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'Makefile'
2--- Makefile 2013-10-23 11:02:37 +0000
3+++ Makefile 1970-01-01 00:00:00 +0000
4@@ -1,21 +0,0 @@
5-# More information: https://wiki.ubuntu.com/Touch/Testing
6-#
7-# Notes for autopilot tests:
8-# -----------------------------------------------------------
9-# In order to run autopilot tests:
10-# sudo apt-add-repository ppa:autopilot/ppa
11-# sudo apt-get update
12-# sudo apt-get install python-autopilot autopilot-qt
13-#############################################################
14-
15-all:
16-
17-autopilot:
18- chmod +x tests/autopilot/run
19- tests/autopilot/run
20-
21-check:
22- qmltestrunner -input tests/unit
23-
24-run:
25- /usr/bin/qmlscene $@ reminders-app.qml
26
27=== added file 'README.txt'
28--- README.txt 1970-01-01 00:00:00 +0000
29+++ README.txt 2013-11-20 22:38:39 +0000
30@@ -0,0 +1,8 @@
31+# ##############################################
32+# Ubuntu Reminders App
33+#
34+# Simple app that will allow interaction between
35+# Ubuntu's API & Evernotes cloud API
36+#
37+################################################
38+
39
40=== added directory 'apparmor'
41=== added file 'apparmor/reminders-app.json'
42--- apparmor/reminders-app.json 1970-01-01 00:00:00 +0000
43+++ apparmor/reminders-app.json 2013-11-20 22:38:39 +0000
44@@ -0,0 +1,6 @@
45+{
46+ "policy_groups": [
47+ "networking"
48+ ],
49+ "policy_version": 1
50+}
51
52=== added directory 'debian'
53=== added file 'debian/changelog'
54--- debian/changelog 1970-01-01 00:00:00 +0000
55+++ debian/changelog 2013-11-20 22:38:39 +0000
56@@ -0,0 +1,5 @@
57+reminders-app (0.1) saucy; urgency=low
58+
59+ * Initial release
60+
61+ -- David Planella <david.planella@ubuntu.com> Wed, 23 Oct 2013 16:04:00 -0500
62
63=== added file 'debian/compat'
64--- debian/compat 1970-01-01 00:00:00 +0000
65+++ debian/compat 2013-11-20 22:38:39 +0000
66@@ -0,0 +1,1 @@
67+9
68
69=== added file 'debian/control'
70--- debian/control 1970-01-01 00:00:00 +0000
71+++ debian/control 2013-11-20 22:38:39 +0000
72@@ -0,0 +1,30 @@
73+Source: reminders-app
74+Priority: extra
75+Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
76+Build-Depends: debhelper (>= 9),
77+ gettext,
78+ python,
79+Standards-Version: 3.9.4
80+Section: misc
81+Homepage: https://launchpad.net/reminders-app
82+Vcs-Bzr: https://code.launchpad.net/~reminders-app-dev/reminders-app/trunk
83+
84+Package: reminders-app
85+Section: misc
86+Architecture: all
87+Depends: ${misc:Depends},
88+ qmlscene,
89+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
90+ qtdeclarative5-localstorage-plugin,
91+ qtdeclarative5-qtquick2-plugin
92+Description: Reminders application
93+ Note taking application powered by Evernote
94+
95+Package: reminders-app-autopilot
96+Architecture: all
97+Depends: reminders-app (= ${source:Version}),
98+ libautopilot-qt,
99+ libqt5test5,
100+ ubuntu-ui-toolkit-autopilot,
101+Description: Test package for the Reminders app
102+ Autopilot tests for the Reminders app package
103
104=== added file 'debian/copyright'
105--- debian/copyright 1970-01-01 00:00:00 +0000
106+++ debian/copyright 2013-11-20 22:38:39 +0000
107@@ -0,0 +1,46 @@
108+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
109+Upstream-Name: reminders-app
110+Source: https://launchpad.net/reminders-app
111+
112+Files: *
113+Copyright: 2013 Canonical Ltd.
114+
115+License: GPL-3
116+
117+Files: debian/*
118+Copyright: 2013 Canonical Ltd.
119+License: LGPL-3
120+
121+License: GPL-3
122+ This package is free software; you can redistribute it and/or
123+ modify it under the terms of the GNU General Public
124+ License as published by the Free Software Foundation; either
125+ version 3 of the License.
126+ .
127+ This package is distributed in the hope that it will be useful,
128+ but WITHOUT ANY WARRANTY; without even the implied warranty of
129+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
130+ General Public License for more details.
131+ .
132+ You should have received a copy of the GNU General Public License
133+ along with this program. If not, see <http://www.gnu.org/licenses/>.
134+ .
135+ On Debian systems, the complete text of the GNU General
136+ Public License can be found in "/usr/share/common-licenses/GPL-3".
137+
138+License: LGPL-3
139+ This package is free software; you can redistribute it and/or
140+ modify it under the terms of the GNU Lesser General Public
141+ License as published by the Free Software Foundation; either
142+ version 3 of the License.
143+ .
144+ This package is distributed in the hope that it will be useful,
145+ but WITHOUT ANY WARRANTY; without even the implied warranty of
146+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
147+ Lesser General Public License for more details.
148+ .
149+ You should have received a copy of the GNU General Public License
150+ along with this program. If not, see <http://www.gnu.org/licenses/>.
151+ .
152+ On Debian systems, the complete text of the GNU Lesser General
153+ Public License can be found in "/usr/share/common-licenses/LGPL-3".
154
155=== added file 'debian/reminders-app-autopilot.install'
156--- debian/reminders-app-autopilot.install 1970-01-01 00:00:00 +0000
157+++ debian/reminders-app-autopilot.install 2013-11-20 22:38:39 +0000
158@@ -0,0 +1,1 @@
159+tests/autopilot/reminders_app/* usr/lib/python2.7/dist-packages/reminders_app/
160
161=== added file 'debian/reminders-app.install'
162--- debian/reminders-app.install 1970-01-01 00:00:00 +0000
163+++ debian/reminders-app.install 2013-11-20 22:38:39 +0000
164@@ -0,0 +1,6 @@
165+reminders-app usr/bin/
166+reminders-app.desktop usr/share/applications/
167+*.qml usr/share/reminders-app/
168+*.png usr/share/reminders-app/
169+components usr/share/reminders-app/
170+ui usr/share/reminders-app/
171
172=== added file 'debian/rules'
173--- debian/rules 1970-01-01 00:00:00 +0000
174+++ debian/rules 2013-11-20 22:38:39 +0000
175@@ -0,0 +1,21 @@
176+#!/usr/bin/make -f
177+# -*- makefile -*-
178+
179+# Uncomment this to turn on verbose mode.
180+#export DH_VERBOSE=1
181+
182+%:
183+ dh $@
184+
185+override_dh_install:
186+ dh_install --fail-missing
187+ appname=com.ubuntu.reminders-app; \
188+ debname=reminders-app; \
189+ for pofile in $(shell find ./po -name "*.po"); do \
190+ pofilename="$${pofile##*/}"; \
191+ langcode="$${pofilename%.*}"; \
192+ localedir="debian/$$debname/usr/share/locale/$$langcode/LC_MESSAGES"; \
193+ mkdir -p $$localedir; \
194+ mofile="$$localedir/$$appname.mo"; \
195+ msgfmt -o $$mofile $$pofile; \
196+ done
197
198=== added directory 'debian/source'
199=== added file 'debian/source/format'
200--- debian/source/format 1970-01-01 00:00:00 +0000
201+++ debian/source/format 2013-11-20 22:38:39 +0000
202@@ -0,0 +1,1 @@
203+1.0
204
205=== added file 'reminders-app'
206--- reminders-app 1970-01-01 00:00:00 +0000
207+++ reminders-app 2013-11-20 22:38:39 +0000
208@@ -0,0 +1,2 @@
209+#!/bin/bash
210+qmlscene /usr/share/reminders-app/reminders-app.qml
211
212=== modified file 'reminders-app.desktop'
213--- reminders-app.desktop 2013-10-23 11:02:37 +0000
214+++ reminders-app.desktop 2013-11-20 22:38:39 +0000
215@@ -2,7 +2,8 @@
216 Name=reminders-app
217 Comment=My project description
218 Exec=/usr/bin/qmlscene $@ /usr/share/reminders-app/reminders-app.qml
219-Icon=qmlscene
220+Icon=/usr/share/ubuntu-clock-app/reminders-app.png
221 Terminal=false
222 Type=Application
223 X-Ubuntu-Touch=true
224+X-Ubuntu-Gettext-Domain=com.ubuntu.reminders-app
225
226=== added file 'reminders-app.png'
227Binary files reminders-app.png 1970-01-01 00:00:00 +0000 and reminders-app.png 2013-11-20 22:38:39 +0000 differ
228=== renamed directory 'tests/autopilot/reminders-app' => 'tests/autopilot/reminders_app'
229=== removed file 'tests/unit/tst_hellocomponent.qml'
230--- tests/unit/tst_hellocomponent.qml 2013-10-23 11:02:37 +0000
231+++ tests/unit/tst_hellocomponent.qml 1970-01-01 00:00:00 +0000
232@@ -1,49 +0,0 @@
233-import QtQuick 2.0
234-import QtTest 1.0
235-import Ubuntu.Components 0.1
236-import "../../components"
237-
238-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
239-
240-// Execute tests with:
241-// qmltestrunner
242-
243-Item {
244- // The objects
245- HelloComponent {
246- id: objectUnderTest
247- }
248-
249- TestCase {
250- name: "HelloComponent"
251-
252- function init() {
253- console.debug(">> init");
254- compare("",objectUnderTest.text,"text was not empty on init");
255- console.debug("<< init");
256- }
257-
258- function cleanup() {
259- console.debug(">> cleanup");
260- console.debug("<< cleanup");
261- }
262-
263- function initTestCase() {
264- console.debug(">> initTestCase");
265- console.debug("<< initTestCase");
266- }
267-
268- function cleanupTestCase() {
269- console.debug(">> cleanupTestCase");
270- console.debug("<< cleanupTestCase");
271- }
272-
273- function test_canReadAndWriteText() {
274- var expected = "Hello World";
275-
276- objectUnderTest.text = expected;
277-
278- compare(expected,objectUnderTest.text,"expected did not equal result");
279- }
280- }
281-}

Subscribers

People subscribed via source and target branches