diff --git a/README.md b/README.md index 20b693b..db9873a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Once a new package is added, it takes priority over the original one from Ubuntu so they never enter into the repo from upstream and need to be compiled with this helpers and pushed into reprepro. -To add a package to the list, follow the [CONTRIBUTING](https://gitlab.trisquel.org/trisquel/package-helpers/blob/nabia/CONTRIBUTING.md) guidelines. +To add a package to the list, follow the [CONTRIBUTING](CONTRIBUTING.md) guidelines. ## Steps @@ -39,7 +39,7 @@ Those are the steps done by the helpers: * You don't need to use sudo in order to run those scripts, but some extra packages are needed: - `sudo apt-get install cdbs devscripts dpkg-dev git gnupg gnupg2 patch python2 quilt rename rpl sed python3-jsonschema` + `sudo apt-get install cdbs devscripts dpkg-dev git gnupg gnupg2 patch quilt rename rpl sed python3-jsonschema` * Take care to use the right sourcePackageName, many source packages produce several binary packages. `apt-cache showsrc binary-package` can help you. 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/DATA/akregator/trisquel_feeds.patch b/helpers/DATA/akregator/trisquel_feeds.patch index 7d54c10..cc88808 100644 --- a/helpers/DATA/akregator/trisquel_feeds.patch +++ b/helpers/DATA/akregator/trisquel_feeds.patch @@ -1,5 +1,5 @@ ---- src/akregator_part.cpp 2020-06-05 11:41:23.000000000 -0500 -+++ src/akregator_part_trisquel.cpp 2020-06-05 12:46:05.914051386 -0500 +--- a/src/akregator_part.cpp 2020-06-05 11:41:23.000000000 -0500 ++++ b/src/akregator_part.cpp 2020-06-05 12:46:05.914051386 -0500 @@ -189,6 +189,61 @@ wire.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://wire.kubuntu.org/?feed=rss2")); kubuntuFolder.appendChild(wire); diff --git a/helpers/DATA/anarchism/patch_changes/000-replace_adobe_promotion_on_earlier_release.patch b/helpers/DATA/anarchism/patch_changes/000-replace_adobe_promotion_on_earlier_release.patch new file mode 100644 index 0000000..9849089 --- /dev/null +++ b/helpers/DATA/anarchism/patch_changes/000-replace_adobe_promotion_on_earlier_release.patch @@ -0,0 +1,32 @@ +diff --git a/html/pdf.html b/html/pdf.html +index 2e4143fa..9f58faa9 100644 +--- a/html/pdf.html ++++ b/html/pdf.html +@@ -7,7 +7,7 @@ + +
+

"An Anarchist FAQ" in pdf format

+-

To view and print out the file you will need to have Adobe Document Reader on your computer. This is free software that now comes on many computers and with many CD's. If you do not already have it you can download it from the Adobe site. [or click here for a faster text only page]

++

To view or print this file, you will need a PDF reader installed on your computer. Many PDF readers are free software and are available on most systems. If you don't already have one, you can browse a list of options at pdfreaders.org, or install a PDF reader from your operating system's software repository.

+

An Anarchist FAQ
+

+