Add core and hybris pacakge, and let touch depend on touch-core, and …

…hybris on touch

debian/changelog

@@ -1,3 +1,33 @@
+ubuntu-touch-meta (1.433xenial1ubports5) xenial; urgency=medium
+
+  * Added core and hybris package
+  * Let touch depend on core and let hybris depend on touch
+
+  * Refreshed dependencies
+  * Added account-polld-plugins-go to touch [amd64]
+  * Added language-pack-touch-br to touch
+  * Added language-pack-touch-cy to touch
+  * Added ntpdate to touch [amd64]
+  * Added qml-module-io-thp-pyotherside to sdk-libs
+  * Added qml-module-org-kde-kirigami2 to sdk-libs
+  * Added qml-module-qt-labs-folderlistmodel to sdk-libs
+  * Added qml-module-qtorganizer to sdk-libs
+  * Added qml-module-qtquick-localstorage to sdk-libs
+  * Added qml-module-qtquick-particles2 to sdk-libs
+  * Added qml-module-qtquick-window2 to sdk-libs
+  * Added qml-module-qtquick-xmllistmodel to sdk-libs
+  * Added qml-module-qtquick2 to sdk-libs
+  * Added qml-module-ubuntu-onlineaccounts-client to sdk-libs
+  * Added qtdeclarative5-doc to sdk
+  * Added qtfeedback5-doc to sdk
+  * Added qtlocation5-doc to sdk
+  * Added qtpim5-doc to sdk
+  * Added qtsensors5-doc to sdk
+  * Added qtwebsockets5-doc to sdk
+  * Added qtxmlpatterns5-doc to sdk
+
+ -- Marius Gripsgard <[email protected]>   Sat, 05 Jan 2019 12:28:19 +0100
+
 ubuntu-touch-meta (1.433xenial1ubports4) xenial; urgency=medium
 
   * Add mir caf platform

debian/control

@@ -42,16 +42,37 @@ Description: Ubuntu SDK Build Tools
  This package depends on all the packages of the Ubuntu SDK:
   - Build tools
 
-Package: ubuntu-touch
+Package: ubuntu-touch-core
 Architecture: amd64 arm64 armhf i386
 Depends: ubuntu-sdk-libs, ${germinate:Depends}, ${misc:Depends}
 Recommends: ${germinate:Recommends}
+Description: Ubuntu touch system core
+ This package depends on all of the core packages in the Ubuntu touch system
+ .
+ It is safe to remove this package if some of the touch system packages are
+ not desired.
+
+Package: ubuntu-touch
+Architecture: amd64 arm64 armhf i386
+Depends: ubuntu-touch-core, ${germinate:Depends}, ${misc:Depends}
+Recommends: ${germinate:Recommends}
 Description: Ubuntu touch system
  This package depends on all of the packages in the Ubuntu touch system
  .
  It is safe to remove this package if some of the touch system packages are
  not desired.
 
+Package: ubuntu-touch-hybris
+Architecture: amd64 arm64 armhf i386
+Depends: ubuntu-touch, ${germinate:Depends}, ${misc:Depends}
+Recommends: ${germinate:Recommends}
+Description: Ubuntu touch system hybris
+ This package depends on all of the packages in the Ubuntu touch system
+ including libhybris and hybris parts (for lxc android)
+ .
+ It is safe to remove this package if some of the touch system packages are
+ not desired.
+
 Package: ubuntu-desktop-next
 Architecture: amd64 armhf i386
 Depends: ubuntu-sdk-libs, ${germinate:Depends}, ${misc:Depends}

debootstrap-version

@@ -1 +1 @@
-1.0.78+nmu1
+1.0.95ubuntu0.1

metapackage-map

@@ -3,4 +3,5 @@ sdk-libs ubuntu-sdk-libs
 sdk-libs-dev ubuntu-sdk-libs-dev
 sdk-libs-tools ubuntu-sdk-libs-tools
 touch ubuntu-touch
-desktop ubuntu-desktop-next
+touch-core ubuntu-touch-core
+touch-hybris ubuntu-touch-hybris

sdk-amd64

@@ -6,11 +6,17 @@ qtbase5-doc
 qtcreator
 qtcreator-doc
 qtcreator-plugin-ubuntu
+qtdeclarative5-doc
+qtfeedback5-doc
 qtgraphicaleffects5-doc
+qtlocation5-doc
 qtmultimedia5-doc
-qtscript5-doc
+qtpim5-doc
+qtsensors5-doc
 qtsvg5-doc
 qttools5-doc
+qtwebsockets5-doc
+qtxmlpatterns5-doc
 ubuntu-device-flash
 ubuntu-ui-toolkit-autopilot
 ubuntu-ui-toolkit-examples

sdk-arm64

