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

Proposed by Daniel Holbach
Status: Merged
Approved by: David Planella
Approved revision: no longer in the source branch.
Merged at revision: 6
Proposed branch: lp://staging/~dholbach/qtgrilo/packaging-fixes
Merge into: lp://staging/qtgrilo
Diff against target: 99 lines (+25/-36)
3 files modified
debian/changelog (+2/-2)
debian/control (+2/-2)
debian/copyright (+21/-32)
To merge this branch: bzr merge lp://staging/~dholbach/qtgrilo/packaging-fixes
Reviewer Review Type Date Requested Status
Timo Jyrinki Needs Fixing
David Planella Approve
Ken VanDine Pending
Review via email: mp+184514@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

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

review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :

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

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

Revision history for this message
Daniel Holbach (dholbach) wrote :

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

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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
6. By Daniel Holbach

Merged packaging fixes

Revision history for this message
Daniel Holbach (dholbach) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches