Ubuntu File Manager App

Merge lp:~dpm/ubuntu-filemanager-app/rename-pam-package into lp:ubuntu-filemanager-app

  1. rename-pam-package
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: David Planella
Approved revision: 426
Merged at revision: 430
Proposed branch: lp:~dpm/ubuntu-filemanager-app/rename-pam-package
Merge into: lp:ubuntu-filemanager-app
Diff against target: 37 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~dpm/ubuntu-filemanager-app/rename-pam-package
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+263162@code.launchpad.net

Commit message

Rename the PAM authentication plugin binary package so that it can coexist with the Terminal app's one in the same PPA.

Description of the change

Rename the PAM authentication plugin binary package so that it can coexist with the Terminal app's one in the same PPA.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:426
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpm/ubuntu-filemanager-app/rename-pam-package/+merge/263162/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/500/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3019
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3019/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/216
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/122

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/500/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

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 2014-04-25 13:25:58 +0000
3+++ debian/changelog 2015-06-26 19:38:11 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-filemanager-app (0.4) wily; urgency=medium
6+
7+ * Renamed PAM module to not conflict with the Terminal one.
8+
9+ -- David Planella <david.planella@ubuntu.com> Fri, 26 Jun 2015 20:56:51 +0200
10+
11 ubuntu-filemanager-app (0.3) trusty; urgency=medium
12
13 * Get the click package to run on devices. (LP: #1294301)
14
15=== modified file 'debian/control'
16--- debian/control 2015-03-10 21:52:56 +0000
17+++ debian/control 2015-06-26 19:38:11 +0000
18@@ -24,7 +24,7 @@
19 ${shlibs:Depends},
20 qtdeclarative5-nemo-qml-plugin-folderlistmodel,
21 qtdeclarative5-placesmodel0.1,
22- qtdeclarative5-pamauthentication0.1,
23+ qtdeclarative5-fm-pamauthentication0.1,
24 qtdeclarative5-archives0.1,
25 qtdeclarative5-qtquick2-plugin,
26 qtdeclarative5-u1db1.0,
27@@ -57,7 +57,7 @@
28 This package contains a plugin that enables QML apps to list and
29 modify a set of places (bookmarks) in the file system.
30
31-Package: qtdeclarative5-pamauthentication0.1
32+Package: qtdeclarative5-fm-pamauthentication0.1
33 Architecture: any
34 Multi-Arch: same
35 Depends: ${misc:Depends},
36
37=== renamed file 'debian/qtdeclarative5-pamauthentication0.1.install' => 'debian/qtdeclarative5-fm-pamauthentication0.1.install'

Subscribers

People subscribed via source and target branches