Merge lp:~sil2100/content-hub/packaging_review into lp:~content-hub-team/content-hub/trunk

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Ken VanDine
Approved revision: 15
Merged at revision: 14
Proposed branch: lp:~sil2100/content-hub/packaging_review
Merge into: lp:~content-hub-team/content-hub/trunk
Diff against target: 152 lines (+58/-20)
6 files modified
debian/changelog (+4/-0)
debian/control (+30/-17)
debian/copyright (+19/-1)
debian/libcontent-hub-dev.install (+1/-0)
debian/libcontent-hub0.install (+1/-1)
debian/rules (+3/-1)
To merge this branch: bzr merge lp:~sil2100/content-hub/packaging_review
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+181622@code.launchpad.net

Commit message

Packaging review

Description of the change

Packaging review, work in progress.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, did you manage to build it? it complains about missing directores here (acceptance_tests, services)

> qtdeclarative5-content-hub-0.0

that should be "hub0.0" without the "-" ... in fact the code is "import Ubuntu.Content 0.1", shouldn't it be named "qtdeclarative5-ubuntu-content0.1"?

review: Needs Fixing
13. By Łukasz Zemczak

Changed the plugin name

14. By Łukasz Zemczak

Rename the plugin again

15. By Łukasz Zemczak

.install file too...

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

looks good, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-13 13:20:55 +0000
3+++ debian/changelog 2013-08-23 11:49:27 +0000
4@@ -1,5 +1,9 @@
5 content-hub (0.0-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Ken VanDine ]
8 * Initial package
9
10+ [ Łukasz 'sil2100' Zemczak ]
11+ * Automatic snapshot from revision 10 (bootstrap)
12+
13 -- Ken VanDine <ken.vandine@canonical.com> Mon, 12 Aug 2013 15:51:35 -0400
14
15=== modified file 'debian/control'
16--- debian/control 2013-08-22 14:15:27 +0000
17+++ debian/control 2013-08-23 11:49:27 +0000
18@@ -1,5 +1,5 @@
19 Source: content-hub
20-Priority: extra
21+Priority: optional
22 Maintainer: Ken VanDine <ken.vandine@canonical.com>
23 Build-Depends: cmake,
24 debhelper (>= 9),
25@@ -15,32 +15,44 @@
26 Standards-Version: 3.9.4
27 Section: libs
28 Homepage: https://launchpad.net/content-hub
29+# If you aren't a member of ~phablet-team but need to upload packaging changes,
30+# just go ahead. ~phablet-team will notice and sync up the code again.
31+Vcs-Bzr: https://code.launchpad.net/~phablet-team/content-hub/trunk
32+Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/content-hub/trunk/files
33
34 Package: content-hub
35 Architecture: any
36 Depends: ${misc:Depends},
37 ${shlibs:Depends},
38-Description: <insert up to 60 chars description>
39- <insert long description, indented with spaces>
40+Description: content sharing/picking service
41+ Content sharing/picking infrastructure and service, designed to allow apps to
42+ securely and efficiently exchange content.
43+ This package includes the content sharing service.
44+
45+Package: libcontent-hub0
46+Section: libs
47+Architecture: any
48+Multi-Arch: same
49+Pre-Depends: ${misc:Pre-Depends}
50+Depends: ${misc:Depends},
51+ ${shlibs:Depends},
52+Description: content sharing/picking library
53+ Content sharing/picking infrastructure and service, designed to allow apps to
54+ securely and efficiently exchange content.
55+ This package includes the content sharing libraries.
56
57 Package: libcontent-hub-dev
58 Section: libdevel
59 Architecture: any
60+Multi-Arch: same
61+Pre-Depends: ${misc:Pre-Depends}
62 Depends: ${misc:Depends},
63 ${shlibs:Depends},
64 libcontent-hub0 (= ${binary:Version}),
65-Description: <insert up to 60 chars description>
66- <insert long description, indented with spaces>
67-
68-Package: libcontent-hub0
69-Section: libs
70-Architecture: any
71-Depends: ${misc:Depends},
72- ${shlibs:Depends},
73-Description: <insert up to 60 chars description>
74- <insert long description, indented with spaces>
75-
76-Package: qtdeclarative5-content-hub-plugin
77+Description: content sharing development files
78+ All the development headers and libraries for the content hub
79+
80+Package: qtdeclarative5-ubuntu-content0.1
81 Section: libs
82 Architecture: any
83 Depends: ${shlibs:Depends},
84@@ -54,5 +66,6 @@
85 Section: doc
86 Architecture: all
87 Depends: ${misc:Depends},
88-Description: <insert up to 60 chars description>
89- <insert long description, indented with spaces>
90+ libcontent-hub-dev (>= ${source:Version}),
91+Description: Documentation files for libcontent-hub-dev
92+ Documentation files for the libcontent-hub development
93
94=== modified file 'debian/copyright'
95--- debian/copyright 2013-08-13 13:20:55 +0000
96+++ debian/copyright 2013-08-23 11:49:27 +0000
97@@ -19,4 +19,22 @@
98 along with this program. If not, see <http://www.gnu.org/licenses/>.
99 .
100 On Debian systems, the complete text of the GNU Lesser General
101- Public License can be found in "/usr/share/common-licenses/LGPL-3".
102+ Public License can be found in /usr/share/common-licenses/LGPL-3.
103+
104+Files: src/com/ubuntu/content/service/* tests/acceptance-tests/*
105+Copyright: 2013 Canonical Ltd.
106+License: GPL-3.0
107+ This program is free software: you can redistribute it and/or modify
108+ it under the terms of the GNU General Public License as published by
109+ the Free Software Foundation, version 3 of the License.
110+ .
111+ This program is distributed in the hope that it will be useful,
112+ but WITHOUT ANY WARRANTY; without even the implied warranty of
113+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
114+ GNU General Public License for more details.
115+ .
116+ You should have received a copy of the GNU General Public License
117+ along with this program. If not, see <http://www.gnu.org/licenses/>.
118+ .
119+ On Debian systems, the full text of the GNU General Public License
120+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
121
122=== modified file 'debian/libcontent-hub-dev.install'
123--- debian/libcontent-hub-dev.install 2013-08-21 12:08:58 +0000
124+++ debian/libcontent-hub-dev.install 2013-08-23 11:49:27 +0000
125@@ -1,1 +1,2 @@
126+usr/lib/*/libcontent-hub.so
127 usr/include
128
129=== modified file 'debian/libcontent-hub0.install'
130--- debian/libcontent-hub0.install 2013-08-22 12:21:17 +0000
131+++ debian/libcontent-hub0.install 2013-08-23 11:49:27 +0000
132@@ -1,2 +1,2 @@
133-usr/lib/*/lib*.so*
134+usr/lib/*/lib*.so.*
135
136
137=== renamed file 'debian/qtdeclarative5-content-hub-plugin.install' => 'debian/qtdeclarative5-ubuntu-content0.1.install'
138=== modified file 'debian/rules'
139--- debian/rules 2013-08-13 13:20:55 +0000
140+++ debian/rules 2013-08-23 11:49:27 +0000
141@@ -4,8 +4,10 @@
142 # Uncomment this to turn on verbose mode.
143 #export DH_VERBOSE=1
144
145+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
146+
147 %:
148- dh $@ -- -B build
149+ dh $@ --fail-missing -- -B build
150
151 override_dh_auto_test:
152 dbus-test-runner -t make -p "-C" -p "build" -p test

Subscribers

People subscribed via source and target branches