Merge lp:~unity-team/unity/phablet.rename-unity8 into lp:unity/phablet

[Michał Sawicz]

rename qml-phone-shell to unity8

Since the decision was made for the QML shell to be just "Unity 8", let's rename it!

[Michał Sawicz (saviq)]

I'm tracking down other places where we need to do a rename. Please don't top-approve until then.

[Michał Sawicz (saviq)]

Related MRs:

lp:~saviq/session-manager/rename-unity8
lp:~saviq/touch-preview-images/rename-unity8

[Michael Zanetti (mzanetti)]

Not sure it is a good idea to name the binary unity8. Renaming the binary on ever major release seems useless additional work to me.

I'm also not a big fan of the package having the 8 in the name, but that seems to be common practice so I would be ok with that.

Bad thing is, I don't have a better idea as we obviously can't conflict with current unity. Maybe something like unity-convergence? Sucks too in some ways...

Anyways, I think it might make sense to think a bit more about the binary name...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1144/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/10
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1854/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1144/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

W dniu 04.06.2013 16:09, Michael Zanetti pisze:
> Not sure it is a good idea to name the binary unity8. Renaming the binary on ever major release seems useless additional work to me.
>
> I'm also not a big fan of the package having the 8 in the name, but that seems to be common practice so I would be ok with that.

This is all just a temporary solution, only there to make sure that we
can install both Unity v7 and Unity v8 in parallel. As soon as Unity v8
becomes the default, the package and binary will be renamed to just
"unity" with version 8.

> Bad thing is, I don't have a better idea as we obviously can't conflict with current unity. Maybe something like unity-convergence? Sucks too in some ways...
>
> Anyways, I think it might make sense to think a bit more about the binary name...

I don't think there's value in finding yet another temporary name. And
the decision has been made that this is Unity v8, so why not name it thus?
--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

[Sergio Schvezov (sergiusens)]

> Related MRs:
>
> lp:~saviq/session-manager/rename-unity8
> lp:~saviq/touch-preview-images/rename-unity8

Not here, this is for raring... I'll create a new config that handles this name change

[Sergio Schvezov (sergiusens)]

http://bazaar.launchpad.net/~cupstream2distro-maintainers/cupstream2distro-config/trunk/view/head:/stacks/phablet/shell.cfg#L31

and lp:phablet-tools

I'll take care of these

[Michał Sawicz (saviq)]

Just a follow-up - we decided that unity8, although not a great name for a binary, will make sure no other name "sticks" to the new Unity - which is just a new version - version 8.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1154/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1899/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1154/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1157/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/23
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1902/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1157/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:733
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1159/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1904

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1159/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:733
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1159/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1904

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1159/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:734
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1161/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1907

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1161/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Good, works; will need some more extensive testing, but approving for now to get more people in to it

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-04 08:58:32 +0000
+++ CMakeLists.txt	2013-06-05 16:32:28 +0000
@@ -5,7 +5,7 @@
     set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "" FORCE)
 endif()
 
-project(qml-phone-shell C CXX)
+project(unity8 C CXX)
 
 if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
    message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
@@ -56,7 +56,7 @@
 # Standard install paths
 include(GNUInstallDirs)
 
-set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/qml-phone-shell)
+set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
 
 configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
 
@@ -90,11 +90,11 @@
 
 # Autopilot tests
 include(autopilot)
