diffstat of debian/ for totem_3.32.0-1 totem_3.32.0-1ubuntu1 changelog | 254 +++++++++++++++++++++++++++++++++++++ control | 9 - control.in | 9 - gbp.conf | 3 patches/91_quicklist_entries.patch | 45 ++++++ patches/Add-Mute-action.patch | 36 +++++ patches/dont-make-compulsory.patch | 21 +++ patches/series | 3 8 files changed, 373 insertions(+), 7 deletions(-) diff -Nru totem-3.32.0/debian/changelog totem-3.32.0/debian/changelog --- totem-3.32.0/debian/changelog 2019-03-09 10:38:15.000000000 +0000 +++ totem-3.32.0/debian/changelog 2019-03-09 10:39:46.000000000 +0000 @@ -1,3 +1,18 @@ +totem (3.32.0-1ubuntu1) disco; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/control.in: + + Use ubuntu-desktop vcs + - debian/gbp.conf: Use ubuntu settings + - Add dont-make-compulsory.patch: + + Allow Totem to be uninstalled from the GNOME Software app. + - Add 91_quicklist_entries.patch: + + Add static quicklist. + - Add Add-Mute-action.patch: + + Add Mute action so that we can use it as a Desktop Action + + -- Jeremy Bicha Sat, 09 Mar 2019 05:39:46 -0500 + totem (3.32.0-1) experimental; urgency=medium * New upstream release @@ -5,6 +20,23 @@ -- Jeremy Bicha Sat, 09 Mar 2019 05:38:15 -0500 +totem (3.31.91-1ubuntu1) disco; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/control.in: + + Use ubuntu-desktop vcs + - debian/gbp.conf: Use ubuntu settings + - Add dont-make-compulsory.patch: + + Allow Totem to be uninstalled from the GNOME Software app. + - Add 91_quicklist_entries.patch: + + Add static quicklist. + - Add Add-Mute-action.patch: + + Add Mute action so that we can use it as a Desktop Action + * Drop transitional totem-plugins-extra package: + - it only depended on the gromit plugin which has been removed + + -- Jeremy Bicha Thu, 21 Feb 2019 11:03:31 -0500 + totem (3.31.91-1) experimental; urgency=medium * New upstream development release @@ -21,6 +53,22 @@ -- Jeremy Bicha Thu, 21 Feb 2019 10:57:52 -0500 +totem (3.30.0-4ubuntu1) disco; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/control.in: + + Use ubuntu-desktop vcs + - debian/gbp.conf: Use ubuntu settings + - Add dont-make-compulsory.patch: + + Allow Totem to be uninstalled from the GNOME Software app. + - Add 91_quicklist_entries.patch: + + Add static quicklist. + - Add Add Add-Mute-action.patch: + + Add Mute action so that we can use it as a Desktop Action + * Add a totem-plugins-extra transitional package for the gromit plugin + + -- Jeremy Bicha Sun, 20 Jan 2019 09:44:49 -0500 + totem (3.30.0-4) unstable; urgency=medium * Make sure that totem-plugin-gromit Breaks/Replaces older totem-plugins @@ -43,6 +91,44 @@ -- Laurent Bigonville Sat, 12 Jan 2019 13:34:29 +0100 +totem (3.30.0-1ubuntu3) disco; urgency=medium + + * Modify 91_quicklist_entries.patch: + - Update Desktop Action names to match D-Bus names (LP: #1726688) + * Add Add-Mute-action.patch: + - Add Mute action so that we can use it as a Desktop Action + + -- Simone Piccardi Tue, 15 Jan 2019 19:09:08 +0100 + +totem (3.30.0-1ubuntu2) disco; urgency=medium + + * Fix typo in grilo dependency + + -- Jeremy Bicha Sat, 05 Jan 2019 18:10:13 -0500 + +totem (3.30.0-1ubuntu1) disco; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/control.in: + + Add totem-plugins-extra + + Use ubuntu-desktop vcs + - 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-make-zeitgeist-plugin-builtin.patch: + + Make Zeitgeist Plugin Builtin. + - dont-make-compulsory.patch: + + Allow Totem to be uninstalled from the GNOME Software app. + * Drop ubuntu-grilo-filesystem.patch: + + Use grl-filesystem if tracker is not available + (We no longer try to avoid tracker) + + -- Jeremy Bicha Sat, 05 Jan 2019 15:44:38 -0500 + totem (3.30.0-1) unstable; urgency=medium [ Jeremy Bicha ] @@ -61,6 +147,44 @@ -- Jeremy Bicha Sat, 05 Jan 2019 12:27:34 -0500 +totem (3.26.2-1ubuntu2) cosmic; urgency=medium + + * d/p/gallery-don-t-use-command-line-options-that-got-removed-f.patch, + d/p/screenshot-fix-invalid-free-created-by-the-previous-chang.patch: + - backport fixes to make the gallery plugin work again (lp: #1798399) + + -- Sebastien Bacher Thu, 25 Oct 2018 17:26:01 +0200 + +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 @@ -134,6 +258,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 @@ -156,6 +326,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 ] @@ -167,6 +381,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.32.0/debian/control totem-3.32.0/debian/control --- totem-3.32.0/debian/control 2019-03-09 10:38:15.000000000 +0000 +++ totem-3.32.0/debian/control 2019-03-09 10:39:46.000000000 +0000 @@ -5,7 +5,8 @@ Source: totem Section: video Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha , Laurent Bigonville Build-Depends: appstream-util, debhelper (>= 12), @@ -48,8 +49,10 @@ xvfb , Rules-Requires-Root: no Standards-Version: 4.3.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 diff -Nru totem-3.32.0/debian/control.in totem-3.32.0/debian/control.in --- totem-3.32.0/debian/control.in 2019-03-09 10:38:15.000000000 +0000 +++ totem-3.32.0/debian/control.in 2019-03-09 10:39:46.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 (>= 12), @@ -44,8 +45,10 @@ xvfb , Rules-Requires-Root: no Standards-Version: 4.3.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 diff -Nru totem-3.32.0/debian/gbp.conf totem-3.32.0/debian/gbp.conf --- totem-3.32.0/debian/gbp.conf 2019-03-09 10:38:15.000000000 +0000 +++ totem-3.32.0/debian/gbp.conf 2019-03-09 10:39:46.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] pristine-tar = True -debian-branch=debian/master +debian-branch=ubuntu/master +debian-tag=ubuntu/%(version)s upstream-branch=upstream/latest [buildpackage] diff -Nru totem-3.32.0/debian/patches/91_quicklist_entries.patch totem-3.32.0/debian/patches/91_quicklist_entries.patch --- totem-3.32.0/debian/patches/91_quicklist_entries.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.32.0/debian/patches/91_quicklist_entries.patch 2019-03-09 10:39:46.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 + MimeType=@MIME_TYPE@ ++ ++Actions=play;next-chapter;previous-chapter;mute;fullscreen; ++ ++[Desktop Action play] ++Name=Play/Pause ++Exec=totem --play-pause ++ ++[Desktop Action next-chapter] ++Name=Next ++Exec=totem --next ++ ++[Desktop Action previous-chapter] ++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.32.0/debian/patches/Add-Mute-action.patch totem-3.32.0/debian/patches/Add-Mute-action.patch --- totem-3.32.0/debian/patches/Add-Mute-action.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.32.0/debian/patches/Add-Mute-action.patch 2019-03-09 10:39:46.000000000 +0000 @@ -0,0 +1,36 @@ +From: Simone Piccardi +Date: Tue, 15 Jan 2019 15:30:16 -0500 +Subject: Add Mute action + +Forwarded: https://gitlab.gnome.org/GNOME/totem/merge_requests/32 +--- + src/totem-menu.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/totem-menu.c b/src/totem-menu.c +index cc7cbed..dc7cf9a 100644 +--- a/src/totem-menu.c ++++ b/src/totem-menu.c +@@ -296,6 +296,14 @@ remote_command_cb (GSimpleAction *action, + totem_object_remote_command (totem, cmd, url); + } + ++static void ++mute_action_cb (GSimpleAction *action, ++ GVariant *parameter, ++ gpointer user_data) ++{ ++ TOTEM_PROFILE (totem_object_volume_toggle_mute (TOTEM_OBJECT (user_data))); ++} ++ + static GActionEntry app_entries[] = { + /* Main app menu */ + { "open", open_action_cb, NULL, NULL, NULL }, +@@ -306,6 +314,7 @@ static GActionEntry app_entries[] = { + { "shortcuts", keyboard_shortcuts_action_cb, NULL, NULL, NULL }, + { "help", help_action_cb, NULL, NULL, NULL }, + { "quit", quit_action_cb, NULL, NULL, NULL }, ++ { "mute", mute_action_cb, NULL, NULL, NULL }, + + /* "Go" menu */ + { "dvd-root-menu", dvd_root_menu_action_cb, NULL, NULL, NULL }, diff -Nru totem-3.32.0/debian/patches/dont-make-compulsory.patch totem-3.32.0/debian/patches/dont-make-compulsory.patch --- totem-3.32.0/debian/patches/dont-make-compulsory.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.32.0/debian/patches/dont-make-compulsory.patch 2019-03-09 10:39:46.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 cdb7e64..cdb31ac 100644 +--- a/data/appdata/org.gnome.Totem.appdata.xml.in ++++ b/data/appdata/org.gnome.Totem.appdata.xml.in +@@ -27,7 +27,6 @@ + + hadess@hadess.net + GNOME +- GNOME + totem + + none diff -Nru totem-3.32.0/debian/patches/series totem-3.32.0/debian/patches/series --- totem-3.32.0/debian/patches/series 2019-03-09 10:38:15.000000000 +0000 +++ totem-3.32.0/debian/patches/series 2019-03-09 10:39:46.000000000 +0000 @@ -1 +1,4 @@ debian/Don-t-run-pylint-at-build-time.patch +dont-make-compulsory.patch +91_quicklist_entries.patch +Add-Mute-action.patch