Merge lp:~osomon/ubuntu-phone-commons/appTemplate-packaging-fixes into lp:ubuntu-phone-commons

Proposed by Olivier Tilloy on 2013-04-04
Status: Merged
Approved by: Michael Hall on 2013-04-08
Approved revision: 21
Merged at revision: 2
Proposed branch: lp:~osomon/ubuntu-phone-commons/appTemplate-packaging-fixes
Merge into: lp:ubuntu-phone-commons
Diff against target: 148 lines (+31/-41)
8 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+6/-0)
debian/app-template.install (+4/-3)
debian/compat (+1/-1)
debian/control (+9/-10)
debian/copyright (+5/-5)
debian/rules (+3/-21)
debian/source/format (+1/-1)
To merge this branch: bzr merge lp:~osomon/ubuntu-phone-commons/appTemplate-packaging-fixes
Reviewer Review Type Date Requested Status
Günter Schwann (community) Approve on 2013-04-08
Ubuntu Core Apps Drivers 2013-04-04 Pending
Review via email: mp+157077@code.launchpad.net

Commit message

Packaging enhancements.

Description of the change

Each commit in this branch addresses a separate issue/improvement to the packaging, so it’s probably easier reviewed commit by commit.

To post a comment you must log in.
Günter Schwann (schwann) wrote :

57 + qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu
Should we still include the old "qt-components-ubuntu"?

58 + ${misc:Depends},
I'd move that as the first dependency (all other packages I know do that)

Olivier Tilloy (osomon) wrote :

> 57 + qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-
> ubuntu
> Should we still include the old "qt-components-ubuntu"?

Not sure, so I kept it for now, I’ll check with the SDK team and update if needed.

> 58 + ${misc:Depends},
> I'd move that as the first dependency (all other packages I know do that)

You’re right. The package for webbrowser-app has it at the end, and it was moved there recently by someone more knowledgeable than me about packaging, so I assumed it was a well-known convention, but it turns out it’s not, so I’ll move it back to the beginning.

17. By Olivier Tilloy on 2013-04-05

Move back special dependencies to the beginning of the list, this seems to be a widely used convention.

18. By Olivier Tilloy on 2013-04-05

Remove the fallback dependency on the old UI toolkit package name, it is not needed any longer.

19. By Olivier Tilloy on 2013-04-05

Revert the last change, after all the fallback dependency is still needed for Quantal desktops.

