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

[Michael Hall]

Updates packaging and icon for a better install

Updates packaging and icon for a better install

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Gustavo Pichorim Boiko (boiko)]

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]

47. By Riccardo Ferrazzo on 2013-04-12

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 on 2013-04-12

Merge package fixes

49. By Michael Hall on 2013-04-15

Fix Vcs-Bzr in debian/control

[Michael Hall (mhall119)]

Yup, fixed in rev 49

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Gustavo Pichorim Boiko (boiko)]

Looks good now.

review: Approve

=== 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 @@
+[BUILDDEB]
+split = True

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-04-15 18:52:27 +0000
@@ -0,0 +1,6 @@
+*.qmlproject.user
+
+debian/files
+debian/app-template/
+debian/*.debhelper.log
+debian/*.substvars

=== modified file 'calculator64.png'
Binary 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 @@
-8
+9

=== 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 @@
 Source: ubuntu-calculator-app
 Priority: extra
-Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9.0), 
-Standards-Version: 3.9.3
+Maintainer: Ubuntu App Cats <[e-mail]>
+Build-Depends: debhelper (>= 9), 
+Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-calculator-app
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/trunk
 
 Package: ubuntu-calculator-app
 Section: misc
 Architecture: all
-Depends: ${shlibs:Depends}, 
-         ${misc:Depends},
+Depends: ${misc:Depends},
          qmlscene,
-         qt-components-ubuntu,
          qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin
 Description: Calculator application
  Core Calculator application
@@ -27,4 +27,3 @@
          python-support (>= 0.90)
 Description: Autopilot tests for the calculator app for Ubuntu
  ubuntu-calculator-app is a calculator app for the Ubuntu touch. This package contains autopilot tests for it.
-

=== 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 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ubuntu-calculator-app
 Source:
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+License: GPL-3
 
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
-License: LGPL-3.0
+License: LGPL-3
 
-License: GPL-3.0
+License: GPL-3
  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
@@ -27,7 +27,7 @@
  On Debian systems, the complete text of the GNU General
  Public License can be found in "/usr/share/common-licenses/GPL-3".
 
-License: LGPL-3.0
+License: LGPL-3
  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

=== 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 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

=== 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 @@
 ubuntu-calculator-app.desktop usr/share/applications
 ubuntu-calculator-app usr/bin
-Simple Scientific *.qml *.png *.js usr/share/ubuntu-calculator-app
+Simple usr/share/ubuntu-calculator-app
+Scientific usr/share/ubuntu-calculator-app
+*.qml usr/share/ubuntu-calculator-app
+*.png usr/share/ubuntu-calculator-app
+*.js usr/share/ubuntu-calculator-app