click

Merge lp://staging/click/devel into lp://staging/click

devel
Merge into trunk

Proposed by Michael Vogt on 2014-10-30

Status:

Merged

Approved by:

Michael Vogt on 2014-11-03

Approved revision:

542

Merged at revision:

448

Proposed branch:

lp://staging/click/devel

Merge into:

lp://staging/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://staging/click/devel

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Vogt (community)			Approve on 2014-11-03
PS Jenkins bot (community)	continuous-integration		Approve on 2014-11-03
Colin Watson (community)		2014-10-30	Approve on 2014-10-30
Review via email: mp+240104@code.staging.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.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-30:

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) on 2014-10-30:

review: Approve

lp://staging/click/devel updated on 2014-11-03

540. By Michael Vogt on 2014-11-03: * click/tests/preload.h:
- replace deprecated "Attributes:" with annotations on the
identifier

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-03:

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://staging/click/devel updated on 2014-11-03

541. By Michael Vogt on 2014-11-03: bump version number for citrain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-03:

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://staging/click/devel updated on 2014-11-03

542. By Michael Vogt on 2014-11-03: * 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