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
=== 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-08 09:33:36 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2split = True
03
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2013-04-08 09:33:36 +0000
@@ -0,0 +1,6 @@
1*.qmlproject.user
2
3debian/files
4debian/app-template/
5debian/*.debhelper.log
6debian/*.substvars
07
=== modified file 'debian/app-template.install'
--- debian/app-template.install 2013-02-12 16:18:48 +0000
+++ debian/app-template.install 2013-04-08 09:33:36 +0000
@@ -1,3 +1,4 @@
1usr/share/applications1app-template usr/bin/
2usr/bin2app-template.desktop usr/share/applications/
3usr/share/app-template3*.qml usr/share/app-template/
4*.png usr/share/app-template/
45
=== modified file 'debian/compat'
--- debian/compat 2013-02-12 16:18:48 +0000
+++ debian/compat 2013-04-08 09:33:36 +0000
@@ -1,1 +1,1 @@
1819
22
=== modified file 'debian/control'
--- debian/control 2013-02-12 16:18:48 +0000
+++ debian/control 2013-04-08 09:33:36 +0000
@@ -1,18 +1,17 @@
1Source: app-template1Source: app-template
2Priority: extra2Priority: extra
3Maintainer: Ugo Riboni <ugo.riboni@canonical.com>3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
4Build-Depends: debhelper (>= 8.0.0), 4Build-Depends: debhelper (>= 9),
5Standards-Version: 3.9.35Standards-Version: 3.9.4
6Section: misc6Section: misc
7Homepage: https://launchpad.net/app-template7Homepage: https://launchpad.net/app-template
8Vcs-Bzr: https://code.launchpad.net/~ubuntu-touch-coreapps-drivers/ubuntu-phone-commons/appTemplate
89
9Package: app-template10Package: app-template
10Section: misc11Architecture: all
11Architecture: any12Depends: ${misc:Depends},
12Depends: ${shlibs:Depends}, ${misc:Depends},
13 qmlscene,13 qmlscene,
14 qt-components-ubuntu,14 qtdeclarative5-qtquick2-plugin,
15 qtdeclarative5-qtquick2-plugin15 qtdeclarative5-ubuntu-ui-toolkit-plugin,
16Description: AppTemplate application16Description: AppTemplate application
17 Core AppTemplate application17 Long description for the application (may span multiple lines).
18
1918
=== modified file 'debian/copyright'
--- debian/copyright 2013-02-12 16:18:48 +0000
+++ debian/copyright 2013-04-08 09:33:36 +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: app-template2Upstream-Name: app-template
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-02-12 16:18:48 +0000
+++ debian/rules 2013-04-08 09:33:36 +0000
@@ -1,29 +1,11 @@
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
12# Work-around for some machines where INSTALL_ROOT is not set properly by
13# dh_auto_install
14override_dh_auto_install:
15 dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
16
17# Workaround a bug in that debhelper package version
18override_dh_install:
19 mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
20 mkdir -p $(CURDIR)/debian/tmp/usr/bin/
21 mkdir -p $(CURDIR)/debian/tmp/usr/share/app-template/
22 cp app-template.desktop $(CURDIR)/debian/tmp/usr/share/applications/
23 cp app-template $(CURDIR)/debian/tmp/usr/bin/
24 cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/app-template/
25
26 dh_install --sourcedir=debian/tmp --fail-missing
27
28%:7%:
29 dh $@8 dh $@
9
10override_dh_install:
11 dh_install --fail-missing
3012
=== modified file 'debian/source/format'
--- debian/source/format 2013-02-12 16:18:48 +0000
+++ debian/source/format 2013-04-08 09:33:36 +0000
@@ -1,1 +1,1 @@
13.0 (native)11.0

Subscribers

People subscribed via source and target branches