Replace some patches with upstream’s versions

Replace appdataContentRating.diff (added in commit
8009a0229636e2f38c5ecf5a5ef7cfdf0f4cf9b8) with upstream’s commit
89259ff90c703c7fe6768b5317803b9aa5b5ab8c, which also fixes a dead
screenshot link.

Replace validateAppdata.diff (added in commit
804a762c835b3eba0d32f9910e0ce06f919fd9c) with upstream’s commit
3c7947f310fb9c943fdd3973f6090926375b6e03.

4 files changed, 59 insertions, 23 deletions

diff --git a/debian/patches/appdata-screenshot-rating.diff b/debian/patches/appdata-screenshot-rating.diff
new file mode 100644
index 0000000..4ec6645
--- /dev/null
+++ b/debian/patches/appdata-screenshot-rating.diff
@@ -0,0 +1,47 @@
+From: Alan <alan-github@eth0.org.uk>
+Subject: fix screenshot and add OARS rating so appdata validates
+Origin: upstream, https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/89259ff90c703c7fe6768b5317803b9aa5b5ab8c
+Forwarded: https://github.com/transmission-remote-gtk/transmission-remote-gtk/pull/111
+Applied-Upstream: https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/89259ff90c703c7fe6768b5317803b9aa5b5ab8c
+
+--- a/README.md
++++ b/README.md
+@@ -6,13 +6,12 @@ the Transmission BitTorrent client, using its HTTP RPC protocol.
+ 
+ # DEPENDENCIES
+ 
+-The following packages are required dependencies:
++The following packages are required dependencies (debian/ubuntu).
+ 
+ ```bash
+-autoconf-archive appstream-glib intltool
++libgtk-3-dev automake autoconf gcc libgeoip-dev gettext autoconf-archive libappstream-dev appstream-util libcurl4-openssl-dev libjson-glib-dev
+ ```
+ 
+-
+ # BUILDING
+ 
+ Optionally install `libgeoip` and its headers to see the country
+diff --git a/data/io.github.TransmissionRemoteGtk.appdata.xml.in b/data/io.github.TransmissionRemoteGtk.appdata.xml.in
+index fc35a8f..1476c2a 100644
+--- a/data/io.github.TransmissionRemoteGtk.appdata.xml.in
++++ b/data/io.github.TransmissionRemoteGtk.appdata.xml.in
+@@ -7,6 +7,7 @@
+   <translation type="gettext">transmission-remote-gtk</translation>
+   <name>Transmission Remote</name>
+   <developer_name>Transmission Remote Gtk Team</developer_name>
++  <content_rating type="oars-1.1" />
+   <summary>Remotely manage the Transmission BitTorrent client</summary>
+   <url type="homepage">https://github.com/transmission-remote-gtk/transmission-remote-gtk</url>
+   <url type="bugtracker">https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues</url>
+@@ -23,8 +24,8 @@
+     </ul>
+   </description>
+   <screenshots>
+-    <screenshot height="576" width="1024" type="default">
+-      <image>http://eth0.org.uk/~alan/transmission-remote-gtk-1.1.1.png</image>
++    <screenshot height="512" width="973" type="default">
++      <image>https://community.linuxmint.com/img/screenshots/transmission-remote-gtk.png</image>
+     </screenshot>
+   </screenshots>
+   <releases>
diff --git a/debian/patches/appdataContentRating.diff b/debian/patches/appdataContentRating.diff
deleted file mode 100644
index 097a8fc..0000000
--- a/debian/patches/appdataContentRating.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Add content_rating field to appdata file
-Author: Benjamin Barenblat <bbaren@debian.org>
-Forwarded: no
---- a/data/io.github.TransmissionRemoteGtk.appdata.xml.in
-+++ b/data/io.github.TransmissionRemoteGtk.appdata.xml.in
-@@ -56,4 +56,5 @@
-     <id>uk.org.eth0.transmission-remote-gtk.desktop</id>
-   </provides>
-   <update_contact>tingping_at_fedoraproject.org</update_contact>
-+  <content_rating type="oars-1.0" />
- </component>
diff --git a/debian/patches/series b/debian/patches/series
index d37f5cd..5144911 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 avoidRssGlib.diff
 allow-gettext-0.20.diff
-appdataContentRating.diff
-validateAppdata.diff
 fno-common.diff
 show-torrent-hash.diff
+appdata-screenshot-rating.diff
+validateAppdata.diff
diff --git a/debian/patches/validateAppdata.diff b/debian/patches/validateAppdata.diff
index 1980e14..6d46a7f 100644
--- a/debian/patches/validateAppdata.diff
+++ b/debian/patches/validateAppdata.diff
@@ -1,16 +1,16 @@
-Description: Correct style errors in io.github.TransmissionRemoteGtk.appdata.xml
-Author: Benjamin Barenblat <bbaren@mit.edu>
-Bug: https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues/37
-Forwarded: no
+From: Alan <alan-github@eth0.org.uk>
+Subject: appdata description needs to be 300 chars before <ul> (apparently)
+Origin: upstream, https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/3c7947f310fb9c943fdd3973f6090926375b6e03
+Applied-Upstream: https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/3c7947f310fb9c943fdd3973f6090926375b6e03
+
 --- a/data/io.github.TransmissionRemoteGtk.appdata.xml.in
 +++ b/data/io.github.TransmissionRemoteGtk.appdata.xml.in
-@@ -13,14 +13,10 @@
+@@ -13,15 +13,8 @@
+   <url type="bugtracker">https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues</url>
    <description>
      <p>
-     Transmission Remote Gtk allows you to remotely manage the Transmission BitTorrent client using its RPC interface.
-+    It is a full featured client, allowing adding, starting, stopping, removing, verifying, and reannouncing torrents.
-+    It also exposes settings for both individual torrents (peer limits, file priorities, tracker settings, etc.) and Transmission as a whole (global limits, download directory, connectivity preferences, etc.)
-+    It can also act as a .torrent handler, opening when torrents are downloaded through a web browser.
+-    Transmission Remote Gtk allows you to remotely manage the Transmission BitTorrent client using its RPC interface.
++      Transmission Remote Gtk allows you to remotely manage the Transmission BitTorrent client using its RPC interface. You can use it to to manage torrents (start/stop/verify/reannounce/remove/remove and delete), add new ones (it works as a .torrent fle handler from a webbrowser), and configure settings on transmission-daemon.
      </p>
 -    <p>Features:</p>
 -    <ul>
@@ -21,4 +21,4 @@ Forwarded: no
 -    </ul>
    </description>
    <screenshots>
-     <screenshot height="576" width="1024" type="default">
+     <screenshot height="512" width="973" type="default">