Merge ~kissiel/plainbox-provider-ubuntu-touch:year-prefix-removal into plainbox-provider-ubuntu-touch:master

[Maciej Kisielewski]

another year prefix removal

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

Unmerged commits

27ae979... by Maciej Kisielewski on 2017-07-07

remove year prefix from provider's namespace

Signed-off-by: Maciej Kisielewski <email address hidden>

diff --git a/manage.py b/manage.py
index 0f01e5a..656c632 100755
--- a/manage.py
+++ b/manage.py
@@ -21,7 +21,7 @@
 from plainbox.provider_manager import setup, N_
 
 setup(
-    name='2014.com.ubuntu:ubuntu-touch',
+    name='com.ubuntu:ubuntu-touch',
     version="1.1",
     description=N_("The Ubuntu Touch for Plainbox"),
     gettext_domain="plainbox-provider-ubuntu-touch",
diff --git a/units/qml-tests.pxu b/units/qml-tests.pxu
index 09e6a96..5139e2f 100644
--- a/units/qml-tests.pxu
+++ b/units/qml-tests.pxu
@@ -136,7 +136,7 @@ _description:
  This test verifies that you can send an SMS
 qml_file: msg-01.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril0_simPresent == "True"
 
 id: msg-15
@@ -147,7 +147,7 @@ _description:
  This test verifies that you can send an SMS
 qml_file: msg-15.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril1_simPresent == "True"
 
 id: msg-06
@@ -158,7 +158,7 @@ _description:
  This test verifies that you can send an SMS containing special characters
 qml_file: msg-06.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril0_simPresent == "True"
 
 id: msg-20
@@ -169,7 +169,7 @@ _description:
  This test verifies that you can send an SMS containing special characters
 qml_file: msg-20.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril1_simPresent == "True"
 
 id: msg-07
@@ -180,7 +180,7 @@ _description:
  This test verifies that you can send an SMS containing an & (ampersand) and that it is displayed correctly
 qml_file: msg-07.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril0_simPresent == "True"
 
 id: msg-21
@@ -191,7 +191,7 @@ _description:
  This test verifies that you can send an SMS containing an & (ampersand) and that it is displayed correctly
 qml_file: msg-21.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril1_simPresent == "True"
 
 id: msg-08
@@ -202,7 +202,7 @@ _description:
  This test verifies that you can send an SMS containing a URL and some other text and that it is displayed correctly
 qml_file: msg-08.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril0_simPresent == "True"
 
 id: msg-22
@@ -213,7 +213,7 @@ _description:
  This test verifies that you can send an SMS containing a URL and some other text and that it is displayed correctly
 qml_file: msg-22.qml
 estimated_duration: 20
-imports: from 2014.com.ubuntu import cellularmodem as modem
+imports: from com.ubuntu import cellularmodem as modem
 requires: modem.ril1_simPresent == "True"
 
 unit: category
diff --git a/units/shakedown.pxu b/units/shakedown.pxu
index 4a01efd..bb4a455 100644
--- a/units/shakedown.pxu
+++ b/units/shakedown.pxu
@@ -8,54 +8,54 @@ _description:
  This test plan should be used when the device is returned, to establish if
  it was returned because there's a technical problem with the device.
 include:
- 2014.com.ubuntu::Audio-04
- 2014.com.ubuntu::Audio-05
- 2014.com.ubuntu::Audio-06
- 2014.com.ubuntu::Audio-07
- 2014.com.ubuntu::Audio-08
- 2014.com.ubuntu::Audio-18
- 2014.com.ubuntu::Audio-19
- 2014.com.ubuntu::Battery-06
- 2014.com.ubuntu::Bluetooth-01
- 2014.com.ubuntu::Bluetooth-02
- 2014.com.ubuntu::Bluetooth-03
- 2014.com.ubuntu::Bluetooth-04
- 2014.com.ubuntu::Bluetooth-05
- 2014.com.ubuntu::ID-Location-03
- 2014.com.ubuntu::ID-Location-04
- 2014.com.ubuntu::Msg-01
- 2014.com.ubuntu::Msg-02
- 2014.com.ubuntu::Msg-03
- 2014.com.ubuntu::Msg-11
- 2014.com.ubuntu::Msg-12
- 2014.com.ubuntu::Msg-13
- 2014.com.ubuntu::SD-01
- 2014.com.ubuntu::SD-02
- 2014.com.ubuntu::SD-06
- 2014.com.ubuntu::SD-07
- 2014.com.ubuntu::Screen-07
- 2014.com.ubuntu::Screen-08
- 2014.com.ubuntu::Screen-09
- 2014.com.ubuntu::Screen-10
- 2014.com.ubuntu::Screen-11
- 2014.com.ubuntu::Sensors-01
- 2014.com.ubuntu::Sensors-02
- 2014.com.ubuntu::Sensors-03
- 2014.com.ubuntu::Sensors-04
- 2014.com.ubuntu::Sensors-07
- 2014.com.ubuntu::Settings-01
- 2014.com.ubuntu::Tel-01
- 2014.com.ubuntu::Tel-36
- 2014.com.ubuntu::Tel-38
- 2014.com.ubuntu::Tel-46
- 2014.com.ubuntu::Tel-47
- 2014.com.ubuntu::Tel-48
- 2014.com.ubuntu::Tel-49
- 2014.com.ubuntu::Tel-50
- 2014.com.ubuntu::Tel-51
- 2014.com.ubuntu::Tel-52
- 2014.com.ubuntu::Tel-53
- 2014.com.ubuntu::Wifi-11
+ com.ubuntu::Audio-04
+ com.ubuntu::Audio-05
+ com.ubuntu::Audio-06
+ com.ubuntu::Audio-07
+ com.ubuntu::Audio-08
+ com.ubuntu::Audio-18
+ com.ubuntu::Audio-19
+ com.ubuntu::Battery-06
+ com.ubuntu::Bluetooth-01
+ com.ubuntu::Bluetooth-02
+ com.ubuntu::Bluetooth-03
+ com.ubuntu::Bluetooth-04
+ com.ubuntu::Bluetooth-05
+ com.ubuntu::ID-Location-03
+ com.ubuntu::ID-Location-04
+ com.ubuntu::Msg-01
+ com.ubuntu::Msg-02
+ com.ubuntu::Msg-03
+ com.ubuntu::Msg-11
+ com.ubuntu::Msg-12
+ com.ubuntu::Msg-13
+ com.ubuntu::SD-01
+ com.ubuntu::SD-02
+ com.ubuntu::SD-06
+ com.ubuntu::SD-07
+ com.ubuntu::Screen-07
+ com.ubuntu::Screen-08
+ com.ubuntu::Screen-09
+ com.ubuntu::Screen-10
+ com.ubuntu::Screen-11
+ com.ubuntu::Sensors-01
+ com.ubuntu::Sensors-02
+ com.ubuntu::Sensors-03
+ com.ubuntu::Sensors-04
+ com.ubuntu::Sensors-07
+ com.ubuntu::Settings-01
+ com.ubuntu::Tel-01
+ com.ubuntu::Tel-36
+ com.ubuntu::Tel-38
+ com.ubuntu::Tel-46
+ com.ubuntu::Tel-47
+ com.ubuntu::Tel-48
+ com.ubuntu::Tel-49
+ com.ubuntu::Tel-50
+ com.ubuntu::Tel-51
+ com.ubuntu::Tel-52
+ com.ubuntu::Tel-53
+ com.ubuntu::Wifi-11
  shakedown/.*
 
 unit: category
diff --git a/units/tst.pxu b/units/tst.pxu
index 700817d..6e2ff15 100644
--- a/units/tst.pxu
+++ b/units/tst.pxu
@@ -12,7 +12,7 @@ _description: Generates Trust Store tests
 unit: template
 template-resource: tst/tst_resource
 id: tst/{binary}_{full_name}
-template-imports: from 2014.com.ubuntu import tst/tst_resource as tst_res
+template-imports: from com.ubuntu import tst/tst_resource as tst_res
 template-filter: tst_res.root == 'yes'
 category_id: tst
 plugin: shell
@@ -23,7 +23,7 @@ _description: {test_case} from Ubuntu Location Service tests
 unit: template
 template-resource: tst/tst_resource
 id: tst/{binary}_{full_name}
-template-imports: from 2014.com.ubuntu import tst/tst_resource as tst_res
+template-imports: from com.ubuntu import tst/tst_resource as tst_res
 template-filter: tst_res.root == 'no'
 category_id: tst
 plugin: shell
diff --git a/units/uls.pxu b/units/uls.pxu
index 6b02411..9f95d85 100644
--- a/units/uls.pxu
+++ b/units/uls.pxu
@@ -12,7 +12,7 @@ _description: Generates Ubuntu Location Services tests
 unit: template
 template-resource: uls/uls_resource
 id: uls/{binary}_{full_name}
-template-imports: from 2014.com.ubuntu import uls/uls_resource as uls_res
+template-imports: from com.ubuntu import uls/uls_resource as uls_res
 template-filter: uls_res.root == 'yes'
 category_id: uls
 plugin: shell
@@ -23,7 +23,7 @@ _description: {test_case} from Ubuntu Location Service tests
 unit: template
 template-resource: uls/uls_resource
 id: uls/{binary}_{full_name}
-template-imports: from 2014.com.ubuntu import uls/uls_resource as uls_res
+template-imports: from com.ubuntu import uls/uls_resource as uls_res
 template-filter: uls_res.root == 'no'
 category_id: uls
 plugin: shell