Date: Wednesday, March 23, 2022 @ 08:33:24 Author: grawlinson Revision: 1171248
upgpkg: parallel 20220322-1 * New upstream release. * Store public key alongside PKGBUILD. Added: parallel/trunk/CDA01A4208C4F74506107E7BD1AB451688888888.asc Modified: parallel/trunk/0001-Remove-citation-things.patch parallel/trunk/PKGBUILD ----------------------------------------------+ 0001-Remove-citation-things.patch | 45 ++++++++++++------------- CDA01A4208C4F74506107E7BD1AB451688888888.asc | 1 PKGBUILD | 12 +++--- 3 files changed, 30 insertions(+), 28 deletions(-) Modified: 0001-Remove-citation-things.patch =================================================================== --- 0001-Remove-citation-things.patch 2022-03-23 08:19:25 UTC (rev 1171247) +++ 0001-Remove-citation-things.patch 2022-03-23 08:33:24 UTC (rev 1171248) @@ -1,3 +1,5 @@ +diff --git a/src/parallel b/src/parallel +index 0151f73..5e71108 100755 --- a/src/parallel +++ b/src/parallel @@ -1668,11 +1668,6 @@ sub options_hash() { @@ -8,7 +10,7 @@ - # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice - # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt - # You accept to be put in a public hall of shame by removing -- # these lines. +- # these lines. "bibtex|citation" => \$opt::citation, "will-cite|willcite|nn|nonotice|no-notice" => \$opt::willcite, # Termination and retries @@ -57,7 +59,7 @@ - # - # This means you can help financing development - # -- # WITHOUT PAYING A SINGLE CENT! +- # WITHOUT PAYING A SINGLE CENT! - # - # Before implementing the citation notice it was discussed with - # the users: @@ -110,7 +112,7 @@ parse_halt(); if($ENV{'PARALLEL_ENV'}) { -@@ -5138,83 +5049,9 @@ sub usage() { +@@ -5141,83 +5052,9 @@ sub usage() { "", "GNU Parallel can do much more. See 'man $Global::progname' for details", "", @@ -118,14 +120,14 @@ - "If you use programs that use GNU Parallel to process data for an article in a", - "scientific publication, please cite:", - "", -- " Tange, O. (2022, February 22). GNU Parallel 20220222 ('Donetsk Luhansk').", -- " Zenodo. https://doi.org/10.5281/zenodo.6213471", +- " Tange, O. (2022, March 22). GNU Parallel 20220322 ('Маріу́поль').", +- " Zenodo. https://doi.org/10.5281/zenodo.6377950", - "", -- # Before changing these lines, please read -- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice +- # Before changing these lines, please read +- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice - # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt - # You accept to be put in a public hall of shame by removing -- # these lines. +- # these lines. - "This helps funding further development; AND IT WON'T COST YOU A CENT.", - "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.", - "", @@ -151,8 +153,8 @@ - "If you use programs that use GNU Parallel to process data for an article in a", - "scientific publication, please cite:", - "", -- " Tange, O. (2022, February 22). GNU Parallel 20220222 ('Donetsk Luhansk').", -- " Zenodo. https://doi.org/10.5281/zenodo.6213471", +- " Tange, O. (2022, March 22). GNU Parallel 20220322 ('Маріу́поль').", +- " Zenodo. https://doi.org/10.5281/zenodo.6377950", - "", - # Before changing these line, please read - # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice and @@ -194,15 +196,14 @@ sub status(@) { my @w = @_; my $fh = $Global::status_fd || *STDERR; -@@ -5278,98 +5115,7 @@ sub version() { - "License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>", +@@ -5282,97 +5119,7 @@ sub version() { "This is free software: you are free to change and redistribute it.", "GNU $Global::progname comes with no warranty.", -- "", + "", - "Web site: https://www.gnu.org/software/${Global::progname}\n", - "When using programs that use GNU Parallel to process data for publication", - "please cite as described in 'parallel --citation'.\n", -- ); +- ); -} - -sub citation() { @@ -221,20 +222,20 @@ - "If you use programs that use GNU Parallel to process data for an article in a", - "scientific publication, please cite:", - "", -- "\@software{tange_2022_6213471,", +- "\@software{tange_2022_6377950,", - " author = {Tange, Ole},", -- " title = {GNU Parallel 20220222 ('Donetsk Luhansk')},", -- " month = Feb,", +- " title = {GNU Parallel 20220322 ('Маріу́поль')},", +- " month = Mar,", - " year = 2021,", - " note = {{GNU Parallel is a general parallelizer to run", -- " multiple serial command line programs in parallel", +- " multiple serial command line programs in parallel", - " without changing them.}},", - " publisher = {Zenodo},", -- " doi = {10.5281/zenodo.6213471},", -- " url = {https://doi.org/10.5281/zenodo.6213471}", +- " doi = {10.5281/zenodo.6377950},", +- " url = {https://doi.org/10.5281/zenodo.6377950}", - "}", - "", -- "(Feel free to use \\nocite{tange_2022_6213471})", +- "(Feel free to use \\nocite{tange_2022_6377950})", - "", - # Before changing these lines, please read - # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice and @@ -252,7 +253,7 @@ - "If you send a copy of your published article to tange\@gnu.org, it will be", - "mentioned in the release notes of next version of GNU Parallel.", - "" - ); + ); - while(not grep { -e "$_/will-cite" } @Global::config_dirs) { - print "\nType: 'will cite' and press enter.\n> "; - my $input = <STDIN>; Added: CDA01A4208C4F74506107E7BD1AB451688888888.asc =================================================================== (Binary files differ) Index: parallel/trunk/CDA01A4208C4F74506107E7BD1AB451688888888.asc =================================================================== --- CDA01A4208C4F74506107E7BD1AB451688888888.asc 2022-03-23 08:19:25 UTC (rev 1171247) +++ CDA01A4208C4F74506107E7BD1AB451688888888.asc 2022-03-23 08:33:24 UTC (rev 1171248) Property changes on: parallel/trunk/CDA01A4208C4F74506107E7BD1AB451688888888.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-23 08:19:25 UTC (rev 1171247) +++ PKGBUILD 2022-03-23 08:33:24 UTC (rev 1171248) @@ -1,5 +1,5 @@ # Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: George Rawlinson <grawlin...@archlinux.org> +# Maintainer: George Rawlinson <grawlin...@archlinux.org> # Contributor: Timothy Redaelli <timothy.redae...@gmail.com> # Contributor: Vianney le Clément <vleclement AT gmail·com> # Contributor: Peter Simons <sim...@cryp.to> @@ -6,7 +6,7 @@ pkgbase=parallel pkgname=('parallel' 'parallel-docs') -pkgver=20220222 +pkgver=20220322 pkgrel=1 pkgdesc='A shell tool for executing jobs in parallel' arch=('any') @@ -16,12 +16,12 @@ "https://ftp.gnu.org/gnu/$pkgbase/$pkgbase-$pkgver.tar.bz2"{,.sig} '0001-Remove-citation-things.patch' ) -sha512sums=('3a5bb880fb4c4e2fa9ccda95359da36e16af5cdfc26095471613b03b994bf6fa2a8370933cc3a570069f5cb733475948b66f3d93cd78dfe20df5f0278148ba1e' +sha512sums=('2e486ac131404672c0da6b9391717588e2df2b41b3914d433f25cf313017a2bcc554462213979318e334e1ea95a3887d55b0e7c5f5837f637c00e19562d52fd9' 'SKIP' - 'd0841cb0654ce7797874f9118cb44a57f84274b33e0984af29a67fd498b3f90f2a17450130490051d3f2191b533854989a27919b91c1f9af8ec0d6ba1d34fc99') -b2sums=('55cc38cc93007be6c31a7a24df5fa2411aea07fe148caeb87de7756e6c8fcd47e47af72e90cd6d142469abdc653cd4de67e5994932f6db6bb123701cee72f88b' + 'c4dc8f67a312a60ef40803a6d2937bfe5aa5ece50957f9458c319ff074a1cfc04dd4beb9096d58f98cedab2669d5c5ce5cc322d4d5dfd52ecd7687b6ecfa58d8') +b2sums=('d641f8bf59aced5b5c4d009fdcbbd79db03ac1cea45a315d220d4f1204f7f9f6b5c3b996487627fb356ffd1ab7c12eef7f3b5accf352ed43f414b7f72282620c' 'SKIP' - '41a5a1a002e618fa903046580ea9ba7902e174b901a3d0d590eba38615a064fcdba85272f308285e536a56ef60aa71e4e32d5ec697d99825fea1074fd39d0121') + 'cfabcc3c604f49c3c9cef7ce0049596925c432f0e0c5d19268a1bdd70b3d4daee30e43da76a39098b50af83a3d41f298be5ebefbaab974e51abdfbd87cc2ccea') validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888') prepare() {