38622883 · 4086ecb6 · f7fd2f76 · f005a9cc · 2970e933 · e1a6447d
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,7 @@ build-fedora:
  tags:
    - crun
  before_script:
+    - dnf update -y
    - dnf install --setopt=install_weak_deps=False -y $FEDORA_DEPS
    # See https://bugzilla.redhat.com/show_bug.cgi?id=1896438
    - dnf remove -y pylint

--- a/NEWS
+++ b/NEWS
 New features and significant updates in version...

-Major changes in 41.alpha.0:
- ...
+Major changes in 42.0:
+- Updated appdata screenshots
+- Fix screenshot functionality not working since the port to
+  the OpenGL video widget
+- Translations updates
+
+Major changes in 42.beta:
+- Port video widget from obsolete Clutter to OpenGL
+- Move subtitles and audio track selection to its own menu
+- Add shortcuts for mute, cycling through subtitles, toggling
+  subtitles and seeking to specific places in the video
+- Implement a enabled-by-default native MPRIS plugin to replace
+  the Python MPRIS plugin
+- Remove media-player-keys plugin that supported the old GNOME
+  Settings Daemon API, now replaced by MPRIS
+- Show more precise elapsed time when stepping frame-by-frame
+- Implement "search by title" in OpenSubtitles plugin

 Major changes in 3.38.0:
 - Translation updates

--- a/data/appdata/org.gnome.Totem.appdata.xml.in.in
+++ b/data/appdata/org.gnome.Totem.appdata.xml.in.in
@@ -26,8 +26,8 @@
  <url type="translate">https://l10n.gnome.org/module/totem/</url>
  <url type="help">https://help.gnome.org/users/totem/stable/</url>
  <screenshots>
-    <screenshot type="default" width="1024" height="576">https://gitlab.gnome.org/GNOME/totem/raw/master/data/appdata/ss-videos.png</screenshot>
-    <screenshot width="1024" height="576">https://gitlab.gnome.org/GNOME/totem/raw/master/data/appdata/ss-player.png</screenshot>
+    <screenshot type="default">https://gitlab.gnome.org/GNOME/totem/raw/HEAD/data/appdata/ss-player.png</screenshot>
+    <screenshot>https://gitlab.gnome.org/GNOME/totem/raw/HEAD/data/appdata/ss-videos.png</screenshot>
  </screenshots>
  <update_contact>hadess@hadess.net</update_contact>
  <developer_name>The GNOME developers</developer_name>
@@ -35,6 +35,23 @@
  <translation type="gettext">totem</translation>
  <launchable type="desktop-id">@APPLICATION_ID@.desktop</launchable>
  <releases>
+    <release version="42.0" date="2022-03-18">
+      <description>
+        <p>
+          We are proud to announce Videos 3.34.0 as the latest stable version.
+        </p>
+        <p>
+          This new version stops relying on clutter for its video output. The
+          old GNOME media-keys API was removed, and replaced by builtin MPRIS
+          support.
+        </p>
+        <p>
+          The subtitles and audio tracks selections are now made through a separate
+          menu. A number of new keyboard shortcuts were also added, which can
+          be found in the keyboard shortcuts dialog.
+        </p>
+      </description>
+    </release>
    <release version="3.38.0" date="2020-09-10">
      <description>
        <p>

--- a/data/appdata/ss-player.png
+++ b/data/appdata/ss-player.png
--- a/data/appdata/ss-videos.png
+++ b/data/appdata/ss-videos.png
--- a/debian/changelog
+++ b/debian/changelog
+totem (42.0-1ubuntu1) jammy; urgency=medium
+
+  * Resynchronize with Debian. Remaining changes:
+    - debian/control.in:
+      + Use ubuntu-desktop vcs
+    - debian/gbp.conf: Use ubuntu settings
+    - 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 <jbicha@ubuntu.com>  Mon, 21 Mar 2022 09:51:27 -0400
+
+totem (42.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 18 Mar 2022 18:51:02 -0400
+
+totem (42~beta-1) unstable; urgency=medium
+
+  * New upstream release
+  * Release to unstable
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Fri, 25 Feb 2022 07:32:53 -0500
+
 totem (41~alpha~20220222-1ubuntu1) jammy; urgency=medium

  * Resynchronize with Debian. Remaining changes:

--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: video
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
 Build-Depends: appstream-util,
               debhelper-compat (= 13),
               dh-sequence-gir,

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -12,7 +12,7 @@ multimaint-merge = True

 [import-orig]
 postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
-upstream-vcs-tag = V_%(version%.%_)s
+upstream-vcs-tag = %(version%~%.)s

 [pq]
 patch-numbers = False
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -34,10 +34,7 @@ private_headers = [
 ]

 version_conf = configuration_data()
-version_conf.set('TOTEM_VERSION_MAJOR', totem_major_version)
-version_conf.set('TOTEM_VERSION_MINOR', totem_minor_version)
-version_conf.set('TOTEM_VERSION_MICRO', totem_micro_version)
-
+version_conf.set('VERSION', totem_version)
 version_xml = 'version.xml'

 configure_file(

--- a/docs/reference/version.xml.in
+++ b/docs/reference/version.xml.in
-@TOTEM_VERSION_MAJOR@.@TOTEM_VERSION_MINOR@.@TOTEM_VERSION_MICRO@
+@VERSION@
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
--- a/meson.build
+++ b/meson.build
 project(
  'totem', 'c',
-  version: '41.alpha.0',
+  version: '42.0',
  license: 'GPL2+ with exception',
  default_options: 'buildtype=debugoptimized',
  meson_version: '>= 0.50.0'
@@ -8,9 +8,7 @@ project(

 totem_version = meson.project_version()
 version_array = totem_version.split('.')
-totem_major_version = version_array[0].to_int()
 totem_minor_version = version_array[1]
-totem_micro_version = version_array[2].to_int()

 totem_api_version = '1.0'

@@ -243,7 +241,7 @@ if is_stable
    find_program('check-news.sh').path(),
    '@0@'.format(meson.project_version()),
    'NEWS',
-    'data/appdata/org.gnome.Totem.appdata.xml.in'
+    'data/appdata/org.gnome.Totem.appdata.xml.in.in'
  )
 else
  meson.add_dist_script(

--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po