@@ -6,11 +6,17 @@ qtbase5-doc
 qtcreator
 qtcreator-doc
 qtcreator-plugin-ubuntu
+qtdeclarative5-doc
+qtfeedback5-doc
 qtgraphicaleffects5-doc
+qtlocation5-doc
 qtmultimedia5-doc
-qtscript5-doc
+qtpim5-doc
+qtsensors5-doc
 qtsvg5-doc
 qttools5-doc
+qtwebsockets5-doc
+qtxmlpatterns5-doc
 ubuntu-device-flash
 ubuntu-ui-toolkit-autopilot
 ubuntu-ui-toolkit-examples

sdk-armhf

@@ -6,11 +6,17 @@ qtbase5-doc
 qtcreator
 qtcreator-doc
 qtcreator-plugin-ubuntu
+qtdeclarative5-doc
+qtfeedback5-doc
 qtgraphicaleffects5-doc
+qtlocation5-doc
 qtmultimedia5-doc
-qtscript5-doc
+qtpim5-doc
+qtsensors5-doc
 qtsvg5-doc
 qttools5-doc
+qtwebsockets5-doc
+qtxmlpatterns5-doc
 ubuntu-device-flash
 ubuntu-ui-toolkit-autopilot
 ubuntu-ui-toolkit-examples

sdk-libs-amd64

@@ -6,29 +6,43 @@ libqt5keychain0
 libqt5multimedia5-plugins
 libqt5script5
 libqt5sql5-sqlite
+qml-module-io-thp-pyotherside
+qml-module-org-kde-kirigami2
+qml-module-qmltermwidget1.0
+qml-module-qt-labs-folderlistmodel
 qml-module-qt-labs-settings
 qml-module-qt-websockets
 qml-module-qtbluetooth
 qml-module-qtgraphicaleffects
 qml-module-qtlocation
 qml-module-qtmultimedia
+qml-module-qtorganizer
 qml-module-qtpositioning
 qml-module-qtqml-models2
 qml-module-qtqml-statemachine
+qml-module-qtquick-controls2
+qml-module-qtquick-controls2-suru
 qml-module-qtquick-layouts
+qml-module-qtquick-localstorage
+qml-module-qtquick-particles2
+qml-module-qtquick-window2
+qml-module-qtquick-xmllistmodel
+qml-module-qtquick2
 qml-module-qtsensors
 qml-module-qtsysteminfo
-qml-module-ubuntu-onlineaccounts
-qml-module-qtquick-controls2
-qml-module-qtquick-controls2-suru
 qml-module-qtwebengine
+qml-module-ubuntu-onlineaccounts
+qml-module-ubuntu-onlineaccounts-client
 qmlscene
-qtchooser
 qt5-image-formats-plugins
+qtchooser
+qtdeclarative5-archives0.1
 qtdeclarative5-folderlistmodel-plugin
 qtdeclarative5-localstorage-plugin
+qtdeclarative5-nemo-qml-plugin-folderlistmodel
 qtdeclarative5-online-accounts-client0.1
 qtdeclarative5-particles-plugin
+qtdeclarative5-placesmodel0.1
 qtdeclarative5-poppler1.0
 qtdeclarative5-qtorganizer-plugin
 qtdeclarative5-qtquick2-plugin
@@ -45,7 +59,3 @@ qtdeclarative5-window-plugin
 qtdeclarative5-xmllistmodel-plugin
 ubuntu-html5-theme
 ubuntu-ui-toolkit-theme
-qml-module-qmltermwidget1.0
-qtdeclarative5-nemo-qml-plugin-folderlistmodel
-qtdeclarative5-placesmodel0.1
-qtdeclarative5-archives0.1

sdk-libs-arm64

@@ -6,29 +6,43 @@ libqt5keychain0
 libqt5multimedia5-plugins
 libqt5script5
 libqt5sql5-sqlite
+qml-module-io-thp-pyotherside
+qml-module-org-kde-kirigami2
+qml-module-qmltermwidget1.0
+qml-module-qt-labs-folderlistmodel
 qml-module-qt-labs-settings
 qml-module-qt-websockets
 qml-module-qtbluetooth
 qml-module-qtgraphicaleffects
 qml-module-qtlocation
 qml-module-qtmultimedia
+qml-module-qtorganizer
 qml-module-qtpositioning
 qml-module-qtqml-models2
 qml-module-qtqml-statemachine
+qml-module-qtquick-controls2
+qml-module-qtquick-controls2-suru
 qml-module-qtquick-layouts
+qml-module-qtquick-localstorage
+qml-module-qtquick-particles2
+qml-module-qtquick-window2
+qml-module-qtquick-xmllistmodel
+qml-module-qtquick2
 qml-module-qtsensors
 qml-module-qtsysteminfo
-qml-module-ubuntu-onlineaccounts
-qml-module-qtquick-controls2
-qml-module-qtquick-controls2-suru
 qml-module-qtwebengine
+qml-module-ubuntu-onlineaccounts
+qml-module-ubuntu-onlineaccounts-client
 qmlscene
-qtchooser
 qt5-image-formats-plugins
+qtchooser
+qtdeclarative5-archives0.1
 qtdeclarative5-folderlistmodel-plugin
 qtdeclarative5-localstorage-plugin
+qtdeclarative5-nemo-qml-plugin-folderlistmodel
 qtdeclarative5-online-accounts-client0.1
 qtdeclarative5-particles-plugin
+qtdeclarative5-placesmodel0.1
 qtdeclarative5-poppler1.0
 qtdeclarative5-qtorganizer-plugin
 qtdeclarative5-qtquick2-plugin
@@ -45,7 +59,3 @@ qtdeclarative5-window-plugin
 qtdeclarative5-xmllistmodel-plugin
 ubuntu-html5-theme
 ubuntu-ui-toolkit-theme
-qml-module-qmltermwidget1.0
-qtdeclarative5-nemo-qml-plugin-folderlistmodel
-qtdeclarative5-placesmodel0.1
-qtdeclarative5-archives0.1

sdk-libs-armhf

@@ -6,29 +6,43 @@ libqt5keychain0
 libqt5multimedia5-plugins
 libqt5script5
 libqt5sql5-sqlite
+qml-module-io-thp-pyotherside
+qml-module-org-kde-kirigami2
+qml-module-qmltermwidget1.0
+qml-module-qt-labs-folderlistmodel
 qml-module-qt-labs-settings
 qml-module-qt-websockets
 qml-module-qtbluetooth
 qml-module-qtgraphicaleffects
 qml-module-qtlocation
 qml-module-qtmultimedia
+qml-module-qtorganizer
 qml-module-qtpositioning
 qml-module-qtqml-models2
 qml-module-qtqml-statemachine
+qml-module-qtquick-controls2
+qml-module-qtquick-controls2-suru
 qml-module-qtquick-layouts
+qml-module-qtquick-localstorage
+qml-module-qtquick-particles2
+qml-module-qtquick-window2
+qml-module-qtquick-xmllistmodel
+qml-module-qtquick2
 qml-module-qtsensors
 qml-module-qtsysteminfo
-qml-module-ubuntu-onlineaccounts
-qml-module-qtquick-controls2
-qml-module-qtquick-controls2-suru
 qml-module-qtwebengine
+qml-module-ubuntu-onlineaccounts
+qml-module-ubuntu-onlineaccounts-client
 qmlscene
-qtchooser
 qt5-image-formats-plugins
+qtchooser
+qtdeclarative5-archives0.1
 qtdeclarative5-folderlistmodel-plugin
 qtdeclarative5-localstorage-plugin
+qtdeclarative5-nemo-qml-plugin-folderlistmodel
 qtdeclarative5-online-accounts-client0.1
 qtdeclarative5-particles-plugin
+qtdeclarative5-placesmodel0.1
 qtdeclarative5-poppler1.0
 qtdeclarative5-qtorganizer-plugin
 qtdeclarative5-qtquick2-plugin
@@ -45,7 +59,3 @@ qtdeclarative5-window-plugin
 qtdeclarative5-xmllistmodel-plugin
 ubuntu-html5-theme
 ubuntu-ui-toolkit-theme
-qml-module-qmltermwidget1.0
-qtdeclarative5-nemo-qml-plugin-folderlistmodel
-qtdeclarative5-placesmodel0.1
-qtdeclarative5-archives0.1

sdk-libs-dev-amd64

@@ -1,4 +1,5 @@
 google-mock
+kirigami2-dev
 libboost1.58-dev
 libcontent-hub-dev
 libjsoncpp-dev
@@ -24,4 +25,3 @@ qtscript5-dev
 qttools5-dev
 ubuntu-sdk-qmake-extras
 ubuntu-ui-toolkit-doc
-kirigami2-dev

sdk-libs-dev-arm64

@@ -1,4 +1,5 @@
 google-mock
+kirigami2-dev
 libboost1.58-dev
 libcontent-hub-dev
 libjsoncpp-dev
@@ -24,4 +25,3 @@ qtscript5-dev
 qttools5-dev
 ubuntu-sdk-qmake-extras
 ubuntu-ui-toolkit-doc
-kirigami2-dev

sdk-libs-dev-armhf

@@ -1,4 +1,5 @@
 google-mock
+kirigami2-dev
 libboost1.58-dev
 libcontent-hub-dev
 libjsoncpp-dev
@@ -24,4 +25,3 @@ qtscript5-dev
 qttools5-dev
 ubuntu-sdk-qmake-extras
 ubuntu-ui-toolkit-doc
-kirigami2-dev