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

[David Planella]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Arto Jalkanen (ajalkane)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-25 13:25:58 +0000
+++ debian/changelog	2015-06-26 19:38:11 +0000
@@ -1,3 +1,9 @@
+ubuntu-filemanager-app (0.4) wily; urgency=medium
+
+  * Renamed PAM module to not conflict with the Terminal one.
+
+ -- David Planella <[e-mail]>  Fri, 26 Jun 2015 20:56:51 +0200
+
 ubuntu-filemanager-app (0.3) trusty; urgency=medium
 
   * Get the click package to run on devices. (LP: #1294301)
 
=== modified file 'debian/control'
--- debian/control	2015-03-10 21:52:56 +0000
+++ debian/control	2015-06-26 19:38:11 +0000
@@ -24,7 +24,7 @@
          ${shlibs:Depends},
          qtdeclarative5-nemo-qml-plugin-folderlistmodel,
          qtdeclarative5-placesmodel0.1,
-         qtdeclarative5-pamauthentication0.1,
+         qtdeclarative5-fm-pamauthentication0.1,
          qtdeclarative5-archives0.1,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-u1db1.0,
@@ -57,7 +57,7 @@
  This package contains a plugin that enables QML apps to list and
  modify a set of places (bookmarks) in the file system.
 
-Package: qtdeclarative5-pamauthentication0.1
+Package: qtdeclarative5-fm-pamauthentication0.1
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
 
=== renamed file 'debian/qtdeclarative5-pamauthentication0.1.install' => 'debian/qtdeclarative5-fm-pamauthentication0.1.install'