chore: Package for Pop

debian/changelog

@@ -1,8 +1,36 @@
-steam (1.0.0.61-3) UNRELEASED; urgency=medium
+steam (1:1.0.0.61-2ubuntu3pop1) focal; urgency=medium
 
-  * Standards-Version: 4.5.0 (no changes required)
+  * Package for Pop
 
- -- Simon McVittie <smcv@debian.org>  Tue, 01 Oct 2019 10:35:22 +0100
+ -- Michael Aaron Murphy <michael@system76.com>  Tue, 14 Apr 2020 08:27:07 -0600
+
+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
 
@@ -177,6 +205,17 @@ steam (1.0.0.54-6) unstable; urgency=medium
 
  -- 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.
@@ -210,6 +249,41 @@ steam (1.0.0.54-3) unstable; urgency=medium
 
  -- 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).

debian/com.steampowered.steam-devices.metainfo.xml

@@ -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>

debian/com.steampowered.steam.appdata.xml

@@ -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>

debian/control

@@ -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>,
@@ -23,7 +24,6 @@ Pre-Depends:
  debconf,
  ${misc:Pre-Depends},
 Depends:
- libgl1-mesa-dri,
  libgl1-mesa-dri (>= 17.3) | libtxc-dxtn0,
  libgl1-mesa-glx,
  libgpg-error0 (>= 1.10),
@@ -40,17 +40,17 @@ Recommends:
  fonts-liberation,
  libxss1,
  mesa-vulkan-drivers,
+ mesa-vulkan-drivers:i386,
  xterm | x-terminal-emulator,
 Suggests:
- nvidia-driver-libs-i386,
- nvidia-vulkan-icd,
+  libnvidia-gl-390 | libnvidia-gl-435 | libnvidia-gl-440,
 Conflicts:
  steam-launcher,
 Replaces:
  steam-launcher,
 Description: Valve's Steam digital software delivery system
- Steam (http://www.steampowered.com) is a software content delivery system
- developed by Valve software (http://www.valvesoftware.com).  There is
+ 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.
  .
@@ -62,6 +62,27 @@ Description: Valve's Steam digital software delivery system
  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

debian/rules

@@ -2,6 +2,7 @@
 
 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)
 keepers=icons lib changelog steam.6 steam steam.desktop steam_subscriber_agreement.txt
 orig=../steam_$(uversion).orig.tar.xz
@@ -10,7 +11,6 @@ dest=../steam-$(uversion).orig
 build-arch:
 ifneq ($(DEB_HOST_ARCH), i386)
 	@echo "error: $(DEB_HOST_ARCH) is not a supported architecture"
-	@exit 1
 endif
 
 %:
@@ -25,7 +25,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
 
 get-orig-source:
 	@test "$(uversion)" = "" && \

debian/scripts/templates-helper

@@ -11,21 +11,14 @@ Description: Do you agree to all terms of the Steam License Agreement?
 
 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 'suso ubuntu-drivers autoinstall'
 
 Template: steam/purge
 Type: note

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

debian/steam-installer.install

@@ -0,0 +1 @@
+debian/com.steampowered.steam.appdata.xml usr/share/metainfo

debian/steam.bug-control

@@ -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

lib/udev/rules.d/60-steam-input.rules

@@ -0,0 +1,74 @@
+# Valve USB devices
+SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0660", TAG+="uaccess"
+
+# Steam Controller udev write access
+KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
+
+# Valve HID devices over USB hidraw
+KERNEL=="hidraw*", ATTRS{idVendor}=="28de", MODE="0660", TAG+="uaccess"
+
+# Valve HID devices over bluetooth hidraw
+KERNEL=="hidraw*", KERNELS=="*28DE:*", MODE="0660", TAG+="uaccess"
+
+# DualShock 4 over USB hidraw
+KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", MODE="0660", TAG+="uaccess"
+
+# DualShock 4 wireless adapter over USB hidraw
+KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", MODE="0660", TAG+="uaccess"
+
+# DualShock 4 Slim over USB hidraw
+KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", MODE="0660", TAG+="uaccess"
+
+# DualShock 4 over bluetooth hidraw
+KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0660", TAG+="uaccess"
+
+# DualShock 4 Slim over bluetooth hidraw
+KERNEL=="hidraw*", KERNELS=="*054C:09CC*", MODE="0660", TAG+="uaccess"
+
+# Nintendo Switch Pro Controller over USB hidraw
+KERNEL=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="2009", MODE="0660", TAG+="uaccess"
+
+# Nintendo Switch Pro Controller over bluetooth hidraw
+KERNEL=="hidraw*", KERNELS=="*057E:2009*", MODE="0660", TAG+="uaccess"
+
+# Nacon PS4 Revolution Pro Controller
+KERNEL=="hidraw*", ATTRS{idVendor}=="146b", ATTRS{idProduct}=="0d01", MODE="0660", TAG+="uaccess"
+
+# Razer Raiju PS4 Controller
+KERNEL=="hidraw*", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="1000", MODE="0660", TAG+="uaccess"
+
+# Razer Panthera Arcade Stick
+KERNEL=="hidraw*", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0401", MODE="0660", TAG+="uaccess"
+
+# Mad Catz - Street Fighter V Arcade FightPad PRO
+KERNEL=="hidraw*", ATTRS{idVendor}=="0738", ATTRS{idProduct}=="8250", MODE="0660", TAG+="uaccess"
+
+# Mad Catz - Street Fighter V Arcade FightStick TE S+
+KERNEL=="hidraw*", ATTRS{idVendor}=="0738", ATTRS{idProduct}=="8384", MODE="0660", TAG+="uaccess"
+
+# EMiO Elite Controller for PS4
+KERNEL=="hidraw*", ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="1cf6", MODE="0660", TAG+="uaccess"
+
+# HORI RAP4
+KERNEL=="hidraw*", ATTRS{idVendor}=="0f0d", ATTRS{idProduct}=="008a", MODE="0660", TAG+="uaccess"
+
+# HORIPAD 4 FPS
+KERNEL=="hidraw*", ATTRS{idVendor}=="0f0d", ATTRS{idProduct}=="0055", MODE="0660", TAG+="uaccess"
+
+# HORIPAD 4 FPS Plus
+KERNEL=="hidraw*", ATTRS{idVendor}=="0f0d", ATTRS{idProduct}=="0066", MODE="0660", TAG+="uaccess"
+
+# Armor Armor 3 Pad PS4
+KERNEL=="hidraw*", ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="0e10", MODE="0660", TAG+="uaccess"
+
+# STRIKEPAD PS4 Grip Add-on
+KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c5", MODE="0660", TAG+="uaccess"
+
+# NVIDIA Shield Portable (2013 - NVIDIA_Controller_v01.01 - In-Home Streaming only)
+KERNEL=="hidraw*", ATTRS{idVendor}=="0955", ATTRS{idProduct}=="7203", MODE="0660", TAG+="uaccess", ENV{ID_INPUT_JOYSTICK}="1", ENV{ID_INPUT_MOUSE}=""
+
+# NVIDIA Shield Controller (2015 - NVIDIA_Controller_v01.03 over USB hidraw)
+KERNEL=="hidraw*", ATTRS{idVendor}=="0955", ATTRS{idProduct}=="7210", MODE="0660", TAG+="uaccess", ENV{ID_INPUT_JOYSTICK}="1", ENV{ID_INPUT_MOUSE}=""
+
+# NVIDIA Shield Controller (2017 - NVIDIA_Controller_v01.04 over bluetooth hidraw)
+KERNEL=="hidraw*", KERNELS=="*0955:7214*", MODE="0660", TAG+="uaccess"