diffstat for totem-3.26.2 totem-3.26.2 changelog | 160 +++++++++++++++++++++ control | 44 +++-- control.in | 42 +++-- gbp.conf | 8 - patches/91_quicklist_entries.patch | 45 +++++ patches/dont-make-compulsory.patch | 21 ++ patches/series | 4 patches/ubuntu-grilo-filesystem.patch | 144 ++++++++++++++++++ patches/ubuntu-make-zeitgeist-plugin-builtin.patch | 23 +++ source_totem.py | 18 ++ totem-common.install | 1 totem-plugins-extra.install | 1 totem-plugins.install | 1 13 files changed, 481 insertions(+), 31 deletions(-) diff -Nru totem-3.26.2/debian/changelog totem-3.26.2/debian/changelog --- totem-3.26.2/debian/changelog 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/changelog 2018-08-27 09:09:47.000000000 +0000 @@ -1,3 +1,33 @@ +totem (3.26.2-1ubuntu1) cosmic; urgency=medium + + * Merge with Debian (LP: #1788568). Remaining changes: + - debian/control.in: + + Drop libxtst-dev build-depends so that the (redundant) fake key presses + for inhibiting the screensaver are disabled (LP: #1007438) + + Depend on grilo base plugins not the full set + + Suggest rather than recommend gstreamer components in universe + + Add totem-plugins-extra + + Don't recommend gnome-settings-daemon from the plugins any more; it's + not right to pull in desktop integration bits by default. + + Use ubuntu-desktop vcs + - debian/totem-common.install, debian/source_totem.py: + + Install Ubuntu apport debugging hook + - debian/totem-plugins-extra.install: + + Universe plugins split out of totem-plugins (currently only gromit) + - debian/totem-plugins.install: + + Skip the plugins split to -extra + - debian/gbp.conf: Use ubuntu settings + - debian/patches/91_quicklist_entries.patch: + + Add static quicklist. + - ubuntu-grilo-filesystem.patch: + + Use grl-filesystem if tracker is not available. + - ubuntu-make-zeitgeist-plugin-builtin.patch: + + Make Zeitgeist Plugin Builtin. + - dont-make-compulsory.patch: + + Allow Totem to be uninstalled from the GNOME Software app. + + -- Andrea Azzarone Fri, 24 Aug 2018 14:37:31 +0300 + totem (3.26.2-1) unstable; urgency=medium * New upstream release @@ -71,6 +101,52 @@ -- Jeremy Bicha Wed, 13 Sep 2017 21:27:50 -0400 +totem (3.26.0-0ubuntu6) bionic; urgency=medium + + * Add dont-make-compulsory.patch: + Allow Totem to be uninstalled from the GNOME Software app + + -- Jeremy Bicha Wed, 04 Apr 2018 10:20:36 -0400 + +totem (3.26.0-0ubuntu5) bionic; urgency=medium + + * Add fix-build-with-gtk-doc-126.patch to build with gtk-doc 1.26 + + -- Jeremy Bicha Thu, 15 Feb 2018 22:48:26 -0500 + +totem (3.26.0-0ubuntu4) bionic; urgency=medium + + * No-change rebuild against latest gnome-desktop3 + + -- Jeremy Bicha Thu, 15 Feb 2018 22:09:56 -0500 + +totem (3.26.0-0ubuntu3) bionic; urgency=medium + + * Drop patches that provided old-style decorations and menus for Unity7. + This conveniently also fixes LP: #1502476. LP: #1719322 + + -- Daniel van Vugt Thu, 25 Jan 2018 05:42:51 +0800 + +totem (3.26.0-0ubuntu2) bionic; urgency=medium + + * No-change rebuild against latest totem-pl-parser + + -- Jeremy Bicha Thu, 26 Oct 2017 19:24:20 -0400 + +totem (3.26.0-0ubuntu1) artful; urgency=medium + + [ Jeremy Bicha ] + * New upstream release + * Drop fix-lirc-detection.patch: Applied in new release + * Drop fix-bvw_update_tags-performance.patch: Obsolete + * debian/totem.install: Adjust to new appstream metadata install location + + [ Rico Tzschichholz ] + * Add fix-vala-build.patch: + - Fix vala/meson build ordering issue + + -- Jeremy Bicha Wed, 11 Oct 2017 19:32:18 -0400 + totem (3.25.90.1-2) unstable; urgency=medium * Use C.UTF-8 locale to fix build failure @@ -93,6 +169,50 @@ -- Jeremy Bicha Fri, 01 Sep 2017 14:36:58 -0400 +totem (3.25.90.1-0ubuntu3) artful; urgency=medium + + * debian/patches/fix-bvw_update_tags-performance.patch: Update the patch + to avoid passing NULL pointers around (LP: #1713386) + + -- Daniel van Vugt Mon, 28 Aug 2017 11:33:42 +0800 + +totem (3.25.90.1-0ubuntu2) artful; urgency=medium + + * debian/patches/fix-bvw_update_tags-performance.patch: + - bacon-video-widget.c: Reduce CPU usage and visible stuttering + (LP: #1698282 and LP: #1698270). + + -- Daniel van Vugt Mon, 21 Aug 2017 16:10:19 +0800 + +totem (3.25.90.1-0ubuntu1) artful; urgency=medium + + * New upstream release + * Build with meson (Closes: #829923) + * debian/control.in: + - Build-Depend on pylint3 and dh-python + * debian/totem.install: + - Install new thumbnailer + * Refresh patches + * Remove correct_desktop_mimetypes.patch: + - Doesn't appear to be needed any more + * Add fix-lirc-detection.patch: + - Adjust lirc library detection check so that lirc plugin is built + + -- Jeremy Bicha Sun, 13 Aug 2017 19:28:03 -0400 + +totem (3.24.0-0ubuntu1) zesty; urgency=medium + + * New upstream translations release + + -- Jeremy Bicha Mon, 20 Mar 2017 10:36:38 -0400 + +totem (3.23.90-0ubuntu1) zesty; urgency=medium + + * New upstream release + * Refresh 0001-Add-a-traditional-menubar.patch + + -- Jeremy Bicha Mon, 13 Feb 2017 13:55:36 -0500 + totem (3.22.1-1) unstable; urgency=medium [ Jeremy Bicha ] @@ -104,6 +224,46 @@ -- Michael Biebl Sun, 05 Mar 2017 02:04:16 +0100 +totem (3.22.0-2ubuntu1) zesty; urgency=medium + + * Merge with Debian (LP: #1609215). Remaining changes: + - debian/control.in: + + Drop libxtst-dev build-depends so that the (redundant) fake key presses + for inhibiting the screensaver are disabled (LP: #1007438) + + Depend on grilo base plugins not the full set + + Suggest rather than recommend gstreamer components in universe + + Add totem-plugins-extra + + Don't recommend gnome-settings-daemon from the plugins any more; it's + not right to pull in desktop integration bits by default. + + Use ubuntu-desktop vcs + + Add Multi-Arch tags + - debian/rules: + + Generate compatibility .desktop file + - debian/totem-common.install, debian/source_totem.py: + + Install Ubuntu apport debugging hook + - debian/totem-plugins-extra.install: + + Universe plugins split out of totem-plugins (currently only gromit) + - debian/totem-plugins.install: + + Skip the plugins split to -extra + - debian/patches/0001-Add-a-traditional-menubar.patch: + + Add a traditional menubar + - debian/patches/correct_desktop_mimetypes.patch: + + Don't list the mimetypes after the unity lists + - debian/patches/91_quicklist_entries.patch: + + Add static quicklist + - debian/patches/ubuntu-grilo-filesystem.patch: + + Use grl-filesystem if tracker is not available + - debian/patches/ubuntu-use-traditional-titlebars.patch: + + Use traditional titlebars on !GNOME + - debian/patches/0001-totem-open-location-Respect-gtk-dialogs-use-header-s.patch: + + Respect gtk-dialogs-use-header setting + - debian/patches/0002-preferences-Respect-gtk-dialogs-use-header-setting.patch: + + Respect gtk-dialogs-use-header setting + - debian/patches/0003-totem-movie-properties-Respect-gtk-dialogs-use-heade.patch: + + Respect gtk-dialogs-use-header setting + + -- Jeremy Bicha Mon, 24 Oct 2016 20:28:08 -0400 + totem (3.22.0-2) unstable; urgency=medium * Bump Build-Depends on libnautilus-extension-dev to (>= 3.21.92-3~) to diff -Nru totem-3.26.2/debian/control totem-3.26.2/debian/control --- totem-3.26.2/debian/control 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/control 2018-08-27 09:09:47.000000000 +0000 @@ -5,8 +5,9 @@ Source: totem Section: video Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Jeremy Bicha , Laurent Bigonville , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Emilio Pozuelo Monfort , Laurent Bigonville , Michael Biebl Build-Depends: appstream-util, debhelper (>= 11.1.3), dh-python, @@ -44,7 +45,6 @@ libx11-dev, libxml2-dev (>= 2.6.0), libxrandr-dev (>= 2:1.1.1), - libxtst-dev, libxxf86vm-dev (>= 1:1.0.1), libzeitgeist-2.0-dev (>= 0.9.12), meson (>= 0.43.0), @@ -55,8 +55,10 @@ x11proto-core-dev Rules-Requires-Root: no Standards-Version: 4.2.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/totem -Vcs-Git: https://salsa.debian.org/gnome-team/totem.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/totem +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/totem.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/totem +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/totem Homepage: https://wiki.gnome.org/Apps/Videos Package: libtotem0 @@ -82,13 +84,13 @@ gstreamer1.0-plugins-base (>= 1.6.0), gstreamer1.0-plugins-good (>= 1.10), gstreamer1.0-x, - grilo-plugins-0.3 -Recommends: gstreamer1.0-libav, - gstreamer1.0-plugins-ugly, - gstreamer1.0-plugins-bad, - gstreamer1.0-pulseaudio, + grilo-plugins-0.3-base +Recommends: gstreamer1.0-pulseaudio, totem-plugins -Suggests: gnome-codec-install +Suggests: gnome-codec-install, + gstreamer1.0-libav, + gstreamer1.0-plugins-bad, + gstreamer1.0-plugins-ugly, Description: Simple media player for the GNOME desktop based on GStreamer Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. It features : @@ -136,15 +138,13 @@ gir1.2-totem-1.0 (= ${binary:Version}), python3-gi (>= 2.90.3), python3-xdg -Recommends: gnome-settings-daemon, zeitgeist-core -Suggests: gromit +Recommends: zeitgeist-core Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. . This package contains a set of recommended plugins for Totem: . - * Annotate the screen with the Gromit tool * Control Totem with an Infrared remote control * Control Totem with the keyboard's media player keys * Keep the Totem window on top of the screen @@ -159,6 +159,22 @@ . Additional plugins can be written in C, Python or Vala. +Package: totem-plugins-extra +Architecture: any +Depends: totem (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: gromit +Description: Extra plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of extra plugins for Totem: + . + * Annotate the screen with the Gromit tool + . + Additional plugins can be written in C, Python or Vala. + Package: gir1.2-totem-1.0 Section: introspection Architecture: any diff -Nru totem-3.26.2/debian/control.in totem-3.26.2/debian/control.in --- totem-3.26.2/debian/control.in 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/control.in 2018-08-27 09:09:47.000000000 +0000 @@ -1,7 +1,8 @@ Source: totem Section: video Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: appstream-util, debhelper (>= 11.1.3), @@ -40,7 +41,6 @@ libx11-dev, libxml2-dev (>= 2.6.0), libxrandr-dev (>= 2:1.1.1), - libxtst-dev, libxxf86vm-dev (>= 1:1.0.1), libzeitgeist-2.0-dev (>= 0.9.12), meson (>= 0.43.0), @@ -51,8 +51,10 @@ x11proto-core-dev Rules-Requires-Root: no Standards-Version: 4.2.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/totem -Vcs-Git: https://salsa.debian.org/gnome-team/totem.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/totem +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/totem.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/totem +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/totem Homepage: https://wiki.gnome.org/Apps/Videos Package: libtotem0 @@ -78,13 +80,13 @@ gstreamer1.0-plugins-base (>= 1.6.0), gstreamer1.0-plugins-good (>= 1.10), gstreamer1.0-x, - grilo-plugins-0.3 -Recommends: gstreamer1.0-libav, - gstreamer1.0-plugins-ugly, - gstreamer1.0-plugins-bad, - gstreamer1.0-pulseaudio, + grilo-plugins-0.3-base +Recommends: gstreamer1.0-pulseaudio, totem-plugins -Suggests: gnome-codec-install +Suggests: gnome-codec-install, + gstreamer1.0-libav, + gstreamer1.0-plugins-bad, + gstreamer1.0-plugins-ugly, Description: Simple media player for the GNOME desktop based on GStreamer Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. It features : @@ -132,15 +134,13 @@ gir1.2-totem-1.0 (= ${binary:Version}), python3-gi (>= 2.90.3), python3-xdg -Recommends: gnome-settings-daemon, zeitgeist-core -Suggests: gromit +Recommends: zeitgeist-core Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. . This package contains a set of recommended plugins for Totem: . - * Annotate the screen with the Gromit tool * Control Totem with an Infrared remote control * Control Totem with the keyboard's media player keys * Keep the Totem window on top of the screen @@ -155,6 +155,22 @@ . Additional plugins can be written in C, Python or Vala. +Package: totem-plugins-extra +Architecture: any +Depends: totem (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: gromit +Description: Extra plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of extra plugins for Totem: + . + * Annotate the screen with the Gromit tool + . + Additional plugins can be written in C, Python or Vala. + Package: gir1.2-totem-1.0 Section: introspection Architecture: any diff -Nru totem-3.26.2/debian/gbp.conf totem-3.26.2/debian/gbp.conf --- totem-3.26.2/debian/gbp.conf 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/gbp.conf 2018-08-27 09:09:47.000000000 +0000 @@ -1,4 +1,6 @@ [DEFAULT] -pristine-tar = True -debian-branch = debian/master -upstream-branch = upstream/latest +debian-branch=ubuntu/master +upstream-branch=upstream/latest +debian-tag=ubuntu/%(version)s +upstream-vcs-tag=%(version)s +pristine-tar=True diff -Nru totem-3.26.2/debian/patches/91_quicklist_entries.patch totem-3.26.2/debian/patches/91_quicklist_entries.patch --- totem-3.26.2/debian/patches/91_quicklist_entries.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.26.2/debian/patches/91_quicklist_entries.patch 2018-08-27 09:09:47.000000000 +0000 @@ -0,0 +1,45 @@ +From: Ubuntu Developers +Date: Fri, 24 Aug 2018 14:29:48 +0300 +Subject: _quicklist_entries +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/totem/+bug/938031 +Origin: vendor +Forwarded: https://bugzilla.gnome.org/671088 +Reviewed-By: Stéphane Graber +--- + data/org.gnome.Totem.desktop.in.in | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/data/org.gnome.Totem.desktop.in.in b/data/org.gnome.Totem.desktop.in.in +index 975e04d..ec25abf 100644 +--- a/data/org.gnome.Totem.desktop.in.in ++++ b/data/org.gnome.Totem.desktop.in.in +@@ -16,3 +16,25 @@ X-GNOME-Bugzilla-Version=@VERSION@ + X-GNOME-Bugzilla-OtherBinaries=totem-video-thumbnailer; + StartupNotify=true + @MIME_TYPE@ ++ ++Actions=Play;Next;Previous;Mute;Fullscreen; ++ ++[Desktop Action Play] ++Name=Play/Pause ++Exec=totem --play-pause ++ ++[Desktop Action Next] ++Name=Next ++Exec=totem --next ++ ++[Desktop Action Previous] ++Name=Previous ++Exec=totem --previous ++ ++[Desktop Action Mute] ++Name=Mute ++Exec=totem --mute ++ ++[Desktop Action Fullscreen] ++Name=Fullscreen ++Exec=totem --fullscreen diff -Nru totem-3.26.2/debian/patches/dont-make-compulsory.patch totem-3.26.2/debian/patches/dont-make-compulsory.patch --- totem-3.26.2/debian/patches/dont-make-compulsory.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.26.2/debian/patches/dont-make-compulsory.patch 2018-08-27 09:09:47.000000000 +0000 @@ -0,0 +1,21 @@ +From: Jeremy Bicha +Date: Wed, 4 Apr 2018 10:19:30 -0400 +Subject: Allow users to uninstall Totem using the GNOME Software app + +since we explicitly allow it to be removed in our minimal install option +--- + data/appdata/org.gnome.Totem.appdata.xml.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/appdata/org.gnome.Totem.appdata.xml.in b/data/appdata/org.gnome.Totem.appdata.xml.in +index e69ca08..ec9f7ec 100644 +--- a/data/appdata/org.gnome.Totem.appdata.xml.in ++++ b/data/appdata/org.gnome.Totem.appdata.xml.in +@@ -31,7 +31,6 @@ + + hadess@hadess.net + GNOME +- GNOME + totem + + none diff -Nru totem-3.26.2/debian/patches/series totem-3.26.2/debian/patches/series --- totem-3.26.2/debian/patches/series 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/patches/series 2018-08-27 09:09:47.000000000 +0000 @@ -1 +1,5 @@ debian/Don-t-run-pylint-at-build-time.patch +91_quicklist_entries.patch +ubuntu-grilo-filesystem.patch +ubuntu-make-zeitgeist-plugin-builtin.patch +dont-make-compulsory.patch diff -Nru totem-3.26.2/debian/patches/ubuntu-grilo-filesystem.patch totem-3.26.2/debian/patches/ubuntu-grilo-filesystem.patch --- totem-3.26.2/debian/patches/ubuntu-grilo-filesystem.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.26.2/debian/patches/ubuntu-grilo-filesystem.patch 2018-08-27 09:09:47.000000000 +0000 @@ -0,0 +1,144 @@ +From: Tim Lunn +Date: Thu, 20 Nov 2014 16:57:20 +1100 +Subject: [PATCH 1/2] Fallback to grl-filesystem if tracker is not available. + +--- + src/totem-grilo.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 58 insertions(+), 7 deletions(-) + +diff --git a/src/totem-grilo.c b/src/totem-grilo.c +index 01adeab..ccb0511 100644 +--- a/src/totem-grilo.c ++++ b/src/totem-grilo.c +@@ -190,6 +190,20 @@ strv_has_prefix (const char * const *strv, + + return FALSE; + } ++static gboolean ++have_tracker (void) ++{ ++ GrlSource *source; ++ GrlRegistry *registry; ++ registry = grl_registry_get_default (); ++ ++ source = grl_registry_lookup_source (registry, "grl-tracker-source"); ++ if (source) { ++ return TRUE; ++ } ++ ++ return FALSE; ++} + + static gboolean + source_is_blacklisted (GrlSource *source) +@@ -241,8 +255,24 @@ source_is_search_blacklisted (GrlSource *source) + } + + static gboolean ++source_is_filesystem (GrlSource *source) ++{ ++ const char *id; ++ const char const *sources[] = { ++ "grl-filesystem", ++ NULL ++ }; ++ ++ id = grl_source_get_id (source); ++ g_assert (id); ++ ++ return strv_has_prefix (sources, id); ++} ++ ++static gboolean + source_is_recent (GrlSource *source) + { ++ gboolean result; + const char *id; + const char * const sources[] = { + "grl-tracker-source", +@@ -254,7 +284,10 @@ source_is_recent (GrlSource *source) + id = grl_source_get_id (source); + g_assert (id); + +- return strv_has_prefix (sources, id); ++ result = strv_has_prefix (sources, id); ++ if (!result && !have_tracker()) ++ result = source_is_filesystem(source); ++ return result; + } + + static gboolean +@@ -611,6 +644,8 @@ get_source_priority (GrlSource *source) + return 100; + if (g_str_equal (id, "grl-bookmarks")) + return 75; ++ if (g_str_equal (id, "grl-bookmarks")) ++ return 60; + if (g_str_equal (id, "grl-tracker-source")) + return 50; + if (g_str_has_prefix (id, "grl-upnp-") || +@@ -1290,8 +1325,7 @@ source_added_cb (GrlRegistry *registry, + if (source_is_recent (source)) { + browse (self, self->priv->recent_model, + NULL, source, NULL, -1); +- if (g_str_equal (id, "grl-tracker-source") == FALSE) +- monitor = TRUE; ++ monitor = TRUE; + } else if (!source_is_browse_blacklisted (source)) { + const GdkPixbuf *icon; + +@@ -1306,11 +1340,12 @@ source_added_cb (GrlRegistry *registry, + MODEL_RESULTS_IS_PRETHUMBNAIL, TRUE, + MODEL_RESULTS_CAN_REMOVE, can_remove (source, NULL), + -1); +- +- if (g_str_equal (id, "grl-filesystem") == FALSE) +- monitor = TRUE; ++ monitor = TRUE; + } + ++ if (g_str_equal (id, "grl-filesystem")) ++ monitor = FALSE; ++ + if (monitor && (ops & GRL_OP_NOTIFY_CHANGE)) { + grl_source_notify_change_start (source, NULL); + g_signal_connect (G_OBJECT (source), "content-changed", +@@ -1428,6 +1463,16 @@ load_grilo_plugins (TotemGrilo *self) + } + g_strfreev (configs); + ++ /* configure grl-filesystem with users home dir */ ++ if (!self->priv->fs_plugin_configured) { ++ GrlConfig *config; ++ ++ config = grl_config_new ("grl-filesystem", NULL); ++ grl_config_set_string (config, "base-uri", g_filename_to_uri(g_get_home_dir(),NULL,NULL)); ++ grl_registry_add_config (registry, config, NULL); ++ self->priv->fs_plugin_configured = TRUE; ++ } ++ + g_signal_connect (registry, "source-added", + G_CALLBACK (source_added_cb), self); + g_signal_connect (registry, "source-removed", +@@ -1437,6 +1482,8 @@ load_grilo_plugins (TotemGrilo *self) + g_warning ("Failed to load grilo plugins: %s", error->message); + g_error_free (error); + } ++ ++ have_tracker(); + } + + static gboolean +@@ -1911,7 +1958,11 @@ search_mode_changed (GObject *gobject, + /* Try to guess which source should be used for search */ + model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser)); + if (model == self->priv->recent_sort_model) { +- id = "grl-tracker-source"; ++ if (have_tracker()) ++ id = "grl-tracker-source"; ++ else ++ id = "grl-filesystem"; ++ + self->priv->last_page = g_strdup ("recent"); + } else { + GtkTreeIter iter; diff -Nru totem-3.26.2/debian/patches/ubuntu-make-zeitgeist-plugin-builtin.patch totem-3.26.2/debian/patches/ubuntu-make-zeitgeist-plugin-builtin.patch --- totem-3.26.2/debian/patches/ubuntu-make-zeitgeist-plugin-builtin.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.26.2/debian/patches/ubuntu-make-zeitgeist-plugin-builtin.patch 2018-08-27 09:09:47.000000000 +0000 @@ -0,0 +1,23 @@ +From: Jeremy Bicha +Date: Fri, 24 Aug 2018 14:29:48 +0300 +Subject: Make sure that Zeitgeist plugin is enabled by default + +Bug: https://launchpad.net/bugs/1621162 +Forwarded: no, upstreams don't use Zeitgeist by default +=================================================================== +--- + src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in b/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in +index 71a6908..621ba30 100644 +--- a/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in ++++ b/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in +@@ -1,6 +1,7 @@ + [Plugin] + Module=totem-zeitgeist-dp-plugin + IAge=1 ++Builtin=True + _Name=Zeitgeist Plugin + _Description=A plugin sending events to Zeitgeist + Authors=Michal Hruby diff -Nru totem-3.26.2/debian/source_totem.py totem-3.26.2/debian/source_totem.py --- totem-3.26.2/debian/source_totem.py 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.26.2/debian/source_totem.py 2018-08-27 09:09:47.000000000 +0000 @@ -0,0 +1,18 @@ +import os, apport.packaging, apport.hookutils + +def add_info(report, ui): + + report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"]) + report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*") + report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log") + + response = ui.choice("How would you describe the issue?", ["The totem interface is not working correctly", "No sound is being played", "Some audio files or videos are not being played correctly"], False) + + if response == None: # user cancelled + raise StopIteration + if response[0] == 1: # the issue is a sound one + os.execlp('apport-bug', 'apport-bug', 'audio') + + if response[0] == 2: # the issue is a codec one + report.add_package_info("libgstreamer1.0-0") + return diff -Nru totem-3.26.2/debian/totem-common.install totem-3.26.2/debian/totem-common.install --- totem-3.26.2/debian/totem-common.install 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/totem-common.install 2018-08-27 09:09:47.000000000 +0000 @@ -1,3 +1,4 @@ +debian/source_totem.py usr/share/apport/package-hooks usr/share/GConf usr/share/glib-2.0 usr/share/gtk-doc diff -Nru totem-3.26.2/debian/totem-plugins-extra.install totem-3.26.2/debian/totem-plugins-extra.install --- totem-3.26.2/debian/totem-plugins-extra.install 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.26.2/debian/totem-plugins-extra.install 2018-08-27 09:09:47.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/totem/plugins/gromit diff -Nru totem-3.26.2/debian/totem-plugins.install totem-3.26.2/debian/totem-plugins.install --- totem-3.26.2/debian/totem-plugins.install 2018-08-23 08:08:17.000000000 +0000 +++ totem-3.26.2/debian/totem-plugins.install 2018-08-27 09:09:47.000000000 +0000 @@ -5,7 +5,6 @@ usr/lib/*/totem/plugins/brasero-disc-recorder #usr/lib/*/totem/plugins/chapters usr/lib/*/totem/plugins/dbus -usr/lib/*/totem/plugins/gromit usr/lib/*/totem/plugins/im-status usr/lib/*/totem/plugins/lirc usr/lib/*/totem/plugins/media-player-keys