-declare_autopilot_test(qml_phone_shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
+declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
 
 add_subdirectory(tests)
 
-set(SHELL_APP qml-phone-shell)
+set(SHELL_APP unity8)
 
 set(shell_app_HDRS
     )

=== modified file 'build'
--- build	2013-06-05 12:54:44 +0000
+++ build	2013-06-05 16:32:28 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PACKAGE=qml-phone-shell
+PACKAGE=unity8
 UNITY_BUILD_DIR=$PWD/../unity_build/build
 SETUP=false
 CLEAN=false

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 22:31:27 +0000
+++ debian/changelog	2013-06-05 16:32:28 +0000
@@ -1,3 +1,9 @@
+unity8 (7.80.0) saucy; urgency=low
+
+  * Rename to unity8.
+
+ -- Michał Sawicz <[e-mail]>  Tue, 04 Jun 2013 14:45:29 +0200
+
 qml-phone-shell (1.80) raring; urgency=low
 
   * Focus/unfocus apps on lock/unlock to make sure keyboard is hidden.

=== modified file 'debian/control'
--- debian/control	2013-06-04 08:58:32 +0000
+++ debian/control	2013-06-05 16:32:28 +0000
@@ -1,4 +1,4 @@
-Source: qml-phone-shell
+Source: unity8
 Section: x11
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -33,7 +33,9 @@
 Vcs-Bzr: https://code.launchpad.net/~unity-team/unity/phablet
 Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity/phablet/files
 
-Package: qml-phone-shell
+Package: unity8
+Replaces: qml-phone-shell (<< 7.80~)
+Breaks: qml-phone-shell (<< 7.80~)
 Architecture: amd64 armhf i386
 Depends: indicators-client (>= 0.6.1),
          qtdeclarative5-dee-plugin,
@@ -50,22 +52,44 @@
 Description: Ubuntu QML shell
  The Ubuntu QML shell is the primary user interface for Ubuntu devices.
 
-Package: qml-phone-shell-fake-env
+Package: qml-phone-shell
+Depends: unity8, ${misc:Depends}
+Architecture: all
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: unity8-fake-env
+Replaces: qml-phone-shell-fake-env (<< 7.80~)
+Breaks: qml-phone-shell-fake-env (<< 7.80~)
 Architecture: amd64 armhf i386
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Fake environment for running Ubuntu QML shell
  Provides fake implementations of some QML modules used by Ubuntu QML shell
  (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
 
-Package: qml-phone-shell-autopilot
+Package: qml-phone-shell-fake-env
+Depends: unity8-fake-env, ${misc:Depends}
+Architecture: all
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: unity8-autopilot
+Replaces: qml-phone-shell-autopilot (<< 7.80~)
+Breaks: qml-phone-shell-autopilot (<< 7.80~)
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
          libqt5widgets5,
          python-evdev,
-         qml-phone-shell (= ${source:Version}),
-         qml-phone-shell-fake-env (= ${source:Version}),
+         unity8 (= ${source:Version}),
+         unity8-fake-env (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Test package for the shell
- Autopilot tests for the qml-phone-shell package
+ Autopilot tests for the unity8 package
+
+Package: qml-phone-shell-autopilot
+Depends: unity8-autopilot, ${misc:Depends}
+Architecture: all
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.

=== renamed file 'debian/qml-phone-shell-autopilot.install' => 'debian/unity8-autopilot.install'
--- debian/qml-phone-shell-autopilot.install	2013-04-19 13:37:04 +0000
+++ debian/unity8-autopilot.install	2013-06-05 16:32:28 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/qml_phone_shell/* usr/lib/python2.7/dist-packages/qml_phone_shell/
+tests/autopilot/unity8/* usr/lib/python2.7/dist-packages/unity8/

=== renamed file 'debian/qml-phone-shell-fake-env.install' => 'debian/unity8-fake-env.install'
--- debian/qml-phone-shell-fake-env.install	2013-04-18 18:01:03 +0000
+++ debian/unity8-fake-env.install	2013-06-05 16:32:28 +0000
@@ -1,1 +1,1 @@
-/usr/share/qml-phone-shell/plugins/mocks/*
+/usr/share/unity8/plugins/mocks/*

=== renamed file 'debian/qml-phone-shell.install' => 'debian/unity8.install'
--- debian/qml-phone-shell.install	2013-05-27 07:00:02 +0000
+++ debian/unity8.install	2013-06-05 16:32:28 +0000
@@ -1,20 +1,20 @@
-/usr/bin/qml-phone-shell
-/usr/share/applications/qml-phone-shell.desktop
+/usr/bin/unity8
+/usr/share/applications/unity8.desktop
 /usr/share/locale/*
-/usr/share/qml-phone-shell/Applications/*
-/usr/share/qml-phone-shell/Bottombar/*
-/usr/share/qml-phone-shell/Components/*
-/usr/share/qml-phone-shell/Dash/*
-/usr/share/qml-phone-shell/Greeter/*
-/usr/share/qml-phone-shell/Hud/*
-/usr/share/qml-phone-shell/Launcher/*
-/usr/share/qml-phone-shell/Notifications/*
-/usr/share/qml-phone-shell/Panel/*
-/usr/share/qml-phone-shell/Shell.qml
-/usr/share/qml-phone-shell/SideStage/*
-/usr/share/qml-phone-shell/graphics/*
-/usr/share/qml-phone-shell/plugins/HudClient/*
-/usr/share/qml-phone-shell/plugins/LightDM/*
-/usr/share/qml-phone-shell/plugins/Ubuntu/*
-/usr/share/qml-phone-shell/plugins/Unity/*
-/usr/share/qml-phone-shell/plugins/Utils/*
+/usr/share/unity8/Applications/*
+/usr/share/unity8/Bottombar/*
+/usr/share/unity8/Components/*
+/usr/share/unity8/Dash/*
+/usr/share/unity8/Greeter/*
+/usr/share/unity8/Hud/*
+/usr/share/unity8/Launcher/*
+/usr/share/unity8/Notifications/*
+/usr/share/unity8/Panel/*
+/usr/share/unity8/Shell.qml
+/usr/share/unity8/SideStage/*
+/usr/share/unity8/graphics/*
+/usr/share/unity8/plugins/HudClient/*
+/usr/share/unity8/plugins/LightDM/*
+/usr/share/unity8/plugins/Ubuntu/*
+/usr/share/unity8/plugins/Unity/*
+/usr/share/unity8/plugins/Utils/*

=== modified file 'run'
--- run	2013-06-03 15:33:42 +0000
+++ run	2013-06-05 16:32:28 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-QML_PHONE_SHELL_PATH=./builddir/qml-phone-shell
+QML_PHONE_SHELL_PATH=./builddir/unity8
 export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib
 GDB=false
 FAKE=false

=== modified file 'run_on_device'
--- run_on_device	2013-05-29 08:21:31 +0000
+++ run_on_device	2013-06-05 16:32:28 +0000
@@ -3,8 +3,8 @@
 USER=phablet
 USER_ID=32011
 PASSWORD=phablet
-PACKAGE=qml-phone-shell
-BINARY=qml-phone-shell
+PACKAGE=unity8
+BINARY=unity8
 TARGET_IP=${TARGET_IP-127.0.0.1}
 TARGET_SSH_PORT=${TARGET_SSH_PORT-2222}
 TARGET_DEBUG_PORT=3768

=== modified file 'runtests.sh'
--- runtests.sh	2013-04-23 19:50:21 +0000
+++ runtests.sh	2013-06-05 16:32:28 +0000
@@ -105,7 +105,7 @@
 echo "    <source>`pwd`</source>" >> $coveragefile
 echo "  </sources>" >> $coveragefile
 echo "  <packages>" >> $coveragefile
-echo "    <package branch-rate=\"0.0\" complexity=\"0.0\" line-rate=\"$linespercentagef\" name=\"qml-phone-shell\">"  >> $coveragefile
+echo "    <package branch-rate=\"0.0\" complexity=\"0.0\" line-rate=\"$linespercentagef\" name=\"unity8\">"  >> $coveragefile
 echo "      <classes>" >> $coveragefile
 
 for i in $file_list; do

=== renamed directory 'tests/autopilot/qml_phone_shell' => 'tests/autopilot/unity8'
=== modified file 'tests/autopilot/unity8/__init__.py'
--- tests/autopilot/qml_phone_shell/__init__.py	2013-02-26 15:45:50 +0000
+++ tests/autopilot/unity8/__init__.py	2013-06-05 16:32:28 +0000
@@ -5,4 +5,4 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-"""qml-phone-shell autopilot tests and emulators - top level package."""
+"""unity8 autopilot tests and emulators - top level package."""

=== modified file 'tests/autopilot/unity8/tests/__init__.py'
--- tests/autopilot/qml_phone_shell/tests/__init__.py	2013-06-03 15:32:21 +0000
+++ tests/autopilot/unity8/tests/__init__.py	2013-06-05 16:32:28 +0000
@@ -5,7 +5,7 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-"""qml-phone-shell autopilot tests."""
+"""unity8 autopilot tests."""
 
 import os.path
 
@@ -14,7 +14,7 @@
 from autopilot.platform import model
 from testtools.matchers import Equals
 
-from qml_phone_shell.emulators.main_window import MainWindow
+from unity8.emulators.main_window import MainWindow
 
 class FormFactors(object):
     Phone, Tablet, Desktop = range(3)
@@ -43,20 +43,20 @@
         os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
         if geometry != "0x0":
             self.app = self.launch_test_application(
-                "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')
+                "../../builddir/unity8", "-geometry", geometry, "-frameless", app_type='qt')
         else:
             self.app = self.launch_test_application(
-                "../../builddir/qml-phone-shell", "-fullscreen", app_type='qt')
+                "../../builddir/unity8", "-fullscreen", app_type='qt')
 
     def launch_test_installed(self, geometry):
-        os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/" + self.lightdm_mock
-        os.environ['QML2_IMPORT_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks:/usr/share/qml-phone-shell/plugins"
+        os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock
+        os.environ['QML2_IMPORT_PATH'] = "/usr/share/unity8/plugins/mocks:/usr/share/unity8/plugins"
         if model() == 'Desktop' and geometry != "0x0":
             self.app = self.launch_test_application(
-               "qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')
+               "unity8", "-geometry", geometry, "-frameless", app_type='qt')
         else:
             self.app = self.launch_test_application(
-               "qml-phone-shell", "-fullscreen", app_type='qt')
+               "unity8", "-fullscreen", app_type='qt')
 
     def skipWrapper(*args, **kwargs):
         pass

=== modified file 'tests/autopilot/unity8/tests/testbigscreen.py'
--- tests/autopilot/qml_phone_shell/tests/testbigscreen.py	2013-03-05 12:57:00 +0000
+++ tests/autopilot/unity8/tests/testbigscreen.py	2013-06-05 16:32:28 +0000
@@ -10,7 +10,7 @@
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
-from qml_phone_shell.tests import ShellTestCase
+from unity8.tests import ShellTestCase
 
 class TestBig(ShellTestCase):
     def setUp(self):

=== modified file 'tests/autopilot/unity8/tests/testcases.py'
--- tests/autopilot/qml_phone_shell/tests/testcases.py	2013-05-29 16:22:49 +0000
+++ tests/autopilot/unity8/tests/testcases.py	2013-06-05 16:32:28 +0000
@@ -25,8 +25,8 @@
 
 from __future__ import absolute_import
 
-from qml_phone_shell.tests import ShellTestCase, FormFactors
-from qml_phone_shell.tests.helpers import TestShellHelpers
+from unity8.tests import ShellTestCase, FormFactors
+from unity8.tests.helpers import TestShellHelpers
 
 from autopilot.input import Mouse, Touch, Pointer
 from testtools.matchers import Equals, NotEquals, GreaterThan, MismatchError

=== renamed file 'qml-phone-shell.desktop.in' => 'unity8.desktop.in'
--- qml-phone-shell.desktop.in	2013-04-04 08:39:35 +0000
+++ unity8.desktop.in	2013-06-05 16:32:28 +0000
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=Unity Next
-GenericName=qml-phone-shell
+Name=Unity 8
+GenericName=unity8
 Comment=The converged Unity shell
-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/qml-phone-shell
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8
 Terminal=false
-Icon=qml-phone-shell
+Icon=unity8
 NoDisplay=true
 X-Ubuntu-Touch=true

=== renamed file 'unity.qmlproject' => 'unity8.qmlproject'