Merge lp:~saviq/unity/phablet.update-coding-build into lp:unity/phablet

[Michał Sawicz]

update CODING and build script to drop 12.10 references

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:667
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/895/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/771
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/771/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/775

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

+1

review: Approve

=== modified file 'CODING'
--- CODING	2013-03-25 17:00:08 +0000
+++ CODING	2013-05-10 12:08:27 +0000
@@ -16,10 +16,8 @@
 If its your first time, download & build deps
 $ ./build -s
   this will:
-  - add ppa:phablet-team/desktop-deps
-  - for 12.10, add ppa:canonical-qt5-edgers/qt5-proper and ppa:ubuntu-sdk-team/ppa
+  - add ppa:phablet-team/desktop-deps, ppa:canonical-qt5-edgers/qt5-proper, ppa:ubuntu-sdk-team
   - build and install lp:libunity/phablet, lp:unity/phablet-mods, lp:hud/phablet and lp:unity-lens-people locally
-  - for 12.10, build and install lp:nux/phablet locally
   - install build dependencies
 
 build UnityNext
@@ -58,7 +56,7 @@
 
 Running UnityNext on devices
 ============================
-- Ubuntu Touch builds are currently only available in 12.10 flavour
+- Ubuntu Touch builds are currently only available in 13.04 flavour
 - supported hardware should match one those listed here https://wiki.ubuntu.com/Touch/Devices#Running_fine
 - follow the Ubuntu Touch install instructions for your chosen device https://wiki.ubuntu.com/Touch/Install
 - make sure your device is connected to a WiFi network

=== modified file 'build'
--- build	2013-04-30 23:55:56 +0000
+++ build	2013-05-10 12:08:27 +0000
@@ -37,23 +37,12 @@
 [ $# -eq 1 ] && BUILD_TYPE="$1"
 
 install_dependencies() {
-    RARING=false
-    grep -q raring /etc/lsb-release
-    if [ $? -eq 0 ]; then
-        RARING=true
-    fi
     sudo add-apt-repository -y ppa:phablet-team/desktop-deps || exit 1
-    if ! $RARING; then
-        sudo add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper || exit 2;
-        sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa || exit 3
-    fi
+    sudo add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper || exit 2;
+    sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa || exit 3
     sudo apt-get update || exit 4
     echo "Installing dependencies.."
-    if ! $RARING; then
-        sudo apt-get install -y qt-components-ubuntu qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev ubuntu-mobile || exit 5
-    else
-        sudo apt-get install -y qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev ubuntu-mobile || exit 6
-    fi
+    sudo apt-get install -y qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtbase5-private-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev ubuntu-mobile || exit 6
 }
 
 if [ -f "/usr/bin/ninja" ] ; then