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

[Olivier Tilloy]

Packaging enhancements.

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

[Günter Schwann (schwann)]

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)]

> 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.

[lp:~osomon/ubuntu-phone-commons/appTemplate-packaging-fixes]

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.

[Renato Araujo Oliveira Filho (renatofilho)]

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

[Renato Araujo Oliveira Filho (renatofilho)]

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)]

> 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)]

> 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.

[lp:~osomon/ubuntu-phone-commons/appTemplate-packaging-fixes]

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)]

> > 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)]

Looking good

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-08 09:33:36 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-04-08 09:33:36 +0000
@@ -0,0 +1,6 @@
+*.qmlproject.user
+
+debian/files
+debian/app-template/
+debian/*.debhelper.log
+debian/*.substvars

=== 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 @@
-usr/share/applications
-usr/bin
-usr/share/app-template
+app-template usr/bin/
+app-template.desktop usr/share/applications/
+*.qml usr/share/app-template/
+*.png usr/share/app-template/

=== 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 @@
-8
+9

=== 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 @@
 Source: app-template
 Priority: extra
-Maintainer: Ugo Riboni <[e-mail]>
-Build-Depends: debhelper (>= 8.0.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/app-template
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-touch-coreapps-drivers/ubuntu-phone-commons/appTemplate
 
 Package: app-template
-Section: misc
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Architecture: all
+Depends: ${misc:Depends},
          qmlscene,
-         qt-components-ubuntu,
-         qtdeclarative5-qtquick2-plugin
+         qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin,
 Description: AppTemplate application
- Core AppTemplate application
-
+ Long description for the application (may span multiple lines).

=== 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 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: app-template
 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-02-12 16:18:48 +0000
+++ debian/rules	2013-04-08 09:33:36 +0000
@@ -1,29 +1,11 @@
 #!/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
 
-# Work-around for some machines where INSTALL_ROOT is not set properly by
-# dh_auto_install
-override_dh_auto_install:
-	dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
-
-# Workaround a bug in that debhelper package version
-override_dh_install:
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin/
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/app-template/
-	cp app-template.desktop $(CURDIR)/debian/tmp/usr/share/applications/
-	cp app-template $(CURDIR)/debian/tmp/usr/bin/
-	cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/app-template/
-	
-	dh_install --sourcedir=debian/tmp --fail-missing
-
 %:
 	dh $@
+
+override_dh_install:
+	dh_install --fail-missing

=== 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 @@
-3.0 (native)
+1.0