QtDeclarative bindings for the Grilo media scanner

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

  1. packaging-fixes2
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 8
Merged at revision: 7
Proposed branch: lp:~dholbach/qtgrilo/packaging-fixes2
Merge into: lp:qtgrilo
Diff against target: 46 lines (+8/-3)
5 files modified
.bzr-builddeb/default.conf (+3/-0)
debian/changelog (+1/-1)
debian/source/format (+0/-1)
debian/watch (+3/-0)
declarative/declarative.pro (+1/-1)
To merge this branch: bzr merge lp:~dholbach/qtgrilo/packaging-fixes2
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+184521@code.launchpad.net

Description of the change

Applied all changes mentioned in https://code.launchpad.net/~dholbach/qtgrilo/packaging-fixes/+merge/184514

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.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good!

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

With bzr rm debian/source added, though..

lp:~dholbach/qtgrilo/packaging-fixes2 updated
8. By Daniel Holbach

thanks Mirv: changed to no d/source to comply with https://wiki.ubuntu.com/DailyRelease/InlinePackaging

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

+1!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-09-09 09:36:27 +0000
5@@ -0,0 +1,3 @@
6+[BUILDDEB]
7+split = True
8+
9
10=== modified file 'debian/changelog'
11--- debian/changelog 2013-09-09 08:17:06 +0000
12+++ debian/changelog 2013-09-09 09:36:27 +0000
13@@ -1,4 +1,4 @@
14-qtgrilo (0.1) saucy; urgency=low
15+qtgrilo (0.0.20130610-0ubuntu1) saucy; urgency=low
16
17 * Initial release.
18
19
20=== removed directory 'debian/source'
21=== removed file 'debian/source/format'
22--- debian/source/format 2013-08-15 23:52:19 +0000
23+++ debian/source/format 1970-01-01 00:00:00 +0000
24@@ -1,1 +0,0 @@
25-1.0
26
27=== added file 'debian/watch'
28--- debian/watch 1970-01-01 00:00:00 +0000
29+++ debian/watch 2013-09-09 09:36:27 +0000
30@@ -0,0 +1,3 @@
31+version=3
32+https://github.com/nemomobile/qtgrilo/releases \
33+ /nemomobile/qtgrilo/archive/(.+)\.tar\.gz
34
35=== modified file 'declarative/declarative.pro'
36--- declarative/declarative.pro 2013-08-15 23:52:19 +0000
37+++ declarative/declarative.pro 2013-09-09 09:36:27 +0000
38@@ -11,7 +11,7 @@
39 OTHER_FILES += $${EXAMPLE}
40
41 TARGET = qmlgriloplugin
42-PLUGIN_IMPORT_PATH = org/nemomobile/grilo
43+PLUGIN_IMPORT_PATH = org/nemomobile/grilo0.1
44
45 SOURCES += griloplugin.cpp grilomodel.cpp griloregistry.cpp grilomedia.cpp grilodatasource.cpp \
46 grilobrowse.cpp grilosearch.cpp griloquery.cpp grilomultisearch.cpp

Subscribers

People subscribed via source and target branches