Merge lp:~mhall119/ubuntu-calendar-app/package-fixes into lp:ubuntu-calendar-app

Proposed by Michael Hall
Status: Merged
Approved by: Kunal Parmar
Approved revision: 19
Merged at revision: 18
Proposed branch: lp:~mhall119/ubuntu-calendar-app/package-fixes
Merge into: lp:ubuntu-calendar-app
Diff against target: 35 lines (+10/-1)
3 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+6/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~mhall119/ubuntu-calendar-app/package-fixes
Reviewer Review Type Date Requested Status
Kunal Parmar Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+158483@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 :
review: Approve (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

looks fine to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-04-11 20:45:35 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== added file '.bzrignore'
10--- .bzrignore 1970-01-01 00:00:00 +0000
11+++ .bzrignore 2013-04-11 20:45:35 +0000
12@@ -0,0 +1,6 @@
13+*.qmlproject.user
14+
15+debian/files
16+debian/app-template/
17+debian/*.debhelper.log
18+debian/*.substvars
19
20=== renamed file '.bzrignore' => '.bzrignore.moved'
21=== modified file 'calendar64.png'
22Binary files calendar64.png 2013-02-12 16:27:52 +0000 and calendar64.png 2013-04-11 20:45:35 +0000 differ
23=== modified file 'debian/control'
24--- debian/control 2013-04-04 19:02:29 +0000
25+++ debian/control 2013-04-11 20:45:35 +0000
26@@ -9,7 +9,8 @@
27
28 Package: ubuntu-calendar-app
29 Architecture: all
30-Depends: qmlscene,
31+Depends: ${misc:Depends},
32+ qmlscene,
33 qtdeclarative5-localstorage-plugin,
34 qtdeclarative5-qtquick2-plugin,
35 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,

Subscribers

People subscribed via source and target branches

to status/vote changes: