click

Merge lp:click/devel into lp:click

  1. devel
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Approved by: Michael Vogt
Approved revision: 542
Merged at revision: 448
Proposed branch: lp:click/devel
Merge into: lp:click
Diff against target: 407 lines (+98/-49)
11 files modified
click/chroot.py (+15/-0)
click/commands/chroot.py (+14/-2)
click/commands/info.py (+2/-2)
click/tests/Makefile.am (+1/-0)
click/tests/integration/test_info.py (+9/-1)
click/tests/preload.h (+14/-38)
debian/changelog (+33/-0)
debian/click.postinst (+4/-0)
debian/control (+3/-3)
debian/rules (+1/-1)
doc/manpage.rst (+2/-2)
To merge this branch: bzr merge lp:click/devel
Reviewer Review Type Date Requested Status
Michael Vogt Approve
PS Jenkins bot (community) continuous-integration Approve
Colin Watson Approve
Review via email: mp+240104@code.launchpad.net

Commit message

Click 0.4.34: systemd fixes, chroot improvements, sdk updates, packaging improvements

Description of the change

  * Demote ubuntu-app-launch-tools from a click recommends to a suggests,
    since they are not needed on server installs.
  * Use dh-systemd to enable click system and user hook integration
    (LP: #1379657).
  * add ubuntu-sdk-15.04 based on ubuntu-sdk-libs/ubuntu-sdk-libs-dev
  * Make "click info" always try opening the input file as a package and
    only try to interpret it as a file in an installed package if that
    fails, rather than guessing by the input file extension.
  * Allow "click chroot install" and "click chroot upgrade" to operate on
    sessions.
  * Adds internationalization tools and CMake macros required by the
    new Qt Creator app and scope templates that provide internationalization
    code.
  * Include Canonical's cmake-extras project in the schroot.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/click-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/22/rebuild

review: Approve (continuous-integration)
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
lp:click/devel updated
540. By Michael Vogt

* click/tests/preload.h:
  - replace deprecated "Attributes:" with annotations on the
    identifier

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

PASSED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/click-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/23/rebuild

review: Approve (continuous-integration)
lp:click/devel updated
541. By Michael Vogt

bump version number for citrain

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

PASSED: Continuous integration, rev:541
http://jenkins.qa.ubuntu.com/job/click-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/24/rebuild

review: Approve (continuous-integration)
lp:click/devel updated
542. By Michael Vogt

* click/tests/Makefile.am:
  - add --libtool to g-ir-scanner so that it uses the generated
    libtool instead of the system libtool which is now part of
    the libtool-bin package in vivid

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

PASSED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/click-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/25/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Vogt (mvo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/chroot.py'
2--- click/chroot.py 2014-09-29 11:11:20 +0000
3+++ click/chroot.py 2014-11-03 12:41:21 +0000
4@@ -38,12 +38,18 @@
5
6 framework_base = {
7 "ubuntu-sdk-13.10": "ubuntu-sdk-13.10",
8+ # 14.04
9 "ubuntu-sdk-14.04-html": "ubuntu-sdk-14.04",
10 "ubuntu-sdk-14.04-papi": "ubuntu-sdk-14.04",
11 "ubuntu-sdk-14.04-qml": "ubuntu-sdk-14.04",
12+ # 14.10
13 "ubuntu-sdk-14.10-html": "ubuntu-sdk-14.10",
14 "ubuntu-sdk-14.10-papi": "ubuntu-sdk-14.10",
15 "ubuntu-sdk-14.10-qml": "ubuntu-sdk-14.10",
16+ # 15.04
17+ "ubuntu-sdk-15.04-html": "ubuntu-sdk-15.04",
18+ "ubuntu-sdk-15.04-papi": "ubuntu-sdk-15.04",
19+ "ubuntu-sdk-15.04-qml": "ubuntu-sdk-15.04",
20 }
21
22
23@@ -51,6 +57,7 @@
24 "ubuntu-sdk-13.10": "saucy",
25 "ubuntu-sdk-14.04": "trusty",
26 "ubuntu-sdk-14.10": "utopic",
27+ "ubuntu-sdk-15.04": "vivid",
28 }
29
30
31@@ -78,6 +85,7 @@
32 "ubuntu-sdk-14.04": [
33 "cmake",
34 "google-mock:TARGET",
35+ "intltool",
36 "libboost1.54-dev:TARGET",
37 "libjsoncpp-dev:TARGET",
38 "libprocess-cpp-dev:TARGET",
39@@ -104,7 +112,9 @@
40 ],
41 "ubuntu-sdk-14.10": [
42 "cmake",
43+ "cmake-extras",
44 "google-mock:TARGET",
45+ "intltool",
46 "libboost1.55-dev:TARGET",
47 "libcontent-hub-dev:TARGET",
48 "libjsoncpp-dev:TARGET",
49@@ -154,6 +164,11 @@
50 "ubuntu-html5-theme:TARGET",
51 "ubuntu-ui-toolkit-doc",
52 ],
53+ "ubuntu-sdk-15.04": [
54+ # the sdk libs
55+ "ubuntu-sdk-libs:TARGET",
56+ "ubuntu-sdk-libs-dev:TARGET",
57+ ],
58 }
59
60
61
62=== modified file 'click/commands/chroot.py'
63--- click/commands/chroot.py 2014-09-25 14:26:39 +0000
64+++ click/commands/chroot.py 2014-11-03 12:41:21 +0000
65@@ -72,7 +72,9 @@
66
67 def install(parser, args):
68 packages = args.packages
69- chroot = ClickChroot(args.architecture, args.framework, name=args.name)
70+ chroot = ClickChroot(
71+ args.architecture, args.framework, name=args.name,
72+ session=args.session)
73 with message_on_error(
74 ClickChrootDoesNotExistException, ErrorMessages.NOT_EXISTS):
75 return chroot.install(*packages)
76@@ -120,7 +122,9 @@
77
78
79 def upgrade(parser, args):
80- chroot = ClickChroot(args.architecture, args.framework, name=args.name)
81+ chroot = ClickChroot(
82+ args.architecture, args.framework, name=args.name,
83+ session=args.session)
84 with message_on_error(
85 ClickChrootDoesNotExistException, ErrorMessages.NOT_EXISTS):
86 return chroot.upgrade()
87@@ -194,11 +198,19 @@
88 upgrade_parser = subparsers.add_parser(
89 "upgrade",
90 help="upgrade the chroot")
91+ upgrade_parser.add_argument(
92+ "-n", "--session-name",
93+ dest='session',
94+ help="persistent chroot session name to upgrade")
95 upgrade_parser.set_defaults(func=upgrade)
96 install_parser = subparsers.add_parser(
97 "install",
98 help="install packages in the chroot")
99 install_parser.add_argument(
100+ "-n", "--session-name",
101+ dest='session',
102+ help="persistent chroot session name to install packages in")
103+ install_parser.add_argument(
104 "packages", nargs="+",
105 help="packages to install")
106 install_parser.set_defaults(func=install)
107
108=== modified file 'click/commands/info.py'
109--- click/commands/info.py 2014-08-08 10:13:30 +0000
110+++ click/commands/info.py 2014-11-03 12:41:21 +0000
111@@ -49,12 +49,12 @@
112 if registry.has_package_name(arg):
113 return json_object_to_python(registry.get_manifest(arg))
114
115- if arg.endswith(".click"):
116+ try:
117 with closing(DebFile(filename=arg)) as package:
118 with package.control.get_file(
119 "manifest", encoding="UTF-8") as manifest_file:
120 return _load_manifest(manifest_file)
121- else:
122+ except Exception:
123 pkgdir = Click.find_package_directory(arg)
124 manifest_path = glob.glob(
125 os.path.join(pkgdir, ".click", "info", "*.manifest"))
126
127=== modified file 'click/tests/Makefile.am'
128--- click/tests/Makefile.am 2014-07-09 12:56:21 +0000
129+++ click/tests/Makefile.am 2014-11-03 12:41:21 +0000
130@@ -8,6 +8,7 @@
131 --pkg click-0.4 \
132 -I$(top_builddir)/lib/click -L$(top_builddir)/lib/click \
133 --accept-unprefixed --warn-all \
134+ --libtool "$(LIBTOOL)" \
135 $< --output $@
136
137 noinst_SCRIPTS = test_paths.py
138
139=== modified file 'click/tests/integration/test_info.py'
140--- click/tests/integration/test_info.py 2014-09-05 09:08:31 +0000
141+++ click/tests/integration/test_info.py 2014-11-03 12:41:21 +0000
142@@ -30,7 +30,6 @@
143 self.click_binary, "info", path_to_click], universal_newlines=True)
144 self.assertEqual(name, json.loads(output)["name"])
145
146-
147 def test_info_installed_click(self):
148 name = "com.example.foo"
149 user = os.environ.get("USER", "root")
150@@ -55,3 +54,12 @@
151 "/opt/click.ubuntu.com/%s/%s/README" % (name, version)],
152 universal_newlines=True)
153 self.assertEqual(name, json.loads(output)["name"])
154+
155+ def test_info_different_extension(self):
156+ name = "org.example.info"
157+ raw_path = self._make_click(name)
158+ path = "%s.extra" % raw_path
159+ os.rename(raw_path, path)
160+ output = subprocess.check_output([
161+ self.click_binary, "info", path], universal_newlines=True)
162+ self.assertEqual(name, json.loads(output)["name"])
163
164=== modified file 'click/tests/preload.h'
165--- click/tests/preload.h 2014-05-30 09:09:20 +0000
166+++ click/tests/preload.h 2014-11-03 12:41:21 +0000
167@@ -6,16 +6,12 @@
168 #include "click.h"
169
170 /**
171- * chown:
172- *
173- * Attributes: (headers unistd.h)
174+ * chown: (attributes headers=unistd.h)
175 */
176 extern int chown (const char *file, uid_t owner, gid_t group);
177
178 /**
179- * geteuid:
180- *
181- * Attributes: (headers sys/types.h,unistd.h)
182+ * geteuid: (attributes headers=sys/types.h,unistd.h)
183 */
184 extern uid_t geteuid (void);
185
186@@ -23,39 +19,32 @@
187 * uint32_t on all glibc platforms.
188 */
189 /**
190- * mkdir:
191+ * mkdir: (attributes headers=sys/stat.h,sys/types.h)
192 * @mode: (type guint32)
193- *
194- * Attributes: (headers sys/stat.h,sys/types.h)
195 */
196 extern int mkdir (const char *pathname, mode_t mode);
197
198 /**
199- * getpwnam:
200+ * getpwnam: (attributes headers=sys/types.h,pwd.h)
201 *
202- * Attributes: (headers sys/types.h,pwd.h)
203 * Returns: (transfer none):
204 */
205 extern struct passwd *getpwnam (const char *name);
206
207 /**
208- * under_under_xstat:
209- *
210- * Attributes: (headers sys/types.h,sys/stat.h,unistd.h)
211+ * under_under_xstat: (attributes headers=sys/types.h,sys/stat.h,unistd.h)
212 */
213 extern int under_under_xstat (int ver, const char *pathname, struct stat *buf);
214
215 /**
216- * under_under_xstat64:
217- *
218- * Attributes: (headers sys/types.h,sys/stat.h,unistd.h)
219+ * under_under_xstat64: (Attributes headers=sys/types.h,sys/stat.h,unistd.h)
220 */
221 extern int under_under_xstat64 (int ver, const char *pathname, struct stat64 *buf);
222
223 const gchar *g_get_user_name (void);
224
225 /**
226- * g_spawn_sync:
227+ * g_spawn_sync: (attributes headers=glib.h)
228 * @argv: (array zero-terminated=1):
229 * @envp: (array zero-terminated=1):
230 * @flags: (type gint)
231@@ -63,8 +52,6 @@
232 * @standard_output: (out) (array zero-terminated=1) (element-type guint8):
233 * @standard_error: (out) (array zero-terminated=1) (element-type guint8):
234 * @exit_status: (out):
235- *
236- * Attributes: (headers glib.h)
237 */
238 gboolean g_spawn_sync (const gchar *working_directory,
239 gchar **argv,
240@@ -78,45 +65,34 @@
241 GError **error);
242
243 /**
244- * click_find_on_path:
245- *
246- * Attributes: (headers glib.h)
247+ * click_find_on_path: (attributes headers=glib.h)
248 */
249 gboolean click_find_on_path (const gchar *command);
250
251 /**
252- * click_get_db_dir:
253- *
254- * Attributes: (headers glib.h)
255+ * click_get_db_dir: (attributes headers=glib.h)
256 */
257 gchar *click_get_db_dir (void);
258
259 /**
260- * click_get_frameworks_dir:
261- *
262- * Attributes: (headers glib.h)
263+ * click_get_frameworks_dir: (attributes headers=glib.h)
264 */
265 gchar *click_get_frameworks_dir (void);
266
267 /**
268- * click_get_hooks_dir:
269- *
270- * Attributes: (headers glib.h)
271+ * click_get_hooks_dir: (attributes headers=glib.h)
272 */
273 gchar *click_get_hooks_dir (void);
274
275 /**
276- * click_get_user_home:
277- *
278- * Attributes: (headers glib.h)
279+ * click_get_user_home: (attributes headers=glib.h)
280 */
281 gchar *click_get_user_home (const gchar *user_name);
282
283 /**
284- * click_package_install_hooks:
285+ * click_package_install_hooks: (attributes headers=glib.h,click.h)
286+
287 * @db: (type gpointer)
288- *
289- * Attributes: (headers glib.h,click.h)
290 */
291 void click_package_install_hooks (ClickDB *db, const gchar *package,
292 const gchar *old_version,
293
294=== modified file 'debian/changelog'
295--- debian/changelog 2014-09-29 14:18:41 +0000
296+++ debian/changelog 2014-11-03 12:41:21 +0000
297@@ -1,3 +1,36 @@
298+click (0.4.34.2) UNRELEASED; urgency=medium
299+
300+ [ Michael Vogt ]
301+ * Demote ubuntu-app-launch-tools from a click recommends to a suggests,
302+ since they are not needed on server installs.
303+ * Use dh-systemd to enable click system and user hook integration
304+ (LP: #1379657).
305+ * add ubuntu-sdk-15.04 based on ubuntu-sdk-libs/ubuntu-sdk-libs-dev
306+ * click/tests/preload.h:
307+ - replace deprecated "Attributes:" with annotations on the
308+ identifier
309+ * click/tests/Makefile.am:
310+ - add --libtool to g-ir-scanner so that it uses the generated
311+ libtool instead of the system libtool which is now part of
312+ the libtool-bin package in vivid
313+
314+ [ Colin Watson ]
315+ * Make "click info" always try opening the input file as a package and
316+ only try to interpret it as a file in an installed package if that
317+ fails, rather than guessing by the input file extension.
318+ * Allow "click chroot install" and "click chroot upgrade" to operate on
319+ sessions.
320+
321+ [ David Planella ]
322+ * Adds internationalization tools and CMake macros required by the
323+ new Qt Creator app and scope templates that provide internationalization
324+ code.
325+
326+ [ Pete Woods ]
327+ * Include Canonical's cmake-extras project in the schroot.
328+
329+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Oct 2014 12:20:26 +0100
330+
331 click (0.4.33) utopic; urgency=medium
332
333 [ Pete Woods ]
334
335=== modified file 'debian/click.postinst'
336--- debian/click.postinst 2013-06-27 14:30:15 +0000
337+++ debian/click.postinst 2014-11-03 12:41:21 +0000
338@@ -10,6 +10,10 @@
339
340 mkdir -p -m 755 /opt/click.ubuntu.com
341 chown clickpkg:clickpkg /opt/click.ubuntu.com
342+
343+ # dh-systemd has no support yet for user systemd units
344+ # so we need to do this manually here
345+ systemctl --global enable click-user-hooks.service || true
346 fi
347
348 #DEBHELPER#
349
350=== modified file 'debian/control'
351--- debian/control 2014-09-05 09:39:06 +0000
352+++ debian/control 2014-11-03 12:41:21 +0000
353@@ -3,7 +3,7 @@
354 Priority: optional
355 Maintainer: Colin Watson <cjwatson@ubuntu.com>
356 Standards-Version: 3.9.5
357-Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage, python3-six
358+Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage, python3-six, dh-systemd (>= 1.3)
359 Vcs-Bzr: https://code.launchpad.net/~ubuntu-managed-branches/click/click
360 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-managed-branches/click/click/files
361 X-Auto-Uploader: no-rewrite-version
362@@ -15,8 +15,8 @@
363 Architecture: any
364 Pre-Depends: ${misc:Pre-Depends}
365 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click (= ${binary:Version}), adduser
366-Recommends: click-apparmor, ubuntu-app-launch-tools | upstart-app-launch-tools
367-Suggests: click-reviewers-tools (>= 0.9)
368+Recommends: click-apparmor
369+Suggests: click-reviewers-tools (>= 0.9), ubuntu-app-launch-tools | upstart-app-launch-tools
370 Conflicts: click-package
371 Replaces: click-package
372 Provides: click-package
373
374=== modified file 'debian/rules'
375--- debian/rules 2014-06-30 16:48:31 +0000
376+++ debian/rules 2014-11-03 12:41:21 +0000
377@@ -12,7 +12,7 @@
378 export DEB_LDFLAGS_MAINT_STRIP := -Wl,-Bsymbolic-functions
379
380 %:
381- dh $@ --with autoreconf,gir,python3,sphinxdoc \
382+ dh $@ --with autoreconf,gir,python3,sphinxdoc,systemd \
383 --buildsystem autoconf $(EXTRA_DH_OPTIONS)
384
385 PY3REQUESTED := $(shell py3versions -r)
386
387=== modified file 'doc/manpage.rst'
388--- doc/manpage.rst 2014-09-10 11:50:18 +0000
389+++ doc/manpage.rst 2014-11-03 12:41:21 +0000
390@@ -124,7 +124,7 @@
391 end-session SESSION
392 End a persistent chroot session.
393
394-install PACKAGES
395+install [-n SESSION] PACKAGES
396 Install packages in the chroot.
397
398 maint [-n SESSION] COMMAND ARGUMENTS
399@@ -143,7 +143,7 @@
400 session must previously have been created by ``click chroot
401 begin-session``.
402
403-upgrade
404+upgrade [-n SESSION]
405 Upgrade the chroot.
406
407 click contents PATH

Subscribers

People subscribed via source and target branches

to all changes: