[gnome-build-meta/valentindavid/publish-vm-ostree: 15/15] Merge branch 'valentindavid/publish-vm-ostree-clean' into valentindavid/publish-vm-ostree

[Valentin David <valentindavid src gnome org>]

commit 75e1ebef57a2c955393964595c9684339b25afc0
Merge: 6dd90850 2a9a3070
Author: Valentin David <valentin david codethink co uk>
Date:   Mon Jul 20 13:17:02 2020 +0200

    Merge branch 'valentindavid/publish-vm-ostree-clean' into valentindavid/publish-vm-ostree

 .gitlab-ci.yml                                     | 71 +++++++---------------
 elements/boards/pinebook-pro/keyboard-updater.bst  |  2 +-
 elements/core-deps.bst                             |  2 -
 elements/{sdk => core-deps}/dconf.bst              |  7 ++-
 elements/core-deps/eu-strip.bst                    | 21 +++++++
 elements/core-deps/flatpak-builder.bst             | 21 +++++++
 elements/core-deps/glade-libs.bst                  | 12 ----
 elements/core-deps/glade.bst                       | 27 --------
 elements/core-deps/ibus-daemon.bst                 | 15 +++++
 elements/core-deps/libgusb.bst                     |  2 +-
 elements/core-deps/libusb.bst                      |  9 ---
 elements/core-deps/sane-backends.bst               |  2 +-
 elements/core-deps/tracker-2.bst                   |  2 +-
 elements/core-deps/tracker-miners-2.bst            |  2 +-
 elements/core-deps/tracker-miners.bst              |  2 +-
 elements/core-deps/upower.bst                      |  2 +-
 elements/core/dconf-editor.bst                     |  2 +-
 elements/core/gdm.bst                              |  6 +-
 elements/core/gnome-builder.bst                    |  5 +-
 elements/core/gnome-control-center.bst             |  2 +-
 elements/core/gnome-initial-setup.bst              |  2 +-
 elements/core/gnome-settings-daemon.bst            |  2 +-
 elements/core/gnome-shell.bst                      |  2 +-
 elements/core/gnome-terminal.bst                   |  2 +-
 elements/{sdk => sdk-deps}/ibus.bst                |  9 ++-
 elements/sdk-platform.bst                          |  6 +-
 elements/sdk/libibus.bst                           | 21 +++++++
 elements/sdk/pinentry.bst                          | 24 ++++++++
 elements/sdk/tracker.bst                           |  1 +
 elements/vm-devel/deps.bst                         |  9 ---
 elements/vm/common-deps.bst                        |  2 +
 elements/vm/deps-devel.bst                         |  7 +++
 .../filesystem.bst => vm/filesystem-devel.bst}     |  3 +-
 .../initial-scripts-devel.bst}                     |  2 +-
 elements/{vm-devel/repo.bst => vm/repo-devel.bst}  |  8 +--
 elements/world/glade.bst                           | 21 ++++---
 elements/world/ibus-anthy.bst                      |  2 +-
 elements/world/ibus-hangul.bst                     |  2 +-
 elements/world/ibus-libpinyin.bst                  |  2 +-
 elements/world/libmtp.bst                          |  2 +-
 files/dconf/dconf-override.patch                   | 23 -------
 junction.refs                                      |  2 +-
 42 files changed, 191 insertions(+), 177 deletions(-)
---
diff --cc .gitlab-ci.yml
index daf419aa,14fab831..4fbddb8f
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -184,9 -175,7 +175,9 @@@ default
  
    - ostree init --repo repo/ --mode archive
  
-   - ${BST} -o arch "${ARCH}"  build vm/repo.bst vm-devel/repo.bst
 -  - ${BST} -o arch "${ARCH}" pull vm/repo.bst vm/repo-devel.bst
++  - ${BST} -o arch "${ARCH}"  build vm/repo.bst vm/repo-devel.bst
 +  #In strict mode, this should work instead
-   #- ${BST} -o arch "${ARCH}" pull vm/repo.bst vm-devel/repo.bst
++  #- ${BST} -o arch "${ARCH}" pull vm/repo.bst vm/repo-devel.bst
  
    - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/repo.bst checkout-repo/
    - flatpak build-commit-from --src-repo=checkout-repo/ repo/
diff --cc elements/core/gnome-control-center.bst
index 1becc4c0,9ea750ab..1a5279f7
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@@ -24,8 -24,9 +24,9 @@@ depends
  - core-deps/gnome-online-accounts.bst
  - core-deps/grilo.bst
  - core-deps/gsound.bst
+ - core-deps/ibus-daemon.bst
  - core-deps/libgtop.bst
 -- core-deps/libhandy-0.bst
 +- core-deps/libhandy.bst
  - core-deps/libnma.bst
  - core-deps/samba.bst
  - core-deps/system-config-printer.bst