Merge lp:~michael-sheldon/ubuntu-terminal-app/fix-1628781 into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Michael Sheldon]

Add transitional packages for qml-module renaming

Add transitional packages for qml-module renaming

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks from someone who got bitten by this yesterday :)

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-09-20 17:21:48 +0000
+++ debian/control	2016-09-29 12:38:08 +0000
@@ -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.