diff -pruN 0.40.0-3/debian/changelog 0.40.0-3ubuntu2/debian/changelog
--- 0.40.0-3/debian/changelog	2025-04-04 16:43:53.000000000 +0000
+++ 0.40.0-3ubuntu2/debian/changelog	2025-10-20 02:34:03.000000000 +0000
@@ -1,3 +1,17 @@
+mpv (0.40.0-3ubuntu2) resolute; urgency=medium
+
+  * Rebuild against latest libbluray
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Sun, 19 Oct 2025 22:34:03 -0400
+
+mpv (0.40.0-3ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 07 Apr 2025 09:38:11 +0200
+
 mpv (0.40.0-3) unstable; urgency=medium
 
   [ Diederik de Haas ]
@@ -8,6 +22,14 @@ mpv (0.40.0-3) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 04 Apr 2025 18:43:53 +0200
 
+mpv (0.40.0-2ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Mar 2025 07:51:55 +0200
+
 mpv (0.40.0-2) unstable; urgency=medium
 
   * Fix up version history
@@ -26,6 +48,14 @@ mpv (0.40.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 30 Mar 2025 13:42:18 +0200
 
+mpv (0.39.0-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 10 Dec 2024 22:29:44 +0100
+
 mpv (0.39.0-1) unstable; urgency=medium
 
   [ Joachim Bauch ]
@@ -37,6 +67,14 @@ mpv (0.39.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 10 Dec 2024 00:05:52 +0100
 
+mpv (0.38.0-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 31 Jul 2024 10:14:45 +0200
+
 mpv (0.38.0-1) unstable; urgency=medium
 
   [ Unit 193 ]
@@ -51,6 +89,32 @@ mpv (0.38.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Wed, 01 May 2024 11:10:27 +0200
 
+mpv (0.37.0-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild against libasound2t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 07 Apr 2024 07:17:48 +0000
+
+mpv (0.37.0-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 08:08:10 +0000
+
+mpv (0.37.0-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libarchive13t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 09 Mar 2024 07:22:33 +0000
+
+mpv (0.37.0-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 03 Dec 2023 09:26:46 +0100
+
 mpv (0.37.0-1) unstable; urgency=medium
 
   * New upstream version 0.37.0
@@ -64,6 +128,20 @@ mpv (0.37.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 02 Dec 2023 12:30:21 +0100
 
+mpv (0.36.0-1ubuntu2) noble; urgency=medium
+
+  * Rebuild against new libplacebo338.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 07 Nov 2023 10:25:29 +0100
+
+mpv (0.36.0-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 02 Aug 2023 12:10:22 +0200
+
 mpv (0.36.0-1) unstable; urgency=medium
 
   * New upstream version 0.36.0
@@ -72,6 +150,20 @@ mpv (0.36.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 01 Aug 2023 22:43:12 +0200
 
+mpv (0.35.1-4ubuntu2) mantic; urgency=medium
+
+  * No-change rebuild against libmujs3.
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 20 Jun 2023 15:50:29 +0100
+
+mpv (0.35.1-4ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 02 May 2023 08:49:38 +0200
+
 mpv (0.35.1-4) unstable; urgency=medium
 
   * Team upload.
@@ -87,6 +179,14 @@ mpv (0.35.1-3) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 06 Apr 2023 08:25:35 +0200
 
+mpv (0.35.1-2ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 01 Apr 2023 15:23:42 +0200
+
 mpv (0.35.1-2) unstable; urgency=medium
 
   * debian/patches: Apply upstream patches for yt-dlp 2023.03.04 compatibility
@@ -94,6 +194,14 @@ mpv (0.35.1-2) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 31 Mar 2023 20:46:51 +0200
 
+mpv (0.35.1-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 30 Jan 2023 09:29:53 +0100
+
 mpv (0.35.1-1) unstable; urgency=medium
 
   * New upstream version 0.35.1
@@ -112,6 +220,14 @@ mpv (0.35.0-5) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 29 Jan 2023 11:57:26 +0100
 
+mpv (0.35.0-4ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 22 Dec 2022 09:34:07 +0100
+
 mpv (0.35.0-4) unstable; urgency=medium
 
   * Team upload
@@ -120,6 +236,14 @@ mpv (0.35.0-4) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Wed, 21 Dec 2022 22:27:12 +0100
 
+mpv (0.35.0-3ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 28 Nov 2022 13:48:01 +0100
+
 mpv (0.35.0-3) unstable; urgency=medium
 
   * Team upload
@@ -161,6 +285,38 @@ mpv (0.35.0-1) experimental; urgency=med
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 12 Nov 2022 22:05:00 +0100
 
+mpv (0.34.1-1ubuntu5) kinetic; urgency=medium
+
+  * No-change rebuild against libavcodec59
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 19 Jul 2022 12:59:26 +0000
+
+mpv (0.34.1-1ubuntu4) kinetic; urgency=medium
+
+  * No-change rebuild against libmujs2
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 Jul 2022 05:04:33 +0000
+
+mpv (0.34.1-1ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild against libplacebo192
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 06 Feb 2022 00:56:36 +0000
+
+mpv (0.34.1-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against libplacebo157
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 17 Jan 2022 14:01:46 +0000
+
+mpv (0.34.1-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 08 Jan 2022 21:00:00 +0100
+
 mpv (0.34.1-1) unstable; urgency=medium
 
   * Team upload
@@ -169,6 +325,14 @@ mpv (0.34.1-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 06 Jan 2022 12:53:19 +0100
 
+mpv (0.34.0-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 29 Nov 2021 08:31:40 +0100
+
 mpv (0.34.0-2) unstable; urgency=medium
 
   * Team upload
@@ -189,6 +353,14 @@ mpv (0.34.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 07 Nov 2021 19:23:22 +0100
 
+mpv (0.33.1-1ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 08 Sep 2021 07:33:14 +0200
+
 mpv (0.33.1-1) unstable; urgency=medium
 
   * Team upload
@@ -217,6 +389,14 @@ mpv (0.33.1-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 07 Sep 2021 11:38:01 +0200
 
+mpv (0.32.0-3ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 28 Apr 2021 17:45:58 +0200
+
 mpv (0.32.0-3) unstable; urgency=medium
 
   * debian/patches: Apply upstream fix for CVE-2021-30145 (Closes: #986839)
@@ -224,6 +404,20 @@ mpv (0.32.0-3) unstable; urgency=medium
 
  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 26 Apr 2021 09:10:40 +0200
 
+mpv (0.32.0-2ubuntu2) groovy; urgency=medium
+
+  * Rebuild against new libcdio19.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 15 Aug 2020 09:38:40 +0200
+
+mpv (0.32.0-2ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 20 Jul 2020 09:13:38 +0200
+
 mpv (0.32.0-2) unstable; urgency=medium
 
   * Bug fix: "unintended code execution vulnerability", thanks to astian
@@ -231,6 +425,14 @@ mpv (0.32.0-2) unstable; urgency=medium
 
  -- Reinhard Tartler <siretart@tauware.de>  Sat, 18 Jul 2020 18:01:43 -0400
 
+mpv (0.32.0-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 31 Jan 2020 19:11:03 +0100
+
 mpv (0.32.0-1) unstable; urgency=medium
 
   [ James Cowgill ]
@@ -248,6 +450,15 @@ mpv (0.32.0-1) unstable; urgency=medium
 
  -- James Cowgill <jcowgill@debian.org>  Wed, 29 Jan 2020 01:03:08 +0000
 
+mpv (0.30.0-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+  * Drop changes included in upstream source code: 08_fix-lp1698287.patch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 25 Nov 2019 12:06:34 +0100
+
 mpv (0.30.0-1) unstable; urgency=medium
 
   [ James Cowgill ]
@@ -275,6 +486,17 @@ mpv (0.30.0-1) unstable; urgency=medium
 
  -- James Cowgill <jcowgill@debian.org>  Sun, 24 Nov 2019 17:29:57 +0000
 
+mpv (0.29.1-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Rewrote 08_fix-lp1698287.patch to work with the latest mpv source code,
+      allowing VAAPI to work in Wayland sessions out-of-the-box. (LP: #1698287)
+    - Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+      (LP: #1708102)
+    - Rebased on latest Debian version 0.29.1-1.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 09 Nov 2018 11:58:22 +0100
+
 mpv (0.29.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -282,6 +504,22 @@ mpv (0.29.1-1) unstable; urgency=medium
 
  -- James Cowgill <jcowgill@debian.org>  Wed, 03 Oct 2018 10:00:52 +0100
 
+mpv (0.29.0-1ubuntu2) cosmic; urgency=medium
+
+  * Rebuild against new libsndio7.0.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 22 Aug 2018 08:09:55 +0200
+
+mpv (0.29.0-1ubuntu1) cosmic; urgency=medium
+
+  * Rewrote 08_fix-lp1698287.patch to work with the latest mpv source code,
+    allowing VAAPI to work in Wayland sessions out-of-the-box. (LP: #1698287)
+  * Reintroduce mpv.conf.ubuntu to enable VAAPI acceleration by default.
+    (LP: #1708102)
+  * Rebased on latest Debian version 0.29.0-1.
+
+ -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Thu, 09 Aug 2018 18:04:13 +0800
+
 mpv (0.29.0-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #904629)
diff -pruN 0.40.0-3/debian/control 0.40.0-3ubuntu2/debian/control
--- 0.40.0-3/debian/control	2025-04-04 16:43:24.000000000 +0000
+++ 0.40.0-3ubuntu2/debian/control	2025-04-04 22:15:27.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mpv
 Section: video
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders: Alessandro Ghedini <ghedo@debian.org>,
  Reinhard Tartler <siretart@tauware.de>,
  James Cowgill <jcowgill@debian.org>,
diff -pruN 0.40.0-3/debian/mpv.conf.ubuntu 0.40.0-3ubuntu2/debian/mpv.conf.ubuntu
--- 0.40.0-3/debian/mpv.conf.ubuntu	1970-01-01 00:00:00.000000000 +0000
+++ 0.40.0-3ubuntu2/debian/mpv.conf.ubuntu	2018-04-09 14:17:34.000000000 +0000
@@ -0,0 +1 @@
+hwdec=vaapi
diff -pruN 0.40.0-3/debian/rules 0.40.0-3ubuntu2/debian/rules
--- 0.40.0-3/debian/rules	2025-03-30 11:51:50.000000000 +0000
+++ 0.40.0-3ubuntu2/debian/rules	2025-04-04 22:15:27.000000000 +0000
@@ -22,6 +22,7 @@ override_dh_auto_configure:
 
 execute_after_dh_auto_install:
 	mv debian/tmp/usr/share/zsh/site-functions debian/tmp/usr/share/zsh/vendor-completions
+	cp -f debian/mpv.conf.ubuntu debian/tmp/etc/mpv/mpv.conf
 
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES
