Merge lp:~lool/click/14.10-framework into lp:click/devel

[Loïc Minier]

Add 14.10 framework in places where all frameworks are listed.

I didn't change all references of 14.04 such as documentation as 14.10 is still in development. We probably want to do this near the end of the cycle.

I've tested this with click chroot create -a amd64 (created saucy chroot) and click chroot create -a amd64 -f ubuntu-sdk-14.10, and both worked. Package builds and that runs the testsuite. NB: I did hit testsuite failures with -j4 but that's not a regression from this branch and they go away when I drop the -j4.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-05-20 13:13:32 +0000
+++ click/chroot.py	2014-05-22 09:03:30 +0000
@@ -41,12 +41,19 @@
     "ubuntu-sdk-14.04-html-dev1": "ubuntu-sdk-14.04",
     "ubuntu-sdk-14.04-papi-dev1": "ubuntu-sdk-14.04",
     "ubuntu-sdk-14.04-qml-dev1": "ubuntu-sdk-14.04",
+    "ubuntu-sdk-14.04-html": "ubuntu-sdk-14.04",
+    "ubuntu-sdk-14.04-papi": "ubuntu-sdk-14.04",
+    "ubuntu-sdk-14.04-qml": "ubuntu-sdk-14.04",
+    "ubuntu-sdk-14.10-html-dev1": "ubuntu-sdk-14.04",
+    "ubuntu-sdk-14.10-papi-dev1": "ubuntu-sdk-14.04",
+    "ubuntu-sdk-14.10-qml-dev1": "ubuntu-sdk-14.04",
     }
 
 
 framework_series = {
     "ubuntu-sdk-13.10": "saucy",
     "ubuntu-sdk-14.04": "trusty",
+    "ubuntu-sdk-14.10": "utopic",
     }
 
 
@@ -87,6 +94,24 @@
         "qttools5-dev:TARGET",
         "qttools5-dev-tools:TARGET",
         ],
+    "ubuntu-sdk-14.10": [
+        "cmake",
+        "libqt5svg5-dev:TARGET",
+        "libqt5webkit5-dev:TARGET",
+        "libqt5xmlpatterns5-dev:TARGET",
+        "libunity-scopes-dev:TARGET",
+        "qt3d5-dev:TARGET",
+        "qt5-default:TARGET",
+        "qtbase5-dev:TARGET",
+        "qtdeclarative5-dev:TARGET",
+        "qtdeclarative5-dev-tools",
+        "qtlocation5-dev:TARGET",
+        "qtmultimedia5-dev:TARGET",
+        "qtscript5-dev:TARGET",
+        "qtsensors5-dev:TARGET",
+        "qttools5-dev:TARGET",
+        "qttools5-dev-tools:TARGET",
+        ],
     }
 
 

=== modified file 'click/tests/test_framework.py'
--- click/tests/test_framework.py	2014-03-10 14:49:27 +0000
+++ click/tests/test_framework.py	2014-05-22 09:03:30 +0000
@@ -72,9 +72,10 @@
             enter()
             self._setup_frameworks(
                 preloads,
-                frameworks={"ubuntu-sdk-13.10": {}, "ubuntu-sdk-14.04": {}})
+                frameworks={"ubuntu-sdk-13.10": {}, "ubuntu-sdk-14.04": {},
+                            "ubuntu-sdk-14.10": {}})
             self.assertEqual(
-                ["ubuntu-sdk-13.10", "ubuntu-sdk-14.04"],
+                ["ubuntu-sdk-13.10", "ubuntu-sdk-14.04", "ubuntu-sdk-14.10"],
                 sorted(
                     f.props.name for f in Click.Framework.get_frameworks ()))