content-hub

Merge lp:~ken-vandine/content-hub/api_v1 into lp:content-hub

  1. api_v1
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 130
Merged at revision: 128
Proposed branch: lp:~ken-vandine/content-hub/api_v1
Merge into: lp:content-hub
Prerequisite: lp:~michael-sheldon/content-hub/peer-picker-updates
Diff against target: 65 lines (+16/-3)
5 files modified
CMakeLists.txt (+2/-0)
debian/changelog (+8/-0)
debian/control (+4/-1)
debian/qtdeclarative5-ubuntu-content1.install (+1/-1)
debian/qtdeclarative5-ubuntu-content1.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/content-hub/api_v1
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+227948@code.launchpad.net

Commit message

Renamed the binary package for the qml module to qtdeclarative5-ubuntu-content1
to reflect support for API version 1.x instead of 0.1

Description of the change

Renamed the binary package for the qml module to qtdeclarative5-ubuntu-content1
to reflect support for API version 1.x instead of 0.1

To post a comment you must log in.
lp:~ken-vandine/content-hub/api_v1 updated
129. By Ken VanDine

Added Breaks too

Revision history for this message
Sebastien Bacher (seb128) wrote :

The R,B should be versionned (https://wiki.debian.org/PackageTransition) otherwise looks good, +1 once that's changed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:129
http://jenkins.qa.ubuntu.com/job/content-hub-ci/180/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/180/rebuild

review: Approve (continuous-integration)
lp:~ken-vandine/content-hub/api_v1 updated
130. By Ken VanDine

Added versions for breaks and replaces

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/content-hub-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/181/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine, thanks

review: Approve
lp:~ken-vandine/content-hub/api_v1 updated
131. By Ken VanDine

Don't install plugin in a versioned dir, it provides 0.x and 1.x

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-05-26 06:45:57 +0000
3+++ CMakeLists.txt 2014-08-01 20:03:42 +0000
4@@ -79,6 +79,8 @@
5 set(CONTENT_HUB_VERSION_PATCH 1)
6 set(CONTENT_HUB_VERSION "${CONTENT_HUB_VERSION_MAJOR}.${CONTENT_HUB_VERSION_MINOR}.${CONTENT_HUB_VERSION_PATCH}")
7
8+set(QML_API_VERSION_MAJOR 1)
9+
10 include_directories(include)
11
12 add_subdirectory(doc)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-07-10 20:10:35 +0000
16+++ debian/changelog 2014-08-01 20:03:42 +0000
17@@ -1,3 +1,11 @@
18+content-hub (0.0+14.10.20140710-0ubuntu2) UNRELEASED; urgency=medium
19+
20+ * debian/control
21+ - Renamed the binary for the qml module to qtdeclarative5-ubuntu-content1
22+ to reflect support for API version 1.x instead of 0.1
23+
24+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 22 Jul 2014 15:48:20 -0400
25+
26 content-hub (0.0+14.10.20140710-0ubuntu1) utopic; urgency=low
27
28 [ Ken VanDine ]
29
30=== modified file 'debian/control'
31--- debian/control 2014-05-26 06:45:57 +0000
32+++ debian/control 2014-08-01 20:03:42 +0000
33@@ -59,7 +59,7 @@
34 Description: content sharing development files
35 All the development headers and libraries for the content hub
36
37-Package: qtdeclarative5-ubuntu-content0.1
38+Package: qtdeclarative5-ubuntu-content1
39 Section: libs
40 Architecture: any
41 Pre-Depends: ${misc:Pre-Depends},
42@@ -67,6 +67,9 @@
43 qtdeclarative5-qtquick2-plugin,
44 ${misc:Depends},
45 ${shlibs:Depends},
46+Replaces: qtdeclarative5-ubuntu-content0.1 (<= 0.0+14.10.20140710-0ubuntu1)
47+Provides: qtdeclarative5-ubuntu-content0.1
48+Breaks: qtdeclarative5-ubuntu-content0.1 (<= 0.0+14.10.20140710-0ubuntu1)
49 Description: QML binding for libcontent-hub
50 QML bindings for libcontent-hub
51
52
53=== renamed file 'debian/qtdeclarative5-ubuntu-content0.1.install' => 'debian/qtdeclarative5-ubuntu-content1.install'
54--- debian/qtdeclarative5-ubuntu-content0.1.install 2013-08-23 11:44:18 +0000
55+++ debian/qtdeclarative5-ubuntu-content1.install 2014-08-01 20:03:42 +0000
56@@ -1,1 +1,1 @@
57-usr/lib/*/qt5/qml/Ubuntu/Content/*
58+usr/lib/*/qt5/qml/Ubuntu/Content*
59
60=== renamed file 'debian/qtdeclarative5-ubuntu-content0.1.lintian-overrides' => 'debian/qtdeclarative5-ubuntu-content1.lintian-overrides'
61--- debian/qtdeclarative5-ubuntu-content0.1.lintian-overrides 2013-08-26 21:58:01 +0000
62+++ debian/qtdeclarative5-ubuntu-content1.lintian-overrides 2014-08-01 20:03:42 +0000
63@@ -1,1 +1,1 @@
64-qtdeclarative5-ubuntu-content0.1 binary: pkg-has-shlibs-control-file-but-no-actual-shared-libs
65+qtdeclarative5-ubuntu-content1 binary: pkg-has-shlibs-control-file-but-no-actual-shared-libs

Subscribers

People subscribed via source and target branches