Merge lp:~robru/ubuntu-settings-components/packaging into lp:~registry/ubuntu-settings-components/trunk

[Robert Bruce Park]

Inline packaging.

First stab at packaging. Here are the lintian warnings thus far:

W: ubuntu-settings-components: unknown-section unity

(wasn't sure what section to put it in; saw unity was used in some other packages, but apparently this in invalid. Maybe it should just be misc? no idea)

W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/MediaPlayer/[e-mail]
W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/MediaPlayer/[e-mail]
W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/MediaPlayer/[e-mail]
W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/MediaPlayer/electric.jpg
W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/MediaPlayer/speak-now.jpg
W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/MediaPlayer/the-man-machine.jpg
W: ubuntu-settings-components: image-file-in-usr-lib usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/SettingsComponents/UserSession/[e-mail]

Did we ever decide on what is the recommended way to handle this? Should I move these files into /usr/share and then supply a symlink?

[lp:~robru/ubuntu-settings-components/packaging]

50. By Robert Bruce Park on 2013-08-07

Simplify!

[Mathieu Trudel-Lapierre (cyphermox)]

Which other pacakges did you see Section: unity? Just curious.

Also, I do think we really should move those files to /usr/share, and actually fix whatever is expecting them in /usr/lib to look at the right place.

review: Needs Information

[Robert Bruce Park (robru)]

Yeah, the problem is that some qml internal component is hardcoded to try to load it's graphic assets from inside /usr/lib/[arch] directory, the last time I came across this problem (in webbrowser-app), I changed the project to install it's images to /usr/share and then created symlinks so that qml could continue to find them; didrocks said he would work with olivier in order to resolve that issue in a nicer way, but I never heard anything about it since.

As for other projects doing section: unity, well, I can't seem to find any at the moment (of course), but at the time I had just done a 'grep -R Section:' and unity was popping up a lot. Maybe it was just from some tests inside cu2d and not anything in the real distro... bah. Anyway, would love your input as to what the correct section is.

[Mathieu Trudel-Lapierre (cyphermox)]

I'm fine with it in it's current state, we can revisit and fix the qml internals later.

I'd just like to see a longer long Description for the binary package if possible.

review: Approve

[lp:~robru/ubuntu-settings-components/packaging]

51. By Robert Bruce Park on 2013-08-09

Fix lintian warnings.

Had to create a separate -assets package to contain arch independent
files; had to move those into /usr/share, and then create a symlink to
them from /usr/lib so that qml will still be able to find them at
runtime.

[Didier Roche-Tolomelli (didrocks)]

as per IRC:
18:15:30 didrocks | robru: looks perfect to me! (just change the binary package name + add the dep), everything is great, nice
                    | mess^W^W^W^Wwork

[lp:~robru/ubuntu-settings-components/packaging]

52. By Robert Bruce Park on 2013-08-09

Package rename and dependency fixes.

53. By Robert Bruce Park on 2013-08-09

Fix last lintian warning.

[Robert Bruce Park (robru)]

Ok, i think this is perfect now. Just needs Andrea to top-approve this because nobody else has permission to ;-)

review: Approve

[lp:~robru/ubuntu-settings-components/packaging]

54. By Robert Bruce Park on 2013-08-09

Fix missing deps.

[Robert Bruce Park (robru)]

Whoops, now it's fixed for real, confirmed in pbuilder and everything ;-)

review: Approve

[Didier Roche-Tolomelli (didrocks)]

looking good after our IRC discussions!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-07 15:39:04 +0000
+++ CMakeLists.txt	2013-08-09 16:37:17 +0000
@@ -70,8 +70,15 @@
     SettingsComponents
     )
 
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND
+             mkdir -p \$ENV{DESTDIR}${SETTINGS_COMPONENTS_DIR})")
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND
+             ln -sf /usr/share/SettingsComponents
+                    \$ENV{DESTDIR}${SETTINGS_COMPONENTS_DIR})")
+
+# Install arch-independent assets under /usr/share
 install(DIRECTORY ${QML_DIRS}
-    DESTINATION ${SETTINGS_COMPONENTS_DIR}
+    DESTINATION ${CMAKE_INSTALL_DATADIR}
     )
 
 # Tests

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2013-08-09 16:37:17 +0000
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2013-08-09 16:37:17 +0000
@@ -0,0 +1,5 @@
+ubuntu-settings-components (0.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Initial release.
+
+ -- Robert Bruce Park <[e-mail]>  Wed, 07 Aug 2013 14:45:26 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2013-08-09 16:37:17 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2013-08-09 16:37:17 +0000
@@ -0,0 +1,30 @@
+Source: ubuntu-settings-components
+Section: misc
+Priority: optional
+Maintainer: Andrea Cimitan <[e-mail]>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               pkg-config,
+               qtdeclarative5-dev,
+Standards-Version: 3.9.4
+Homepage: https://launchpad.net/ubuntu-settings-components
+# If you aren't a member of ~ubuntu-settings-components-team but need to upload packaging changes,
+# just go ahead. ~ubuntu-settings-components-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-settings-components-team/ubuntu-settings-components/trunk
+
+Package: qtdeclarative5-ubuntu-settings-components
+Architecture: any
+Depends: qtdeclarative5-ubuntu-settings-components-assets (= ${source:Version}),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu Settings Components
+ This package provides a link from /usr/lib to /usr/share, so QML can
+ find its assets.
+
+Package: qtdeclarative5-ubuntu-settings-components-assets
+Architecture: all
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu Settings Components
+ Architecture-independent QML and images files for Ubuntu Settings.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2013-08-09 16:37:17 +0000
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://launchpad.net/ubuntu-settings-components
+Upstream-Name: ubuntu-settings-components
+Upstream-Contact: Andrea Cimitan <[e-mail]>
+
+Files: *
+Copyright: 2013 Canonical, Ltd.
+License: LGPL-3
+
+License: LGPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of version 3 of the GNU Lesser General Public
+ License as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/LGPL-3'.

=== added file 'debian/qtdeclarative5-ubuntu-settings-components-assets.install'
--- debian/qtdeclarative5-ubuntu-settings-components-assets.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-settings-components-assets.install	2013-08-09 16:37:17 +0000
@@ -0,0 +1,1 @@
+usr/share/

=== added file 'debian/qtdeclarative5-ubuntu-settings-components.install'
--- debian/qtdeclarative5-ubuntu-settings-components.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-settings-components.install	2013-08-09 16:37:17 +0000
@@ -0,0 +1,1 @@
+usr/lib/

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2013-08-09 16:37:17 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+%:
+	dh $@ --parallel --fail-missing