From e530e63b6802848ffffa9af12713e14b92c35d75 Mon Sep 17 00:00:00 2001
From: "Andrew M. 'Leny' Lindley" <andrew@andrewlindley.co.uk>
Date: Thu, 9 Apr 2015 23:02:24 +0100
Subject: [PATCH 1/2] Fix ui7969 stop unrar-free packaging steering the user to
 unrar-nonfree

See https://trisquel.info/en/issues/7969
---
 helpers/make-unrar-free | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 helpers/make-unrar-free

diff --git a/helpers/make-unrar-free b/helpers/make-unrar-free
new file mode 100644
index 0000000..d84059a
--- /dev/null
+++ b/helpers/make-unrar-free
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+#    Copyright (C) 2013-2015 Andrew M. Lindley <andrew@andrewlindley.co.uk>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+# Trisquel Issue #7969 - package unrar suggests non-free software
+sed '/only the non-free "unrar" package can do that/s//see http\:\/\/www.fsf.org\/blogs\/licensing\/free-rarv3-extraction/
+/Conflicts: unrar-nonfree/d' -i debian/control
+
+changelog "Compiled for Trisquel"
+
+compile
+

From a38001b7efbc133007452cb31f906202e96465ea Mon Sep 17 00:00:00 2001
From: "Andrew M. 'Leny' Lindley" <andrew@andrewlindley.co.uk>
Date: Fri, 10 Apr 2015 10:00:24 +0100
Subject: [PATCH 2/2] Steer user toward unar, a free RARv3 extractor in the
 repo.

As per @Legimet's suggestion.
---
 helpers/make-unrar-free | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/helpers/make-unrar-free b/helpers/make-unrar-free
index d84059a..54a407e 100644
--- a/helpers/make-unrar-free
+++ b/helpers/make-unrar-free
@@ -22,10 +22,9 @@ VERSION=1
 . ./config
 
 # Trisquel Issue #7969 - package unrar suggests non-free software
-sed '/only the non-free "unrar" package can do that/s//see http\:\/\/www.fsf.org\/blogs\/licensing\/free-rarv3-extraction/
-/Conflicts: unrar-nonfree/d' -i debian/control
+sed '/only the non-free "unrar" package can do that/s//see package unar for that/;/Conflicts: unrar-nonfree/d' -i debian/control
 
-changelog "Compiled for Trisquel"
+changelog "FSDG Compliance #7969"
 
 compile