From 1f0fd42efc02e97508b165782b1e1b2b7cd85857 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Mon, 11 Jan 2021 18:02:20 -0500 Subject: Replace some patches with upstream’s versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- debian/patches/appdata-screenshot-rating.diff | 47 +++++++++++++++++++++++++++ debian/patches/appdataContentRating.diff | 11 ------- debian/patches/series | 4 +-- debian/patches/validateAppdata.diff | 20 ++++++------ 4 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 debian/patches/appdata-screenshot-rating.diff delete mode 100644 debian/patches/appdataContentRating.diff 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 +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 @@ + transmission-remote-gtk + Transmission Remote + Transmission Remote Gtk Team ++ + Remotely manage the Transmission BitTorrent client + https://github.com/transmission-remote-gtk/transmission-remote-gtk + https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues +@@ -23,8 +24,8 @@ + + + +- +- http://eth0.org.uk/~alan/transmission-remote-gtk-1.1.1.png ++ ++ https://community.linuxmint.com/img/screenshots/transmission-remote-gtk.png + + + 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 -Forwarded: no ---- a/data/io.github.TransmissionRemoteGtk.appdata.xml.in -+++ b/data/io.github.TransmissionRemoteGtk.appdata.xml.in -@@ -56,4 +56,5 @@ - uk.org.eth0.transmission-remote-gtk.desktop - - tingping_at_fedoraproject.org -+ - 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 -Bug: https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues/37 -Forwarded: no +From: Alan +Subject: appdata description needs to be 300 chars before
    (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 @@ + https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues

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

    -

    Features:

    -
      @@ -21,4 +21,4 @@ Forwarded: no -
    - + -- cgit v1.2.3