diff -pruN 1:1.0.0.74-1/debian/changelog 1:1.0.0.74-1ubuntu2/debian/changelog
--- 1:1.0.0.74-1/debian/changelog	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/changelog	2021-12-20 01:07:39.000000000 +0000
@@ -1,3 +1,28 @@
+steam (1:1.0.0.74-1ubuntu2) jammy; urgency=medium
+
+  * Revert using upstream appdata for steam-installer (LP: #1955361)
+    - debian/steam-installer.install: use our own appdata file
+
+ -- Andrew Hayzen <ahayzen@ubuntu.com>  Mon, 20 Dec 2021 01:07:39 +0000
+
+steam (1:1.0.0.74-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian Sid (LP: #1951894), remaining changes:
+    - Add steam-installer package that depends on steam and contains
+      appstream metadata to allow Steam to be installed via appsteam enabled
+      software centers.
+    - Drop appstream metadata from steam package as we have it in steam-installer
+    - Drop debian/steam.preinst because the dconf question it is not supported
+      by all software centers.
+    - Modify template-helper script for Ubuntu.
+    - Modify debian/steam.bug-control for Ubuntu.
+    - Disable copyright-helper script in debian/rules.
+    - Nvidia packaging differences to Debian.
+  * debian/control: bump libnvidia-gl suggests packages
+  * debian/steam-installer.install: use valve appdata rather than our own
+
+ -- Andrew Hayzen <ahayzen@ubuntu.com>  Tue, 07 Dec 2021 00:59:53 +0000
+
 steam (1:1.0.0.74-1) unstable; urgency=medium
 
   * New upstream stable release
@@ -86,6 +111,23 @@ steam (1.0.0.71-1) experimental; urgency
 
  -- Simon McVittie <smcv@debian.org>  Fri, 23 Jul 2021 18:24:22 +0100
 
+steam (1:1.0.0.70-2ubuntu1) impish; urgency=medium
+
+  * Merge from Debian Sid (LP: #1938351), remaining changes:
+    - Add an epoch to the version number.
+    - Add steam-installer package that depends on steam and contains
+      appstream metadata to allow Steam to be installed via appsteam enabled
+      software centers.
+    - Drop debian/steam.preinst because the dconf question it is not supported
+      by all software centers.
+    - Modify template-helper script for Ubuntu.
+    - Modify debian/steam.bug-control for Ubuntu.
+    - Disable copyright-helper script in debian/rules.
+    - Nvidia packaging differences to Debian.
+  * debian/control: bump libnvidia-gl suggests packages
+
+ -- Andrew Hayzen <ahayzen@ubuntu.com>  Wed, 28 Jul 2021 23:20:24 +0100
+
 steam (1.0.0.70-2) experimental; urgency=medium
 
   * Depend on system libxi6:i386 to work around bugs in the Steam
@@ -131,6 +173,23 @@ steam (1.0.0.69-1) experimental; urgency
 
  -- Simon McVittie <smcv@debian.org>  Thu, 04 Mar 2021 14:08:25 +0000
 
+steam (1:1.0.0.68-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian Sid (LP: #1912902), remaining changes:
+    - Add an epoch to the version number.
+    - Add steam-installer package that depends on steam and contains
+      appstream metadata to allow Steam to be installed via appsteam enabled
+      software centers.
+    - Drop debian/steam.preinst because the dconf question it is not supported
+      by all software centers.
+    - Modify template-helper script for Ubuntu.
+    - Modify debian/steam.bug-control for Ubuntu.
+    - Disable copyright-helper script in debian/rules.
+    - Nvidia packaging differences to Debian.
+  * debian/control: bump libnvidia-gl suggests packages
+
+ -- Andrew Hayzen <ahayzen@ubuntu.com>  Wed, 27 Jan 2021 21:16:06 +0000
+
 steam (1.0.0.68-1) unstable; urgency=medium
 
   * New upstream release
@@ -163,6 +222,25 @@ steam (1.0.0.67-3) unstable; urgency=med
 
  -- Simon McVittie <smcv@debian.org>  Tue, 15 Dec 2020 14:03:54 +0000
 
+steam (1:1.0.0.67-2ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian Sid (LP: #1901689), remaining changes:
+    - Add an epoch to the version number.
+    - Add steam-installer package that depends on steam and contains
+      appstream metadata to allow Steam to be installed via appsteam enabled
+      software centers.
+    - Drop debian/steam.preinst because the dconf question it is not supported
+      by all software centers.
+    - Modify template-helper script for Ubuntu.
+    - Modify debian/steam.bug-control for Ubuntu.
+    - Disable copyright-helper script in debian/rules.
+    - Nvidia packaging differences to Debian.
+  * debian/control: use >= for the version depends on steam from the
+    steam-installer package otherwise lintian fails with
+    not-binnmuable-all-depends-any.
+
+ -- Andrew Hayzen <ahayzen@gmail.com>  Sat, 05 Dec 2020 21:30:00 +0000
+
 steam (1.0.0.67-2) unstable; urgency=medium
 
   * Release to unstable.
@@ -324,6 +402,34 @@ steam (1.0.0.62-1) experimental; urgency
 
  -- Simon McVittie <smcv@debian.org>  Mon, 06 Apr 2020 15:13:25 +0100
 
+steam (1:1.0.0.61-2ubuntu3) focal; urgency=medium
+
+  * Revert some appstream fields to satisfy GNOME Software (LP: #1864635)
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Mon, 09 Mar 2020 21:57:14 +0000
+
+steam (1:1.0.0.61-2ubuntu2) focal; urgency=medium
+
+  * Update appstream data so that Steam is displayed in software centers.
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Wed, 04 Mar 2020 17:22:06 +0100
+
+steam (1:1.0.0.61-2ubuntu1) focal; urgency=medium
+
+  * Merge from Debian Sid (LP: #1796464).
+    - Add an epoch to the version number.
+    - Add steam-installer package that depends on steam and contains
+      appstream metadata to allow Steam to be installed via appsteam enabled
+      software centers.
+    - Drop debian/steam.preinst because the dconf question it is not supported
+      by all software centers.
+    - Modify template-helper script for Ubuntu.
+    - Modify debian/steam.bug-control for Ubuntu.
+    - Disable copyright-helper script in debian/rules.
+    - Standards-Version: 4.5.0 (no changes required)
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Sat, 22 Feb 2020 10:55:30 +0000
+
 steam (1.0.0.61-2) unstable; urgency=medium
 
   * Upload to unstable
@@ -497,6 +603,17 @@ steam (1.0.0.54-6) unstable; urgency=med
 
  -- Michael Gilbert <mgilbert@debian.org>  Sun, 15 Jul 2018 21:12:44 +0000
 
+steam (1:1.0.0.54+repack-5ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian Sid (LP: #1752198). Remaining changes:
+    - Add an epoch to the version number.
+    - Add a steam-installer package that depends on steam and contains
+      appstream metadata to try to allow Steam to be installable via the
+      default Software app.
+    - Drop debconf question because that is not supported by gnome-software.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 27 Feb 2018 18:32:39 -0600
+
 steam (1.0.0.54-5) unstable; urgency=medium
 
   * Update to debhelper 11.
@@ -530,6 +647,41 @@ steam (1.0.0.54-3) unstable; urgency=med
 
  -- Simon McVittie <smcv@debian.org>  Fri, 29 Dec 2017 21:06:16 +0000
 
+steam (1:1.0.0.54+repack-2ubuntu5) zesty; urgency=medium
+
+  * Depend on steam instead of steam:i386
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 16 Mar 2017 12:46:54 -0400
+
+steam (1:1.0.0.54+repack-2ubuntu4) zesty; urgency=medium
+
+  * Drop debconf question because debconf is not supported by
+    gnome-software
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 15 Mar 2017 22:21:03 -0400
+
+steam (1:1.0.0.54+repack-2ubuntu3) zesty; urgency=medium
+
+  * Add missing dh_gencontrol --remaining-packages
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 12 Mar 2017 20:37:03 -0400
+
+steam (1:1.0.0.54+repack-2ubuntu2) zesty; urgency=medium
+
+  * Re-upload using the same original tarball Debian uses
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 12 Mar 2017 20:25:36 -0400
+
+steam (1:1.0.0.54-2ubuntu1) zesty; urgency=medium
+
+  * Sync with Debian. (LP: #1645141) Remaining change:
+    - Add epoch
+  * Add a steam-installer package that depends on steam:i386 and
+    contains appstream metadata to try to allow Steam to be installable
+    via the default Software app (LP: #1564570)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 12 Mar 2017 17:44:48 -0400
+
 steam (1.0.0.54-2) unstable; urgency=medium
 
   * Fix error in removal of incompatible runtime libraries (closes: #850479).
diff -pruN 1:1.0.0.74-1/debian/com.steampowered.steam.appdata.xml 1:1.0.0.74-1ubuntu2/debian/com.steampowered.steam.appdata.xml
--- 1:1.0.0.74-1/debian/com.steampowered.steam.appdata.xml	1970-01-01 00:00:00.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/com.steampowered.steam.appdata.xml	2021-12-20 01:07:39.000000000 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.steampowered.steam.desktop</id>
+  <metadata_license>MIT</metadata_license>
+  <name>Steam installer</name>
+  <summary>Installer for Valve's game and content delivery system</summary>
+  <description>
+    <p>Steam is a popular platform for buying, downloading, and playing video games, and chatting with other players.</p>
+    <p>Many games require an online purchase, but some popular games, such as Team Fortress 2, are free to play. When searching in the store, be sure to narrow results by the SteamOS/Linux operating system. Not all Linux games are compatible with your system, so make sure you check the requirements before purchasing games.</p>
+  </description>
+  <icon type="stock">steam</icon>
+  <categories>
+    <category>Game</category>
+  </categories>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source" width="1200" height="582">https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/27766192/ac26dea63042eec4886d5fa27854517ce374b11e.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1200" height="717">https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/27766192/85bab8a696ad635859ae5e84b4339db95bcdf47d.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image type="source" width="1200" height="535">https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/27766192/563daff788965a9f0aa4525190ef12d8c10832d6.jpg</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://store.steampowered.com/</url>
+  <kudos>
+    <kudo>HiDpiIcon</kudo>
+  </kudos>
+</component>
diff -pruN 1:1.0.0.74-1/debian/com.steampowered.steam-devices.metainfo.xml 1:1.0.0.74-1ubuntu2/debian/com.steampowered.steam-devices.metainfo.xml
--- 1:1.0.0.74-1/debian/com.steampowered.steam-devices.metainfo.xml	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/com.steampowered.steam-devices.metainfo.xml	2021-12-20 01:07:39.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2018 Michael Gilbert <mgilbert@debian.org> -->
-<component>
+<component type="driver">
   <id>com.steampowered.steam-devices</id>
   <metadata_license>MIT</metadata_license>
   <name>steam-devices</name>
diff -pruN 1:1.0.0.74-1/debian/control 1:1.0.0.74-1ubuntu2/debian/control
--- 1:1.0.0.74-1/debian/control	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/control	2021-12-20 01:07:39.000000000 +0000
@@ -1,7 +1,8 @@
 Source: steam
 Section: non-free/games
 Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders:
  Michael Gilbert <mgilbert@debian.org>,
  Simon McVittie <smcv@debian.org>,
@@ -77,8 +78,7 @@ Recommends:
  xterm | x-terminal-emulator,
  zenity,
 Suggests:
- nvidia-driver-libs,
- nvidia-vulkan-icd,
+ libnvidia-gl-390 | libnvidia-gl-470 | libnvidia-gl-495,
  pipewire,
 Conflicts:
  steam-launcher,
@@ -98,6 +98,27 @@ Description: Valve's Steam digital softw
  other words, pay attention and read carefully if you're worried about your
  rights.
 
+Package: steam-installer
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ steam (>= ${source:Version}),
+Description: Installer for Valve's Steam digital software delivery system
+ Steam (https://www.steampowered.com) is a software content delivery system
+ developed by Valve software (https://www.valvesoftware.com).  There is
+ some free software available, but for the most part the content delivered
+ is non-free.
+ .
+ This package enables Steam to be easily installed via an appstream client
+ on non-i386 systems as long as the i386 foreign architecture is configured.
+ This is the default on Ubuntu, but on Debian, you may need to run as root:
+ dpkg --add-architecture i386; apt update
+ .
+ This package is not needed if you only want to install Steam directly with
+ apt or with a non-appstream client like Synaptic.
+
 Package: steam-devices
 Architecture: all
 Multi-Arch: foreign
diff -pruN 1:1.0.0.74-1/debian/gbp.conf 1:1.0.0.74-1ubuntu2/debian/gbp.conf
--- 1:1.0.0.74-1/debian/gbp.conf	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[DEFAULT]
-pristine-tar = False
-debian-branch = debian/master
-overlay = True
diff -pruN 1:1.0.0.74-1/debian/rules 1:1.0.0.74-1ubuntu2/debian/rules
--- 1:1.0.0.74-1/debian/rules	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/rules	2021-12-20 01:07:39.000000000 +0000
@@ -4,6 +4,7 @@ include /usr/share/dpkg/default.mk
 
 export DH_VERBOSE=1
 
+dversion=$(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d':' -f 2)
 uversion=$(shell uscan --report --dehs |grep upstream-version | cut -d\< -f2 | cut -d\> -f2)
 origdir=..
 orig=$(origdir)/steam_$(uversion).orig.tar.xz
@@ -42,7 +43,13 @@ override_dh_strip:
 
 override_dh_clean:
 	dh_clean -- debian/templates
-	./debian/scripts/copyright-helper debian/copyright.in debian/copyright
+	# Disabled
+	#./debian/scripts/copyright-helper debian/copyright.in debian/copyright
+
+# Don't use an epoch for steam-installer
+override_dh_gencontrol:
+	dh_gencontrol -psteam-installer -- -v$(dversion)
+	dh_gencontrol --remaining-packages
 
 # Can be set to 'beta' to fetch upstream releases that are still
 # considered to have beta status
diff -pruN 1:1.0.0.74-1/debian/scripts/templates-helper 1:1.0.0.74-1ubuntu2/debian/scripts/templates-helper
--- 1:1.0.0.74-1/debian/scripts/templates-helper	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/scripts/templates-helper	2021-12-20 01:07:39.000000000 +0000
@@ -11,21 +11,14 @@ Description: Do you agree to all terms o
 
 Template: steam/need-nvidia-i386
 Type: note
-Description: 32-bit Nvidia driver (nvidia-driver-libs-i386) required
+Description: 32-bit Nvidia driver required
  This computer appears to be using the Nvidia binary graphics driver
- (the nvidia-driver package).
+ (the nvidia-driver-nnn package).
  .
  Steam is a 32-bit program, so running it on this computer requires the
  32-bit versions of the Nvidia libraries, even if all the games you will
- run via Steam are 64-bit. Please install the nvidia-driver-libs-i386
- package.
- .
- For full functionality (including Vulkan), also install the libraries
- listed as Recommends in the nvidia-driver-libs-i386 package.
- .
- If you are using a legacy version of the Nvidia driver such as
- nvidia-legacy-340xx-driver, please install the corresponding 32-bit legacy
- package, for example nvidia-legacy-340xx-driver-libs-i386.
+ run via Steam are 64-bit. Please install the 'ubuntu-drivers-common'
+ package and run 'sudo ubuntu-drivers autoinstall'
 
 Template: steam/purge
 Type: note
diff -pruN 1:1.0.0.74-1/debian/steam.bug-control 1:1.0.0.74-1ubuntu2/debian/steam.bug-control
--- 1:1.0.0.74-1/debian/steam.bug-control	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/steam.bug-control	2021-12-20 01:07:39.000000000 +0000
@@ -1 +1 @@
-Package-Status: libc6:amd64 libc6:i386 libgl1-mesa-dri:amd64 libgl1-mesa-dri:i386 libgl1:amd64 libgl1:i386 libglx-mesa0:amd64 libglx-mesa0:i386 libglx-nvidia0:amd64 libglx-nvidia0:i386 libglx-vendor:amd64 libglx-vendor:i386 libxcb-dri3-0:amd64 libxcb-dri3-0:i386 nvidia-driver nvidia-driver-libs:amd64 nvidia-driver-libs:i386 nvidia-driver-libs-i386
+Package-Status: libc6:amd64 libc6:i386 libgl1-mesa-dri:amd64 libgl1-mesa-dri:i386 libgl1:amd64 libgl1:i386 libglx-mesa0:amd64 libglx-mesa0:i386 libxcb-dri3-0:amd64 libxcb-dri3-0:i386
diff -pruN 1:1.0.0.74-1/debian/steam.install 1:1.0.0.74-1ubuntu2/debian/steam.install
--- 1:1.0.0.74-1/debian/steam.install	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/steam.install	2021-12-20 01:07:39.000000000 +0000
@@ -1,7 +1,5 @@
 ubuntu12_32/steam usr/lib/games/steam
 
-com.valvesoftware.Steam.metainfo.xml usr/share/metainfo
-
 debian/scripts/steam usr/games
 debian/scripts/steam.desktop usr/share/applications
 
diff -pruN 1:1.0.0.74-1/debian/steam-installer.install 1:1.0.0.74-1ubuntu2/debian/steam-installer.install
--- 1:1.0.0.74-1/debian/steam-installer.install	1970-01-01 00:00:00.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/steam-installer.install	2021-12-20 01:07:39.000000000 +0000
@@ -0,0 +1 @@
+debian/com.steampowered.steam.appdata.xml usr/share/metainfo
diff -pruN 1:1.0.0.74-1/debian/steam.preinst 1:1.0.0.74-1ubuntu2/debian/steam.preinst
--- 1:1.0.0.74-1/debian/steam.preinst	2021-12-12 23:06:58.000000000 +0000
+++ 1:1.0.0.74-1ubuntu2/debian/steam.preinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-using_debconf=
-
-if [ "$1" = "install" ]; then
-    db_input high steam/license || true
-    db_input high steam/question || true
-fi
-
-# Nvidia driver detection borrowed from Flatpak
-need_nvidia="$(if test -e /sys/module/nvidia/version; then echo yes; fi)"
-
-nvidia_i386="$(dpkg-query -W -f '${Status}' nvidia-driver-libs:i386 2>/dev/null || true)"
-
-if [ -n "$need_nvidia" ] && [ "$nvidia_i386" != 'install ok installed' ]; then
-    db_input high steam/need-nvidia-i386 || true
-fi
-
-db_go
-
-if [ "$1" = "install" ]; then
-    db_get steam/question
-    test "$RET" = "I AGREE"
-fi
-
-#DEBHELPER#
