Ubuntu Calculator App

Merge lp:~mhall119/ubuntu-calculator-app/package-fixes into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

  1. package-fixes
  2. Merge into old_trunk
Proposed by Michael Hall
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 49
Merged at revision: 48
Proposed branch: lp:~mhall119/ubuntu-calculator-app/package-fixes
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 125 lines (+25/-19)
7 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+6/-0)
debian/compat (+1/-1)
debian/control (+6/-7)
debian/copyright (+5/-5)
debian/rules (+0/-5)
debian/ubuntu-calculator-app.install (+5/-1)
To merge this branch: bzr merge lp:~mhall119/ubuntu-calculator-app/package-fixes
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+158482@code.launchpad.net

Commit message

Updates packaging and icon for a better install

Description of the change

Updates packaging and icon for a better install

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:48
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/10/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-quantal-amd64-ci/10
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-raring-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/10/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

43 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-touch-coreapps-drivers/ubuntu-phone-commons/appTemplate

This is probably wrong, should be probably:
Vcs-Bzr: https://code.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/trunk

review: Needs Fixing
lp:~mhall119/ubuntu-calculator-app/package-fixes updated
47. By Riccardo Ferrazzo

New formula implementation. Fixes: https://bugs.launchpad.net/bugs/1164973, https://bugs.launchpad.net/bugs/1165894.

Approved by Gustavo Pichorim Boiko, Ubuntu Phone Apps Jenkins Bot.

48. By Michael Hall

Merge package fixes

49. By Michael Hall

Fix Vcs-Bzr in debian/control

Revision history for this message
Michael Hall (mhall119) wrote :

Yup, fixed in rev 49

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:49
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/12/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-quantal-amd64-ci/12
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-raring-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2013-04-15 18:52:27 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2split = True
03
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2013-04-15 18:52:27 +0000
@@ -0,0 +1,6 @@
1*.qmlproject.user
2
3debian/files
4debian/app-template/
5debian/*.debhelper.log
6debian/*.substvars
07
=== modified file 'calculator64.png'
1Binary files calculator64.png 2013-02-12 16:27:14 +0000 and calculator64.png 2013-04-15 18:52:27 +0000 differ8Binary files calculator64.png 2013-02-12 16:27:14 +0000 and calculator64.png 2013-04-15 18:52:27 +0000 differ
=== modified file 'debian/compat'
--- debian/compat 2013-02-12 16:18:48 +0000
+++ debian/compat 2013-04-15 18:52:27 +0000
@@ -1,1 +1,1 @@
1819
22
=== modified file 'debian/control'
--- debian/control 2013-04-03 19:48:03 +0000
+++ debian/control 2013-04-15 18:52:27 +0000
@@ -1,19 +1,19 @@
1Source: ubuntu-calculator-app1Source: ubuntu-calculator-app
2Priority: extra2Priority: extra
3Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
4Build-Depends: debhelper (>= 9.0), 4Build-Depends: debhelper (>= 9),
5Standards-Version: 3.9.35Standards-Version: 3.9.4
6Section: misc6Section: misc
7Homepage: https://launchpad.net/ubuntu-calculator-app7Homepage: https://launchpad.net/ubuntu-calculator-app
8Vcs-Bzr: https://code.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/trunk
89
9Package: ubuntu-calculator-app10Package: ubuntu-calculator-app
10Section: misc11Section: misc
11Architecture: all12Architecture: all
12Depends: ${shlibs:Depends}, 13Depends: ${misc:Depends},
13 ${misc:Depends},
14 qmlscene,14 qmlscene,
15 qt-components-ubuntu,
16 qtdeclarative5-qtquick2-plugin,15 qtdeclarative5-qtquick2-plugin,
16 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
17 qtdeclarative5-localstorage-plugin17 qtdeclarative5-localstorage-plugin
18Description: Calculator application18Description: Calculator application
19 Core Calculator application19 Core Calculator application
@@ -27,4 +27,3 @@
27 python-support (>= 0.90)27 python-support (>= 0.90)
28Description: Autopilot tests for the calculator app for Ubuntu28Description: Autopilot tests for the calculator app for Ubuntu
29 ubuntu-calculator-app is a calculator app for the Ubuntu touch. This package contains autopilot tests for it.29 ubuntu-calculator-app is a calculator app for the Ubuntu touch. This package contains autopilot tests for it.
30
3130
=== modified file 'debian/copyright'
--- debian/copyright 2013-02-12 16:27:14 +0000
+++ debian/copyright 2013-04-15 18:52:27 +0000
@@ -1,16 +1,16 @@
1Format: http://dep.debian.net/deps/dep51Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ubuntu-calculator-app2Upstream-Name: ubuntu-calculator-app
3Source:3Source:
44
5Files: *5Files: *
6Copyright: 2013 Canonical Ltd.6Copyright: 2013 Canonical Ltd.
7License: GPL-3.07License: GPL-3
88
9Files: debian/*9Files: debian/*
10Copyright: 2013 Canonical Ltd.10Copyright: 2013 Canonical Ltd.
11License: LGPL-3.011License: LGPL-3
1212
13License: GPL-3.013License: GPL-3
14 This package is free software; you can redistribute it and/or14 This package is free software; you can redistribute it and/or
15 modify it under the terms of the GNU General Public15 modify it under the terms of the GNU General Public
16 License as published by the Free Software Foundation; either16 License as published by the Free Software Foundation; either
@@ -27,7 +27,7 @@
27 On Debian systems, the complete text of the GNU General27 On Debian systems, the complete text of the GNU General
28 Public License can be found in "/usr/share/common-licenses/GPL-3".28 Public License can be found in "/usr/share/common-licenses/GPL-3".
2929
30License: LGPL-3.030License: LGPL-3
31 This package is free software; you can redistribute it and/or31 This package is free software; you can redistribute it and/or
32 modify it under the terms of the GNU Lesser General Public32 modify it under the terms of the GNU Lesser General Public
33 License as published by the Free Software Foundation; either33 License as published by the Free Software Foundation; either
3434
=== removed file 'debian/docs'
=== modified file 'debian/rules'
--- debian/rules 2013-03-22 12:31:46 +0000
+++ debian/rules 2013-04-15 18:52:27 +0000
@@ -1,10 +1,5 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-2# -*- makefile -*-
3# Sample debian/rules that uses debhelper.
4# This file was originally written by Joey Hess and Craig Small.
5# As a special exception, when this file is copied by dh-make into a
6# dh-make output file, you may use that output file without restriction.
7# This special exception was added by Craig Small in version 0.37 of dh-make.
83
9# Uncomment this to turn on verbose mode.4# Uncomment this to turn on verbose mode.
10#export DH_VERBOSE=15#export DH_VERBOSE=1
116
=== modified file 'debian/ubuntu-calculator-app.install'
--- debian/ubuntu-calculator-app.install 2013-03-22 12:15:46 +0000
+++ debian/ubuntu-calculator-app.install 2013-04-15 18:52:27 +0000
@@ -1,3 +1,7 @@
1ubuntu-calculator-app.desktop usr/share/applications1ubuntu-calculator-app.desktop usr/share/applications
2ubuntu-calculator-app usr/bin2ubuntu-calculator-app usr/bin
3Simple Scientific *.qml *.png *.js usr/share/ubuntu-calculator-app3Simple usr/share/ubuntu-calculator-app
4Scientific usr/share/ubuntu-calculator-app
5*.qml usr/share/ubuntu-calculator-app
6*.png usr/share/ubuntu-calculator-app
7*.js usr/share/ubuntu-calculator-app

Subscribers

People subscribed via source and target branches