any special reason for the files inside the debian dir have a different version??
77 Files: debian/*
78 Copyright: 2013 Canonical Ltd.
79 -License: LGPL-3.0
80 +License: LGPL-3

should we add the dir ".bzr-builddeb/" I am not sure what is that but we have that on the others projects.

Olivier Tilloy (osomon) wrote :

> any special reason for the files inside the debian dir have a different
> version??
> 77 Files: debian/*
> 78 Copyright: 2013 Canonical Ltd.
> 79 -License: LGPL-3.0
> 80 +License: LGPL-3

Not that I know of, but that was already like this, so I left it alone.

Olivier Tilloy (osomon) wrote :

> should we add the dir ".bzr-builddeb/" I am not sure what is that but we have
> that on the others projects.

This sets the split mode for the bzr builddeb plugin (see http://jameswestby.net/bzr/builddeb/user_manual/split.html).
It goes together with the change of debian/source/format to 1.0, so yes, you’re right, it should be added.

This is specific to packages where we are upstream (i.e. developer == packager), and I think that core applications can be considered in this case.

20. By Olivier Tilloy on 2013-04-08

Set split mode for bzr builddeb plugin
(see http://jameswestby.net/bzr/builddeb/user_manual/split.html).

21. By Olivier Tilloy on 2013-04-08

Remove again the fallback dependency on qt-components-ubuntu.
It is really not needed any longer, as the ubuntu-sdk-team release PPA contains the latest qtdeclarative5-ubuntu-ui-toolkit-plugin for quantal.

Olivier Tilloy (osomon) wrote :

> > 57 + qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-
> > ubuntu
> > Should we still include the old "qt-components-ubuntu"?
>
> Not sure, so I kept it for now, I’ll check with the SDK team and update if
> needed.

No, indeed, this is not needed any longer. I have removed it.

Günter Schwann (schwann) wrote :

Looking good

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-08 09:33:36 +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-08 09:33:36 +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=== modified file 'debian/app-template.install'
21--- debian/app-template.install 2013-02-12 16:18:48 +0000
22+++ debian/app-template.install 2013-04-08 09:33:36 +0000
23@@ -1,3 +1,4 @@
24-usr/share/applications
25-usr/bin
26-usr/share/app-template
27+app-template usr/bin/
28+app-template.desktop usr/share/applications/
29+*.qml usr/share/app-template/
30+*.png usr/share/app-template/
31
32=== modified file 'debian/compat'
33--- debian/compat 2013-02-12 16:18:48 +0000
34+++ debian/compat 2013-04-08 09:33:36 +0000
35@@ -1,1 +1,1 @@
36-8
37+9
38
39=== modified file 'debian/control'
40--- debian/control 2013-02-12 16:18:48 +0000
41+++ debian/control 2013-04-08 09:33:36 +0000
42@@ -1,18 +1,17 @@
43 Source: app-template
44 Priority: extra
45-Maintainer: Ugo Riboni <ugo.riboni@canonical.com>
46-Build-Depends: debhelper (>= 8.0.0),
47-Standards-Version: 3.9.3
48+Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
49+Build-Depends: debhelper (>= 9),
50+Standards-Version: 3.9.4
51 Section: misc
52 Homepage: https://launchpad.net/app-template
53+Vcs-Bzr: https://code.launchpad.net/~ubuntu-touch-coreapps-drivers/ubuntu-phone-commons/appTemplate
54
55 Package: app-template
56-Section: misc
57-Architecture: any
58-Depends: ${shlibs:Depends}, ${misc:Depends},
59+Architecture: all
60+Depends: ${misc:Depends},
61 qmlscene,
62- qt-components-ubuntu,
63- qtdeclarative5-qtquick2-plugin
64+ qtdeclarative5-qtquick2-plugin,
65+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
66 Description: AppTemplate application
67- Core AppTemplate application
68-
69+ Long description for the application (may span multiple lines).
70
71=== modified file 'debian/copyright'
72--- debian/copyright 2013-02-12 16:18:48 +0000
73+++ debian/copyright 2013-04-08 09:33:36 +0000
74@@ -1,16 +1,16 @@
75-Format: http://dep.debian.net/deps/dep5
76+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
77 Upstream-Name: app-template
78 Source:
79
80 Files: *
81 Copyright: 2013 Canonical Ltd.
82-License: GPL-3.0
83+License: GPL-3
84
85 Files: debian/*
86 Copyright: 2013 Canonical Ltd.
87-License: LGPL-3.0
88+License: LGPL-3
89
90-License: GPL-3.0
91+License: GPL-3
92 This package is free software; you can redistribute it and/or
93 modify it under the terms of the GNU General Public
94 License as published by the Free Software Foundation; either
95@@ -27,7 +27,7 @@
96 On Debian systems, the complete text of the GNU General
97 Public License can be found in "/usr/share/common-licenses/GPL-3".
98
99-License: LGPL-3.0
100+License: LGPL-3
101 This package is free software; you can redistribute it and/or
102 modify it under the terms of the GNU Lesser General Public
103 License as published by the Free Software Foundation; either
104
105=== removed file 'debian/docs'
106=== modified file 'debian/rules'
107--- debian/rules 2013-02-12 16:18:48 +0000
108+++ debian/rules 2013-04-08 09:33:36 +0000
109@@ -1,29 +1,11 @@
110 #!/usr/bin/make -f
111 # -*- makefile -*-
112-# Sample debian/rules that uses debhelper.
113-# This file was originally written by Joey Hess and Craig Small.
114-# As a special exception, when this file is copied by dh-make into a
115-# dh-make output file, you may use that output file without restriction.
116-# This special exception was added by Craig Small in version 0.37 of dh-make.
117
118 # Uncomment this to turn on verbose mode.
119 #export DH_VERBOSE=1
120
121-# Work-around for some machines where INSTALL_ROOT is not set properly by
122-# dh_auto_install
123-override_dh_auto_install:
124- dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
125-
126-# Workaround a bug in that debhelper package version
127-override_dh_install:
128- mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
129- mkdir -p $(CURDIR)/debian/tmp/usr/bin/
130- mkdir -p $(CURDIR)/debian/tmp/usr/share/app-template/
131- cp app-template.desktop $(CURDIR)/debian/tmp/usr/share/applications/
132- cp app-template $(CURDIR)/debian/tmp/usr/bin/
133- cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/app-template/
134-
135- dh_install --sourcedir=debian/tmp --fail-missing
136-
137 %:
138 dh $@
139+
140+override_dh_install:
141+ dh_install --fail-missing
142
143=== modified file 'debian/source/format'
144--- debian/source/format 2013-02-12 16:18:48 +0000
145+++ debian/source/format 2013-04-08 09:33:36 +0000
146@@ -1,1 +1,1 @@
147-3.0 (native)
148+1.0

Subscribers

People subscribed via source and target branches