From 047089ef31c93669b675b998a05563bb6101a30b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Fri, 16 Aug 2024 01:04:49 +0000
Subject: [PATCH] 7zip: migrate helper from transitional package name.

---
 ...n-free-suggestions-from-control-file.patch | 32 +++++++++++++++++++
 helpers/{make-p7zip => make-7zip}             | 12 +++----
 2 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 helpers/DATA/7zip/000_remove-non-free-suggestions-from-control-file.patch
 rename helpers/{make-p7zip => make-7zip} (80%)

diff --git a/helpers/DATA/7zip/000_remove-non-free-suggestions-from-control-file.patch b/helpers/DATA/7zip/000_remove-non-free-suggestions-from-control-file.patch
new file mode 100644
index 0000000..366de26
--- /dev/null
+++ b/helpers/DATA/7zip/000_remove-non-free-suggestions-from-control-file.patch
@@ -0,0 +1,32 @@
+diff --git a/debian/control b/debian/control
+index b4734c95..e0aa528c 100644
+--- a/debian/control
++++ b/debian/control
+@@ -13,7 +13,7 @@ Vcs-Browser: https://salsa.debian.org/debian/7zip
+ Package: 7zip
+ Architecture: any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+-Suggests: 7zip-standalone, 7zip-rar
++Suggests: 7zip-standalone
+ Breaks: p7zip-full (<= 16.02+dfsg-8), p7zip (<= 16.02+dfsg-8)
+ Replaces: p7zip-full (<= 16.02+dfsg-8), p7zip (<= 16.02+dfsg-8)
+ Provides: p7zip-full, p7zip
+@@ -37,7 +37,6 @@ Description: 7-Zip file archiver with a high compression ratio
+   * /usr/bin/7zr: LZMA (.7z, .lzma, .xz) only. Minimal executable.
+  .
+  Note: The unRAR code was dropped to keep compatible with DFSG.
+-       Install 7zip-rar package in non-free section to use RAR files.
+ 
+ Package: 7zip-standalone
+ Architecture: any
+@@ -49,8 +48,8 @@ Description: 7-Zip file archiver with a high compression ratio (standalone)
+  .
+  "7zip-standalone" provides:
+   * /usr/bin/7zz: Full featured except plugins, standalone executable.
+-       This means 7zz can't work with unRAR plugin that provided by 7zip-rar
+-       package. Use 7zip package for unRAR plugin.
++       This means 7zz can't work with the non-free unRAR plugin not
++       available at Trisquel repo.
+  .
+  Note: If you want to create SFX archive, you also needs 7zip package for SFX
+        stub module.
diff --git a/helpers/make-p7zip b/helpers/make-7zip
similarity index 80%
rename from helpers/make-p7zip
rename to helpers/make-7zip
index 68e4f19..c3ac55d 100644
--- a/helpers/make-p7zip
+++ b/helpers/make-7zip
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+#    Copyright (C) 2024  Luis Guzmán <ark@switnet.org>
 #    Copyright (C) 2011  Santiago Rodríguez <aklis@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -17,16 +18,15 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 
 . ./config
 
-sed -i  '/Suggests: p7zip-rar/d'  debian/control
-#Our versions doesn't handle rar files, due to licenses
-sed -i 's/RAR (only//; s/if non-free p7zip-rar package is installed),//' debian/control
-#
+# Use patch to modify control file
+patch_p1 $DATA/000_remove-non-free-suggestions-from-control-file.patch
+
 
 changelog "Remove non free suggests"
 #Closes https://trisquel.info/es/issues/4360
-PARALLEL=false package
+package