[gnome-build-meta/sam/tracker3: 5/5] WIP: Remove Tracker 2 from core

[Sam Thursfield <sthursfield src gnome org>]

commit 10074af7c15e48a7cb4630ccb547626344496deb
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Aug 10 12:48:07 2020 +0200

    WIP: Remove Tracker 2 from core
    
    This uses non-master branches for some components which are still
    waiting to merge the tracker3 porting branches.
    
    Some apps in 'world' still depend on Tracker 2, so for now we have
    moved Tracker 2 into world/. This is a short-term fix as we do not
    want distros to have to enable Tracker 2 and Tracker 3 at the same
    time (which would cause 2x indexing resource consumption).

 elements/core-deps.bst                             | 2 --
 elements/core-deps/gnome-online-miners.bst         | 4 ++--
 elements/core/gnome-boxes.bst                      | 8 +++++---
 elements/core/gnome-music.bst                      | 6 +++---
 elements/core/gnome-photos.bst                     | 6 +++---
 elements/core/nautilus.bst                         | 6 +++---
 elements/world/gnome-documents.bst                 | 4 ++--
 elements/world/gnome-games.bst                     | 4 ++--
 elements/{core-deps => world}/tracker-2.bst        | 0
 elements/{core-deps => world}/tracker-miners-2.bst | 0
 10 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 5a06b8f2..6664da0d 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -116,8 +116,6 @@ depends:
 - core-deps/template-glib.bst
 - core-deps/tepl.bst
 - core-deps/totem-pl-parser.bst
-- core-deps/tracker-2.bst
-- core-deps/tracker-miners-2.bst
 - core-deps/tracker-miners.bst
 - core-deps/udisks2.bst
 - core-deps/uhttpmock.bst
diff --git a/elements/core-deps/gnome-online-miners.bst b/elements/core-deps/gnome-online-miners.bst
index 49ae8e8c..6d21cd45 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -2,7 +2,7 @@ kind: autotools
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-online-miners.git
-  track: master
+  track: sam/tracker3
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
@@ -10,8 +10,8 @@ depends:
 - core-deps/grilo.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph-0.2.bst
-- core-deps/tracker-2.bst
 - sdk/glib.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index d0b5fe87..c00f2d43 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -3,7 +3,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-boxes.git
-  track: master
+  track: wip/carlosg/tracker3
   submodules:
     subprojects/gtk-frdp:
       checkout: true
@@ -24,8 +24,7 @@ depends:
 - core-deps/libosinfo.bst
 - core-deps/libvirt-glib.bst
 - core-deps/spice-gtk.bst
-- core-deps/tracker-2.bst
-- core-deps/tracker-miners-2.bst
+- core-deps/tracker-miners.bst
 - core-deps/vte.bst
 - sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
@@ -34,5 +33,8 @@ depends:
 - sdk/gtksourceview.bst
 - sdk/json-glib.bst
 - sdk/libsecret.bst
+- sdk/tracker.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-music.bst b/elements/core/gnome-music.bst
index be538a2e..f1288279 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -2,7 +2,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-music.git
-  track: master
+  track: wip/carlosg/tracker3
   submodules:
     subprojects/libgd:
       checkout: true
@@ -20,12 +20,12 @@ depends:
 - core-deps/grilo.bst
 - core-deps/libdazzle.bst
 - core-deps/libmediaart.bst
-- core-deps/tracker-miners-2.bst
-- core-deps/tracker-2.bst
+- core-deps/tracker-miners.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/gvfs.bst
 - sdk/pygobject.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 59a61b28..5c1c34d2 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -2,7 +2,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-photos.git
-  track: master
+  track: sam/tracker3
   submodules:
     subprojects/libgd:
       checkout: true
@@ -22,13 +22,13 @@ depends:
 - core-deps/libdazzle.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph-0.2.bst
-- core-deps/tracker-miners-2.bst
-- core-deps/tracker-2.bst
+- core-deps/tracker-miners.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/nautilus.bst b/elements/core/nautilus.bst
index 4c09f644..40f63b7f 100644
--- a/elements/core/nautilus.bst
+++ b/elements/core/nautilus.bst
@@ -2,7 +2,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/nautilus.git
-  track: master
+  track: sam/tracker-3
   submodules:
     subprojects/libgd:
       checkout: true
@@ -12,14 +12,14 @@ build-depends:
 depends:
 - core-deps/gexiv2.bst
 - core-deps/gnome-autoar.bst
-- core-deps/tracker-miners-2.bst
-- core-deps/tracker-2.bst
+- core-deps/tracker-miners.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/pango.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 6b327afe..4d6083c8 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -15,8 +15,6 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
 - core-deps/libgdata.bst
-- core-deps/tracker-miners-2.bst
-- core-deps/tracker-2.bst
 - core/evince.bst
 - core/gnome-desktop.bst
 - sdk/WebKitGTK.bst
@@ -26,5 +24,7 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - world/libgepub.bst
+- world/tracker-miners-2.bst
+- world/tracker-2.bst
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-games.bst b/elements/world/gnome-games.bst
index 84d878a3..b891641f 100644
--- a/elements/world/gnome-games.bst
+++ b/elements/world/gnome-games.bst
@@ -11,8 +11,6 @@ depends:
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
 - core-deps/libhandy.bst
-- core-deps/tracker-miners-2.bst
-- core-deps/tracker-2.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
@@ -23,5 +21,7 @@ depends:
 - world/gnome-themes-extra.bst
 - world/libmanette.bst
 - world/retro-gtk.bst
+- world/tracker-miners-2.bst
+- world/tracker-2.bst
 - freedesktop-sdk.bst:components/hicolor-icon-theme.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/tracker-2.bst b/elements/world/tracker-2.bst
similarity index 100%
rename from elements/core-deps/tracker-2.bst
rename to elements/world/tracker-2.bst
diff --git a/elements/core-deps/tracker-miners-2.bst b/elements/world/tracker-miners-2.bst
similarity index 100%
rename from elements/core-deps/tracker-miners-2.bst
rename to elements/world/tracker-miners-2.bst