7zip: migrate helper from transitional package name.

This commit is contained in:
Luis Guzmán 2024-08-16 01:04:49 +00:00
parent 76237b9e63
commit 047089ef31
2 changed files with 38 additions and 6 deletions

View file

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

View file

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2011 Santiago Rodríguez <aklis@trisquel.info> # Copyright (C) 2011 Santiago Rodríguez <aklis@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # 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 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=2
. ./config . ./config
sed -i '/Suggests: p7zip-rar/d' debian/control # Use patch to modify control file
#Our versions doesn't handle rar files, due to licenses patch_p1 $DATA/000_remove-non-free-suggestions-from-control-file.patch
sed -i 's/RAR (only//; s/if non-free p7zip-rar package is installed),//' debian/control
#
changelog "Remove non free suggests" changelog "Remove non free suggests"
#Closes https://trisquel.info/es/issues/4360 #Closes https://trisquel.info/es/issues/4360
PARALLEL=false package package