[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:ubuntu-terminal-app

2016-09-29 Thread noreply 
The proposal to merge lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into 
lp:ubuntu-terminal-app has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~michael-sheldon/ubuntu-terminal-app/fix-1628781/+merge/307172
-- 
Your team Ubuntu Terminal Developers is subscribed to branch 
lp:ubuntu-terminal-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp

[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:ubuntu-terminal-app

2016-09-29 Thread David Planella 
The proposal to merge lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into 
lp:ubuntu-terminal-app has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~michael-sheldon/ubuntu-terminal-app/fix-1628781/+merge/307172
-- 
Your team Ubuntu Terminal Developers is subscribed to branch 
lp:ubuntu-terminal-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp

Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:ubuntu-terminal-app

2016-09-29 Thread David Planella 
Review: Approve

Thanks from someone who got bitten by this yesterday :)
-- 
https://code.launchpad.net/~michael-sheldon/ubuntu-terminal-app/fix-1628781/+merge/307172
Your team Ubuntu Terminal Developers is subscribed to branch 
lp:ubuntu-terminal-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp

Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:ubuntu-terminal-app

2016-09-29 Thread Jenkins Bot 
Review: Approve continuous-integration

PASSED: Continuous integration, rev:217
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/61/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/977/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/61/rebuild

-- 
https://code.launchpad.net/~michael-sheldon/ubuntu-terminal-app/fix-1628781/+merge/307172
Your team Ubuntu Terminal Developers is requested to review the proposed merge 
of lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into 
lp:ubuntu-terminal-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp

[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:ubuntu-terminal-app

2016-09-29 Thread Michael Sheldon 
Michael Sheldon has proposed merging 
lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:ubuntu-terminal-app.

Commit message:
Add transitional packages for qml-module renaming

Requested reviews:
  Ubuntu Terminal Developers (ubuntu-terminal-dev)
Related bugs:
  Bug #1628781 in Ubuntu Terminal App: "Incorrect package rename handling 
causes file overwrite errors on upgrade"
  https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1628781

For more details, see:
https://code.launchpad.net/~michael-sheldon/ubuntu-terminal-app/fix-1628781/+merge/307172

Add transitional packages for qml-module renaming
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge 
of lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into 
lp:ubuntu-terminal-app.
=== modified file 'debian/control'
--- debian/control	2016-09-20 17:21:48 +
+++ debian/control	2016-09-29 12:38:08 +
@@ -30,22 +30,54 @@
 Description: Terminal application
  Core Terminal application
 
+Package: qtdeclarative5-qmltermwidget1.0
+Architecture: any
+Multi-Arch: same
+Depends: qml-module-qmltermwidget1.0,
+ ${misc:Depends},
+ ${shlibs:Depends},
+ ${misc:Pre-Depends},
+Description: Transitional dummy package for QMLTermWidget QML plugin.
+ This package contains the QMLTermWidget terminal emulator plugin
+ for Qt Qml.
+ .
+ This is a transitional dummy package for qml-module-qmltermwidget1.0
+ which can be safely removed.
+
 Package: qml-module-qmltermwidget1.0
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  ${misc:Pre-Depends},
+Breaks: qtdeclarative5-qmltermwidget1.0 (<< 0.7~)
+Replaces: qtdeclarative5-qmltermwidget1.0 (<< 0.7~)
 Description: QMLTermWidget QML plugin.
  This package contains the QMLTermWidget terminal emulator plugin
  for Qt Qml.
 
+Package: qtdeclarative5-pamauthentication0.1
+Architecture: any
+Multi-Arch: same
+Depends: qml-module-qmltermwidget1.0,
+ ${misc:Depends},
+ ${shlibs:Depends},
+ ${misc:Pre-Depends},
+Description: Transitional dummy package for PAM authentication QML plugin
+ This package contains a plugin that enables QML apps to do
+ password authentication via the PAM API.
+ .
+ This is a transitional dummy package for qml-module-pamauthentication0.1
+ which can be safely removed.
+
 Package: qml-module-pamauthentication0.1
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  ${misc:Pre-Depends},
+Breaks: qtdeclarative5-pamauthentication0.1 (<< 0.7~)
+Replaces: qtdeclarative5-pamauthentication0.1 (<< 0.7~)
 Description: PAM authentication QML plugin
  This package contains a plugin that enables QML apps to do
  password authentication via the PAM API.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp