Merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-converged-trusty

[Maciej Kisielewski]

This MR updates packaging with new Checkbox-Converged files layout (Trusty).

[Sylvain Pineau (sylvain-pineau)]

I have some doubts with the patch, but let's tru to see where it fails (if it fails)

review: Approve

=== renamed file 'debian/checkbox-touch.desktop' => 'debian/checkbox-converged.desktop'
--- debian/checkbox-touch.desktop	2015-07-23 20:18:44 +0000
+++ debian/checkbox-converged.desktop	2016-09-29 12:09:15 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Checkbox Converged
 Comment=System testing utility for Ubuntu
-Exec=env LD_LIBRARY_PATH=/opt/qt-5.4/usr/lib/x86_64-linux-gnu qmlscene -qt=5.4 --settings=/usr/share/checkbox-converged/settings.json $@ /usr/share/checkbox-converged/checkbox-touch.qml
-Icon=checkbox-touch.svg
+Exec=env LD_LIBRARY_PATH=/opt/qt-5.4/usr/lib/x86_64-linux-gnu qmlscene -qt=5.4 --settings=/usr/share/checkbox-converged/settings.json $@ /usr/share/checkbox-converged/checkbox-converged.qml
+Icon=checkbox-converged.svg
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true

=== modified file 'debian/clean'
--- debian/clean	2015-07-07 14:42:13 +0000
+++ debian/clean	2016-09-29 12:09:15 +0000
@@ -1,2 +1,2 @@
-checkbox-touch/py/__pycache__/*.pyc
+converged/py/__pycache__/*.pyc
 

=== modified file 'debian/install'
--- debian/install	2015-07-23 20:18:44 +0000
+++ debian/install	2016-09-29 12:09:15 +0000
@@ -1,8 +1,8 @@
-checkbox-touch/checkbox-touch.qml usr/share/checkbox-converged/
-checkbox-touch/checkbox-touch.svg usr/share/icons/hicolor/scalable/apps/
-checkbox-touch/components usr/share/checkbox-converged/
-checkbox-touch/py usr/share/checkbox-converged/
-debian/checkbox-touch.desktop usr/share/applications
+converged/checkbox-converged.qml usr/share/checkbox-converged/
+converged/checkbox-converged.svg usr/share/icons/hicolor/scalable/apps/
+converged/components usr/share/checkbox-converged/
+converged/py usr/share/checkbox-converged/
+debian/checkbox-converged.desktop usr/share/applications
 debian/settings.json usr/share/checkbox-converged/
 debian/tick.svg usr/share/icons/suru/actions/scalable/
 debian/window-close.svg usr/share/icons/suru/actions/scalable/

=== modified file 'debian/patches/components_1.3_removal.diff'
--- debian/patches/components_1.3_removal.diff	2016-08-19 09:06:46 +0000
+++ debian/patches/components_1.3_removal.diff	2016-09-29 12:09:15 +0000
@@ -1,7 +1,7 @@
-diff --git b/checkbox-touch/checkbox-touch.qml a/checkbox-touch/checkbox-touch.qml
+diff --git b/converged/checkbox-converged.qml a/converged/checkbox-converged.qml
 index cb896ef..c6c3b93 100644
---- b/checkbox-touch/checkbox-touch.qml
-+++ a/checkbox-touch/checkbox-touch.qml
+--- b/converged/checkbox-converged.qml
++++ a/converged/checkbox-converged.qml
 @@ -20,8 +20,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -39,12 +39,12 @@
              }
              return pageObject;
          }
-diff --git b/checkbox-touch/components/AboutPage.qml a/checkbox-touch/components/AboutPage.qml
+diff --git b/converged/components/AboutPage.qml a/converged/components/AboutPage.qml
 index bb0f50e..d3de734 100644
---- b/checkbox-touch/components/AboutPage.qml
-+++ a/checkbox-touch/components/AboutPage.qml
+--- b/converged/components/AboutPage.qml
++++ a/converged/components/AboutPage.qml
 @@ -24,7 +24,7 @@
-     This page shows version information and contents of AUTHORS file located in top chekckbox-touch directory
+     This page shows version information and contents of AUTHORS file located in top chekckbox-converged directory
  */
  import QtQuick 2.0
 -import Ubuntu.Components 1.3
@@ -72,10 +72,10 @@
              topMargin: units.gu(3)
              bottomMargin: units.gu(3)
              leftMargin: units.gu(1)
-diff --git b/checkbox-touch/components/AutomatedTestPage.qml a/checkbox-touch/components/AutomatedTestPage.qml
+diff --git b/converged/components/AutomatedTestPage.qml a/converged/components/AutomatedTestPage.qml
 index 49e9ba2..7102aa9 100644
---- b/checkbox-touch/components/AutomatedTestPage.qml
-+++ a/checkbox-touch/components/AutomatedTestPage.qml
+--- b/converged/components/AutomatedTestPage.qml
++++ a/converged/components/AutomatedTestPage.qml
 @@ -20,7 +20,7 @@
   */
  
@@ -101,10 +101,10 @@
  
      TestPageBody {
          header: test["name"]
-diff --git b/checkbox-touch/components/CbtDialog.qml a/checkbox-touch/components/CbtDialog.qml
+diff --git b/converged/components/CbtDialog.qml a/converged/components/CbtDialog.qml
 index a7e36c3..ab3f281 100644
---- b/checkbox-touch/components/CbtDialog.qml
-+++ a/checkbox-touch/components/CbtDialog.qml
+--- b/converged/components/CbtDialog.qml
++++ a/converged/components/CbtDialog.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -116,10 +116,10 @@
  import QtQuick.Layouts 1.1
  
  /*! \brief Common dialog popup.
-diff --git b/checkbox-touch/components/CheckboxTouchApplication.qml a/checkbox-touch/components/CheckboxTouchApplication.qml
+diff --git b/converged/components/CheckboxConvergedApplication.qml a/converged/components/CheckboxConvergedApplication.qml
 index 2aa8df3..46b92b4 100644
---- b/checkbox-touch/components/CheckboxTouchApplication.qml
-+++ a/checkbox-touch/components/CheckboxTouchApplication.qml
+--- b/converged/components/CheckboxConvergedApplication.qml
++++ a/converged/components/CheckboxConvergedApplication.qml
 @@ -21,6 +21,7 @@
   */
  
@@ -128,10 +128,10 @@
  
  PythonObjectRef {
      id: app
-diff --git b/checkbox-touch/components/CommandOutputPage.qml a/checkbox-touch/components/CommandOutputPage.qml
+diff --git b/converged/components/CommandOutputPage.qml a/converged/components/CommandOutputPage.qml
 index 52a534f..144c4d0 100644
---- b/checkbox-touch/components/CommandOutputPage.qml
-+++ a/checkbox-touch/components/CommandOutputPage.qml
+--- b/converged/components/CommandOutputPage.qml
++++ a/converged/components/CommandOutputPage.qml
 @@ -24,8 +24,8 @@
  */
  
@@ -177,10 +177,10 @@
      }
  
      Timer {
-diff --git b/checkbox-touch/components/CommentsDialog.qml a/checkbox-touch/components/CommentsDialog.qml
+diff --git b/converged/components/CommentsDialog.qml a/converged/components/CommentsDialog.qml
 index 3323788..8dc1b6c 100644
---- b/checkbox-touch/components/CommentsDialog.qml
-+++ a/checkbox-touch/components/CommentsDialog.qml
+--- b/converged/components/CommentsDialog.qml
++++ a/converged/components/CommentsDialog.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -192,10 +192,10 @@
  
  /*! \brief Comment addition dialog.
      \inherits Item
-diff --git b/checkbox-touch/components/ConfirmationDialog.qml a/checkbox-touch/components/ConfirmationDialog.qml
+diff --git b/converged/components/ConfirmationDialog.qml a/converged/components/ConfirmationDialog.qml
 index 25e8734..44e8963 100644
---- b/checkbox-touch/components/ConfirmationDialog.qml
-+++ a/checkbox-touch/components/ConfirmationDialog.qml
+--- b/converged/components/ConfirmationDialog.qml
++++ a/converged/components/ConfirmationDialog.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -207,10 +207,10 @@
  
  /*! \brief Skip-confirmation dialog.
      \inherits Item
-diff --git b/checkbox-touch/components/ErrorDialog.qml a/checkbox-touch/components/ErrorDialog.qml
+diff --git b/converged/components/ErrorDialog.qml a/converged/components/ErrorDialog.qml
 index edbcc1a..688e68a 100644
---- b/checkbox-touch/components/ErrorDialog.qml
-+++ a/checkbox-touch/components/ErrorDialog.qml
+--- b/converged/components/ErrorDialog.qml
++++ a/converged/components/ErrorDialog.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -222,10 +222,10 @@
  
  /*! \brief Error message popup.
      \inherits Item
-diff --git b/checkbox-touch/components/InputDialog.qml a/checkbox-touch/components/InputDialog.qml
+diff --git b/converged/components/InputDialog.qml a/converged/components/InputDialog.qml
 index a9d9776..99fa4c5 100644
---- b/checkbox-touch/components/InputDialog.qml
-+++ a/checkbox-touch/components/InputDialog.qml
+--- b/converged/components/InputDialog.qml
++++ a/converged/components/InputDialog.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -237,10 +237,10 @@
  
  /*! \brief Simple input dialog.
      \inherits Item
-diff --git b/checkbox-touch/components/InteractIntroPage.qml a/checkbox-touch/components/InteractIntroPage.qml
+diff --git b/converged/components/InteractIntroPage.qml a/converged/components/InteractIntroPage.qml
 index 01e285b..d62965f 100644
---- b/checkbox-touch/components/InteractIntroPage.qml
-+++ a/checkbox-touch/components/InteractIntroPage.qml
+--- b/converged/components/InteractIntroPage.qml
++++ a/converged/components/InteractIntroPage.qml
 @@ -27,8 +27,8 @@
  */
  
@@ -289,10 +289,10 @@
      }
  
      state: "idle"
-diff --git b/checkbox-touch/components/LatchButton.qml a/checkbox-touch/components/LatchButton.qml
+diff --git b/converged/components/LatchButton.qml a/converged/components/LatchButton.qml
 index 8fe9252..b1ea81b 100644
---- b/checkbox-touch/components/LatchButton.qml
-+++ a/checkbox-touch/components/LatchButton.qml
+--- b/converged/components/LatchButton.qml
++++ a/converged/components/LatchButton.qml
 @@ -20,7 +20,7 @@
   */
  
@@ -302,10 +302,10 @@
  
  /*! \brief Latch button.
      \inherits Button
-diff --git b/checkbox-touch/components/ListItemWrappable.qml a/checkbox-touch/components/ListItemWrappable.qml
+diff --git b/converged/components/ListItemWrappable.qml a/converged/components/ListItemWrappable.qml
 index e9297bf..a380ea2 100644
---- b/checkbox-touch/components/ListItemWrappable.qml
-+++ a/checkbox-touch/components/ListItemWrappable.qml
+--- b/converged/components/ListItemWrappable.qml
++++ a/converged/components/ListItemWrappable.qml
 @@ -19,7 +19,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -315,10 +315,10 @@
  import Ubuntu.Components.ListItems 1.0
  
  /*! \brief ListItemWrappable
-diff --git b/checkbox-touch/components/ManualIntroPage.qml a/checkbox-touch/components/ManualIntroPage.qml
+diff --git b/converged/components/ManualIntroPage.qml a/converged/components/ManualIntroPage.qml
 index 0fce6f5..afe007a 100644
---- b/checkbox-touch/components/ManualIntroPage.qml
-+++ a/checkbox-touch/components/ManualIntroPage.qml
+--- b/converged/components/ManualIntroPage.qml
++++ a/converged/components/ManualIntroPage.qml
 @@ -26,9 +26,9 @@
  */
  
@@ -368,10 +368,10 @@
      }
  
      TestPageBody {
-diff --git b/checkbox-touch/components/PasswordDialog.qml a/checkbox-touch/components/PasswordDialog.qml
+diff --git b/converged/components/PasswordDialog.qml a/converged/components/PasswordDialog.qml
 index dea1b0f..c3931bc 100644
---- b/checkbox-touch/components/PasswordDialog.qml
-+++ a/checkbox-touch/components/PasswordDialog.qml
+--- b/converged/components/PasswordDialog.qml
++++ a/converged/components/PasswordDialog.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -383,10 +383,10 @@
  
  /*! \brief Password prompt dialog.
      \inherits Item
-diff --git b/checkbox-touch/components/ProgressBox.qml a/checkbox-touch/components/ProgressBox.qml
+diff --git b/converged/components/ProgressBox.qml a/converged/components/ProgressBox.qml
 index b9fc720..a2b5d05 100644
---- b/checkbox-touch/components/ProgressBox.qml
-+++ a/checkbox-touch/components/ProgressBox.qml
+--- b/converged/components/ProgressBox.qml
++++ a/converged/components/ProgressBox.qml
 @@ -20,7 +20,7 @@
   */
  
@@ -396,10 +396,10 @@
  import QtQuick.Layouts 1.1
  
  /*! \brief Progress Box.
-diff --git b/checkbox-touch/components/ProgressHeader.qml a/checkbox-touch/components/ProgressHeader.qml
+diff --git b/converged/components/ProgressHeader.qml a/converged/components/ProgressHeader.qml
 deleted file mode 100644
 index a7db263..0000000
---- b/checkbox-touch/components/ProgressHeader.qml
+--- b/converged/components/ProgressHeader.qml
 +++ /dev/null
 @@ -1,59 +0,0 @@
 -/*
@@ -461,10 +461,10 @@
 -        }
 -    }
 -}
-diff --git b/checkbox-touch/components/QmlConfinedPage.qml a/checkbox-touch/components/QmlConfinedPage.qml
+diff --git b/converged/components/QmlConfinedPage.qml a/converged/components/QmlConfinedPage.qml
 index 0c8f773..527525f 100644
---- b/checkbox-touch/components/QmlConfinedPage.qml
-+++ a/checkbox-touch/components/QmlConfinedPage.qml
+--- b/converged/components/QmlConfinedPage.qml
++++ a/converged/components/QmlConfinedPage.qml
 @@ -23,8 +23,8 @@
  */
  
@@ -520,10 +520,10 @@
      }
  
      TestPageBody {
-diff --git b/checkbox-touch/components/QmlNativePage.qml a/checkbox-touch/components/QmlNativePage.qml
+diff --git b/converged/components/QmlNativePage.qml a/converged/components/QmlNativePage.qml
 index 8928f60..a33a883 100644
---- b/checkbox-touch/components/QmlNativePage.qml
-+++ a/checkbox-touch/components/QmlNativePage.qml
+--- b/converged/components/QmlNativePage.qml
++++ a/converged/components/QmlNativePage.qml
 @@ -23,8 +23,8 @@
  */
  
@@ -579,10 +579,10 @@
      }
  
      TestPageBody {
-diff --git b/checkbox-touch/components/ResultsPage.qml a/checkbox-touch/components/ResultsPage.qml
+diff --git b/converged/components/ResultsPage.qml a/converged/components/ResultsPage.qml
 index 35fdcd1..ca6d567 100644
---- b/checkbox-touch/components/ResultsPage.qml
-+++ a/checkbox-touch/components/ResultsPage.qml
+--- b/converged/components/ResultsPage.qml
++++ a/converged/components/ResultsPage.qml
 @@ -26,10 +26,11 @@
  */
  
@@ -652,10 +652,10 @@
              topMargin: units.gu(3)
              bottomMargin: units.gu(3)
              leftMargin: units.gu(1)
-diff --git b/checkbox-touch/components/ResumeSessionPage.qml a/checkbox-touch/components/ResumeSessionPage.qml
+diff --git b/converged/components/ResumeSessionPage.qml a/converged/components/ResumeSessionPage.qml
 index cbfbb59..ad57715 100644
---- b/checkbox-touch/components/ResumeSessionPage.qml
-+++ a/checkbox-touch/components/ResumeSessionPage.qml
+--- b/converged/components/ResumeSessionPage.qml
++++ a/converged/components/ResumeSessionPage.qml
 @@ -26,7 +26,7 @@
  */
  
@@ -689,10 +689,10 @@
              topMargin: units.gu(3)
              bottomMargin: units.gu(3)
              leftMargin: units.gu(1)
-diff --git b/checkbox-touch/components/SelectionPage.qml a/checkbox-touch/components/SelectionPage.qml
+diff --git b/converged/components/SelectionPage.qml a/converged/components/SelectionPage.qml
 index 6df9cb1..fbc2e75 100644
---- b/checkbox-touch/components/SelectionPage.qml
-+++ a/checkbox-touch/components/SelectionPage.qml
+--- b/converged/components/SelectionPage.qml
++++ a/converged/components/SelectionPage.qml
 @@ -21,7 +21,7 @@
  
  import QtQuick 2.0
@@ -809,10 +809,10 @@
              bottomMargin: units.gu(3)
              leftMargin: units.gu(1)
              rightMargin: units.gu(1)
-diff --git b/checkbox-touch/components/TestPageBody.qml a/checkbox-touch/components/TestPageBody.qml
+diff --git b/converged/components/TestPageBody.qml a/converged/components/TestPageBody.qml
 index 73832e2..9693dae 100644
---- b/checkbox-touch/components/TestPageBody.qml
-+++ a/checkbox-touch/components/TestPageBody.qml
+--- b/converged/components/TestPageBody.qml
++++ a/converged/components/TestPageBody.qml
 @@ -25,8 +25,8 @@
  
  import QtQuick 2.0
@@ -836,10 +836,10 @@
          topMargin: units.gu(3)
          bottomMargin: units.gu(3)
          leftMargin: units.gu(1)
-diff --git b/checkbox-touch/components/TestVerificationPage.qml a/checkbox-touch/components/TestVerificationPage.qml
+diff --git b/converged/components/TestVerificationPage.qml a/converged/components/TestVerificationPage.qml
 index 2178ffb..ad86d85 100644
---- b/checkbox-touch/components/TestVerificationPage.qml
-+++ a/checkbox-touch/components/TestVerificationPage.qml
+--- b/converged/components/TestVerificationPage.qml
++++ a/converged/components/TestVerificationPage.qml
 @@ -26,9 +26,9 @@
  */
  
@@ -889,10 +889,10 @@
      }
  
      TestPageBody {
-diff --git b/checkbox-touch/components/UserInteractSummaryPage.qml a/checkbox-touch/components/UserInteractSummaryPage.qml
+diff --git b/converged/components/UserInteractSummaryPage.qml a/converged/components/UserInteractSummaryPage.qml
 index 8f3ca06..2dc286d 100644
---- b/checkbox-touch/components/UserInteractSummaryPage.qml
-+++ a/checkbox-touch/components/UserInteractSummaryPage.qml
+--- b/converged/components/UserInteractSummaryPage.qml
++++ a/converged/components/UserInteractSummaryPage.qml
 @@ -26,8 +26,8 @@
  */
  
@@ -941,10 +941,10 @@
      }
  
      TestPageBody {
-diff --git b/checkbox-touch/components/WebViewer.qml a/checkbox-touch/components/WebViewer.qml
+diff --git b/converged/components/WebViewer.qml a/converged/components/WebViewer.qml
 index 0348919..7b5ef78 100644
---- b/checkbox-touch/components/WebViewer.qml
-+++ a/checkbox-touch/components/WebViewer.qml
+--- b/converged/components/WebViewer.qml
++++ a/converged/components/WebViewer.qml
 @@ -21,7 +21,7 @@
  
  import QtQuick 2.0
@@ -954,10 +954,10 @@
  
  
  Page {
-diff --git b/checkbox-touch/components/WelcomePage.qml a/checkbox-touch/components/WelcomePage.qml
+diff --git b/converged/components/WelcomePage.qml a/converged/components/WelcomePage.qml
 index a310e41..cf328d0 100644
---- b/checkbox-touch/components/WelcomePage.qml
-+++ a/checkbox-touch/components/WelcomePage.qml
+--- b/converged/components/WelcomePage.qml
++++ a/converged/components/WelcomePage.qml
 @@ -21,7 +21,7 @@
   */
  
@@ -1001,10 +1001,10 @@
      Label {
          id: welcomeText
  
-diff --git b/checkbox-touch/components/actions/AddCommentAction.qml a/checkbox-touch/components/actions/AddCommentAction.qml
+diff --git b/converged/components/actions/AddCommentAction.qml a/converged/components/actions/AddCommentAction.qml
 index b3977ce..d7daf53 100644
---- b/checkbox-touch/components/actions/AddCommentAction.qml
-+++ a/checkbox-touch/components/actions/AddCommentAction.qml
+--- b/converged/components/actions/AddCommentAction.qml
++++ a/converged/components/actions/AddCommentAction.qml
 @@ -22,8 +22,8 @@
  /*! \brief Action component for adding a comment. */
  
@@ -1016,10 +1016,10 @@
  
  Action {
      id: addCommentAction
-diff --git b/checkbox-touch/components/actions/SkipAction.qml a/checkbox-touch/components/actions/SkipAction.qml
+diff --git b/converged/components/actions/SkipAction.qml a/converged/components/actions/SkipAction.qml
 index 124c7dd..712d746 100644
---- b/checkbox-touch/components/actions/SkipAction.qml
-+++ a/checkbox-touch/components/actions/SkipAction.qml
+--- b/converged/components/actions/SkipAction.qml
++++ a/converged/components/actions/SkipAction.qml
 @@ -22,8 +22,8 @@
  /*! \brief Action component for skipping a test. */
  
@@ -1031,10 +1031,10 @@
 
  Action {
      id: skipAction
-diff --git b/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py a/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py
+diff --git b/converged/tests/autopilot/checkbox_converged/__init__.py a/converged/tests/autopilot/checkbox_converged/__init__.py
 index 547ab73..77e5220 100644
---- b/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py
-+++ a/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py
+--- b/converged/tests/autopilot/checkbox_converged/__init__.py
++++ a/converged/tests/autopilot/checkbox_converged/__init__.py
 @@ -87,7 +87,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
          self.pointing_device.click_object(continue_btn)
          category_page = self.app.wait_select_single(
@@ -1065,11 +1065,11 @@
      def _launch_application_from_phablet(self):
          # On phablet, we only run the tests against the installed click
          # package.
-diff --git b/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py a/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py
+diff --git b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
 index e9fe916..c0bf6a3 100644
---- b/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py
-+++ a/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py
-@@ -19,7 +19,7 @@ class TestCheckboxTouch(checkbox_touch.ClickAppTestCase):
+--- b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
++++ a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
+@@ -19,7 +19,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase):
          if selectable_object_name is not None:
              self.app.wait_select_single(
                  objectName=selectable_object_name, visible=True)
@@ -1078,7 +1078,7 @@
          dialog = self.app.wait_select_single(objectName='dialog')
          yes_btn = dialog.select_single(objectName='yesButton')
          self.pointing_device.click_object(yes_btn)
-@@ -62,7 +62,7 @@ class TestCheckboxTouch(checkbox_touch.ClickAppTestCase):
+@@ -62,7 +62,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase):
          self.pointing_device.click_object(continue_btn)
          category_page = self.app.wait_select_single(
              objectName='categorySelectionPage', visible=True)
@@ -1087,7 +1087,7 @@
          category_id = '2015.com.canonical.certification::normal'
          list_item = category_page.wait_select_single(
              objectName='listItem', item_mod_id=category_id)
-@@ -299,7 +299,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase):
+@@ -299,7 +299,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
          self.process_sequence_of_clicks_on_pages(next_steps)
          results_page = self.app.wait_select_single(
              objectName='resultsPage', visible=True)
@@ -1096,7 +1096,7 @@
          # we now should see a re-run screen; let's select the only test
          rerun_page = self.app.wait_select_single(
              objectName='rerunSelectionPage', visible=True)
-@@ -313,7 +313,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase):
+@@ -313,7 +313,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
          self.process_sequence_of_clicks_on_pages(next_steps)
          results_page = self.app.wait_select_single(
              objectName='resultsPage', visible=True)
@@ -1105,7 +1105,7 @@
          # we should see the re-run screen again
          rerun_page = self.app.wait_select_single(
              objectName='rerunSelectionPage', visible=True)
-@@ -333,7 +333,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase):
+@@ -333,7 +333,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
          self.process_sequence_of_clicks_on_pages(next_steps)
          results_page = self.app.wait_select_single(
              objectName='resultsPage', visible=True)
@@ -1114,8 +1114,8 @@
          # we now should see a re-run screen; let's select the only test
          rerun_page = self.app.wait_select_single(
              objectName='rerunSelectionPage', visible=True)
---- a/checkbox-touch/components/DialogMgr.qml
-+++ b/checkbox-touch/components/DialogMgr.qml
+--- a/converged/components/DialogMgr.qml
++++ b/converged/components/DialogMgr.qml
 @@ -19,8 +19,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */

=== modified file 'debian/rules'
--- debian/rules	2015-07-07 14:42:13 +0000
+++ debian/rules	2016-09-29 12:09:15 +0000
@@ -2,7 +2,7 @@
 export LANG=
 export LANGUAGE=
 export http_proxy=http://127.0.0.1:9
-PPA_DISPLACEMENT=checkbox-touch
+PPA_DISPLACEMENT=converged
 
 %:
 	dh $@  --sourcedirectory=$(PPA_DISPLACEMENT)