Unity

Merge lp://staging/~azzar1/unity/fix-lp-1305440 into lp://staging/unity

fix-lp-1305440
Merge into trunk

Proposed by Andrea Azzarone on 2014-06-19

Status:

Merged

Approved by:

Marco Trevisan (Treviño) on 2014-07-29

Approved revision:

no longer in the source branch.

Merged at revision:

3859

Proposed branch:

lp://staging/~azzar1/unity/fix-lp-1305440

Merge into:

lp://staging/unity

Prerequisite:

lp://staging/~3v1n0/unity/handle-gtk3.12-deprecations

Diff against target:

69 lines (+8/-3)

7 files modified

CMakeLists.txt (+1/-0)
data/CMakeLists.txt (+1/-0)
data/pam/CMakeLists.txt (+1/-0)
data/pam/unity (+2/-0)
debian/rules (+1/-1)
debian/unity.install (+1/-0)
lockscreen/UserAuthenticatorPam.cpp (+1/-2)

To merge this branch:

bzr merge lp://staging/~azzar1/unity/fix-lp-1305440

Related bugs:

Bug #1305440: Allow a distinct pam config file for greeter and for lock-screen

Medium

Fix Released

Remove

Link a bug report

Reviewer	Review Type	Date Requested	Status
Stephen M. Webb (community)		2014-06-19	Approve on 2014-08-11
Marco Trevisan (Treviño)		2014-06-19	Approve on 2014-07-29
PS Jenkins bot (community)	continuous-integration	2014-06-19	Approve on 2014-07-29
Review via email: mp+223746@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-05-27.

Commit message

Allow a distinct pam config file for greeter and for lock-screen.

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2014-05-27: Posted in a previous version of this proposal

#

Fine enough!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-27: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:3811
http://jenkins.qa.ubuntu.com/job/unity-ci/933/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/20/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Stephen M. Webb (bregma) wrote on 2014-06-05: Posted in a previous version of this proposal

#

Please fix the packaging (see the Jenkins build failures)

review: Needs Fixing

Revision history for this message

Andrea Azzarone (azzar1) wrote on 2014-06-13: Posted in a previous version of this proposal

#

I cannot see the failure anymore!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-18: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:3812
http://jenkins.qa.ubuntu.com/job/unity-ci/970/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/57/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2014-06-18: Posted in a previous version of this proposal

#

The only errors I see here are related to jenkins failure due to deprecated gtk functions, that is fixed in lp:~3v1n0/unity/handle-gtk3.12-deprecations

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:3813
http://jenkins.qa.ubuntu.com/job/unity-ci/976/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/63/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:3814
http://jenkins.qa.ubuntu.com/job/unity-ci/977/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/64/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:3815
http://jenkins.qa.ubuntu.com/job/unity-ci/978/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/65/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19:

#

FAILED: Continuous integration, rev:3816
http://jenkins.qa.ubuntu.com/job/unity-ci/979/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/66/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19:

#

FAILED: Continuous integration, rev:3817
http://jenkins.qa.ubuntu.com/job/unity-ci/980/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/67/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19:

#

FAILED: Continuous integration, rev:3818
http://jenkins.qa.ubuntu.com/job/unity-ci/981/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/68/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-19:

#

FAILED: Continuous integration, rev:3819
http://jenkins.qa.ubuntu.com/job/unity-ci/982/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/69/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-27:

#

FAILED: Continuous integration, rev:3819
http://jenkins.qa.ubuntu.com/job/unity-ci/987/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/74/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Stephen M. Webb (bregma) wrote on 2014-07-05:

#

Need to add -DCMAKE_SYSCONFDIR=/etc to cmake_base_options in debian/rules.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-29:

#

PASSED: Continuous integration, rev:3820
http://jenkins.qa.ubuntu.com/job/unity-ci/1036/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/123

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

review: Approve (continuous-integration)

Revision history for this message

Andrea Azzarone (azzar1) wrote on 2014-07-29:

#

Done!

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2014-07-29:

#

Yay!

I guess there's not need to add dependency on libpam-gnome-keyring as ubuntu-desktop depends on it already.

review: Approve

Revision history for this message

Stephen M. Webb (bregma) wrote on 2014-08-11:

#

Scheduled for the next landing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Alin Andrei

Alvaro Leal (Effenberg0x0)

Andrea Azzarone

Brandon Schaefer

Christopher Townsend

DX Unity Bugs

Jason Armstrong

Joey-Elijah Sneddon

Kai-Heng Feng

Loïc Molinari

MC Return

Marco Trevisan (Treviño)

Olli Ries

Rahul

Sathishkumar D

Stephen Matthews

Unity Team

deaunapaul

to status/vote changes:

Jim Romines