Merge lp:~dholbach/qtgrilo/packaging-fixes into lp:qtgrilo

[Daniel Holbach]

[David Planella (dpm)]

Looks good to me, waiting for Mirv's comments to top-approve, thanks!

review: Approve

[Daniel Holbach (dholbach)]

Ken, if you could help with the names of the package, that'd be great. This is the conversation we had earlier:

<Mirv> dholbach: it looks fine otherwise, but kenvandine has asked the new QML plugins to have package name with version number, ie. qtdeclarative-qtgrilo0.1, and that the files would be installed in a directory where the version number is appended, so that we define some sort of API and bump the version number when we take a new upstream snapshot or such - see qtdeclarative5-friends0.2 for example
<Mirv> dholbach: and dropping of the "plugin" word. other examples qtdeclarative5-gsettings1.0 gtdeclarative5-hud1.0 qtdeclarative-ubuntu-*0.1

[Timo Jyrinki (timo-jyrinki)]

It looks fine otherwise, but kenvandine has asked the new QML plugins to have package name with version number, ie. qtdeclarative-qtgrilo0.1, and that the files would be installed in a directory where the version number is appended. So that we define some sort of API and bump the version number when we take a new upstream snapshot or such - see qtdeclarative5-friends0.2 for example.

other examples qtdeclarative5-gsettings1.0 qtdeclarative5-hud1.0 qtdeclarative-ubuntu-*0.1

[Daniel Holbach (dholbach)]

Sorry for the noise Ken, it's all right.

[Timo Jyrinki (timo-jyrinki)]

I tested building it now.

1) Sorry I didn't notice this, but it shouldn't be a native package. So version 0.1-0ubuntu1 instead. To enable building with bzr builddeb, add .bzr-builddeb as instructed here https://wiki.ubuntu.com/DailyRelease/InlinePackaging

2) The installation directory should end in "grilo.0.1", so that when a newer version comes, it can be co-installed. See again eg. dpkg -L qtdeclarative5-friends0.2. This probably needs some qmake .pro files

So:

=== 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-09-09 08:53:42 +0000
@@ -0,0 +1,3 @@
+[BUILDDEB]
+split = True
+

=== modified file 'debian/changelog'
--- debian/changelog 2013-09-09 08:17:06 +0000
+++ debian/changelog 2013-09-09 08:52:42 +0000
@@ -1,4 +1,4 @@
-qtgrilo (0.1) saucy; urgency=low
+qtgrilo (0.1-0ubuntu1) saucy; urgency=low

   * Initial release.

=== modified file 'declarative/declarative.pro'
--- declarative/declarative.pro 2013-08-15 23:52:19 +0000
+++ declarative/declarative.pro 2013-09-09 08:58:18 +0000
@@ -11,7 +11,7 @@
 OTHER_FILES += $${EXAMPLE}

 TARGET = qmlgriloplugin
-PLUGIN_IMPORT_PATH = org/nemomobile/grilo
+PLUGIN_IMPORT_PATH = org/nemomobile/grilo0.1

 SOURCES += griloplugin.cpp grilomodel.cpp griloregistry.cpp grilomedia.cpp grilodatasource.cpp \
            grilobrowse.cpp grilosearch.cpp griloquery.cpp grilomultisearch.cpp

review: Needs Fixing

[lp:~dholbach/qtgrilo/packaging-fixes]

6. By Daniel Holbach on 2013-09-09

Merged packaging fixes

[Daniel Holbach (dholbach)]

Thanks a lot for the review. I applied all your changes.

I'm a bit stuck because https://github.com/nemomobile/qtgrilo/releases just lists 0.0.20130610 as the last release, and lp:qtgrilo contains a bunch of changes on top of that. The version number noted in debian/changelog was 0.1, which does not exist.

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-15 23:52:19 +0000
+++ debian/changelog	2013-09-09 08:38:33 +0000
@@ -1,5 +1,5 @@
-nemo-qml-plugin-qtgrilo (0.1-0ubuntu1) UNRELEASED; urgency=low
+qtgrilo (0.1) saucy; urgency=low
 
-  * Initial release
+  * Initial release.
 
  -- Victor Thompson <[e-mail]>  Thu, 15 Aug 2013 18:12:36 -0500

=== modified file 'debian/control'
--- debian/control	2013-08-15 23:52:19 +0000
+++ debian/control	2013-09-09 08:38:33 +0000
@@ -1,4 +1,4 @@
-Source: nemo-qml-plugin-grilo-qt5
+Source: qtgrilo
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -11,7 +11,7 @@
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 
-Package: qtdeclarative5-nemo-qml-plugin-grilo
+Package: qtdeclarative5-qtgrilo0.1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}

=== modified file 'debian/copyright'
--- debian/copyright	2013-08-15 23:52:19 +0000
+++ debian/copyright	2013-09-09 08:38:33 +0000
@@ -1,10 +1,28 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: nemo-qml-plugin-grilo-qt5
-Source: https://github.com/nemomobile/nemo-qml-plugin-qtgrilo
+Upstream-Name: qtgrilo
+Source: https://github.com/nemomobile/qtgrilo
 
 Files: *
 Copyright: 2013 Nemo Mobile
-License: BSD
+           2012-2013 Jolla Ltd.
+License: LGPL-2.1+
+
+License: LGPL-2.1+
+ 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
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This package 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 Files: debian/*
 Copyright: 2013 Victor Thompson <[e-mail]>
@@ -26,32 +44,3 @@
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-License: BSD-3-clause
- You may use this file under the terms of the BSD license as follows:
- .
- "Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
-   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-     of its contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-