[Debian-med-packaging] Bug#915541: Removal of upstream "--will-cite" functionality has been reverted
Andreas Tille
andreas at an3as.eu
Sat Aug 28 20:43:52 BST 2021
Thanks for the patch. I'll upload this soon.
On Sat, Aug 28, 2021 at 01:48:56PM -0400, Ian Turner wrote:
> Thanks Andreas.
>
> On 8/28/21 12:57 PM, Andreas Tille wrote:
> > Patches are always welcome.
>
> Attached is a patch that removes all mentions of the --bibtex or --citation
> parameters, or demands for 10000 EUR, throughout the codebase. It includes
> the patch you already committed, so it should serve as a drop-in
> replacement.
>
> I would also like to say to Ole that I hope you can understand that this is
> not personal in any way.
>
> Ian
>
> diff --git a/src/env_parallel.dash b/src/env_parallel.dash
> index 0674942..878edc6 100755
> --- a/src/env_parallel.dash
> +++ b/src/env_parallel.dash
> @@ -395,7 +395,7 @@ _parset_main() {
> echo "Web site: https://www.gnu.org/software/parallel"
> echo
> echo "When using programs that use GNU Parallel to process data for publication"
> - echo "please cite as described in 'parallel --citation'."
> + echo "please cite as described in the manpage."
> echo
> return 255
> fi
> diff --git a/src/env_parallel.ksh b/src/env_parallel.ksh
> index 73dcf8b..746c989 100755
> --- a/src/env_parallel.ksh
> +++ b/src/env_parallel.ksh
> @@ -373,7 +373,7 @@ _parset_main() {
> echo "Web site: https://www.gnu.org/software/parallel"
> echo
> echo "When using programs that use GNU Parallel to process data for publication"
> - echo "please cite as described in 'parallel --citation'."
> + echo "please cite as described in the manpage."
> echo
> return 255
> fi
> diff --git a/src/env_parallel.pod b/src/env_parallel.pod
> old mode 100644
> new mode 100755
> index 57c7d54..d67c7f4
> --- a/src/env_parallel.pod
> +++ b/src/env_parallel.pod
> @@ -800,9 +800,6 @@ When using GNU B<env_parallel> for a publication please cite:
> O. Tange (2018): GNU Parallel 2018, March 2018, ISBN 9781387509881,
> DOI: 10.5281/zenodo.1146014.
>
> -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.
> -
> Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk
>
> Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk
> diff --git a/src/env_parallel.sh b/src/env_parallel.sh
> index 0f584ba..ba0e89d 100755
> --- a/src/env_parallel.sh
> +++ b/src/env_parallel.sh
> @@ -400,7 +400,7 @@ _parset_main() {
> echo "Web site: https://www.gnu.org/software/parallel"
> echo
> echo "When using programs that use GNU Parallel to process data for publication"
> - echo "please cite as described in 'parallel --citation'."
> + echo "please cite as described in the manpage."
> echo
> return 255
> fi
> diff --git a/src/env_parallel.zsh b/src/env_parallel.zsh
> index 54001c6..a0592c9 100755
> --- a/src/env_parallel.zsh
> +++ b/src/env_parallel.zsh
> @@ -365,7 +365,7 @@ _parset_main() {
> echo "Web site: https://www.gnu.org/software/parallel"
> echo
> echo "When using programs that use GNU Parallel to process data for publication"
> - echo "please cite as described in 'parallel --citation'."
> + echo "please cite as described in the manpage."
> echo
> return 255
> fi
> diff --git a/src/parallel b/src/parallel
> index d2f0396..d8288ed 100755
> --- a/src/parallel
> +++ b/src/parallel
> @@ -1607,7 +1607,7 @@ sub options_hash() {
> # Before changing this line, 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
> - "bibtex|citation" => \$opt::citation,
> +# "bibtex|citation" => \$opt::citation,
> "wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite,
> # Termination and retries
> "halt-on-error|halt=s" => \$opt::halt,
> @@ -1764,10 +1764,10 @@ sub parse_options(@) {
> # Before changing this line, 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
> - if(defined $opt::citation) {
> - citation(\@argv_before,\@ARGV);
> - wait_and_exit(0);
> - }
> +# if(defined $opt::citation) {
> +# citation(\@argv_before,\@ARGV);
> +# wait_and_exit(0);
> +# }
> # no-* overrides *
> if($opt::nokeeporder) { $opt::keeporder = undef; }
>
> @@ -2117,7 +2117,7 @@ sub parse_options(@) {
> #
> # If you want GNU Parallel to be maintained in the future you
> # should keep this line.
> - citation_notice();
> +# citation_notice();
> # Seriously: _YOU_ will be harming free software by removing the
> # notice. _YOU_ make it harder to justify spending time developing
> # it. If you *do* remove the line, please email
> @@ -5058,9 +5058,9 @@ sub usage() {
> # Before changing this line, 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
> - "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.",
> - "",
> +# "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.",
> +# "",
> "",);
> }
>
> @@ -5187,7 +5187,7 @@ sub version() {
> "",
> "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",
> + "please cite as described in the manpage.\n",
> );
> }
>
> diff --git a/src/parallel.pod b/src/parallel.pod
> old mode 100644
> new mode 100755
> index 7a8a9c2..e84a189
> --- a/src/parallel.pod
> +++ b/src/parallel.pod
> @@ -576,33 +576,6 @@ See also: B<--fg>, B<man sem>.
>
> Implies B<--semaphore>.
>
> -
> -=item B<--bibtex>
> -
> -=item B<--citation>
> -
> -Print the citation notice and BibTeX entry for GNU B<parallel>,
> -silence citation notice for all future runs, and exit. It will not run
> -any commands.
> -
> -If it is impossible for you to run B<--citation> you can instead use
> -B<--will-cite>, which will run commands, but which will only silence
> -the citation notice for this single run.
> -
> -If you use B<--will-cite> in scripts to be run by others you are
> -making it harder for others to see the citation notice. The
> -development of GNU B<parallel> is indirectly financed through
> -citations, so if your users do not know they should cite then you are
> -making it harder to finance development. However, if you pay 10000
> -EUR, you have done your part to finance future development and should
> -feel free to use B<--will-cite> in scripts.
> -
> -If you do not want to help financing future development by letting
> -other users see the citation notice or by paying, then please use
> -another tool instead of GNU B<parallel>. You can find some of the
> -alternatives in B<man parallel_alternatives>.
> -
> -
> =item B<--block> I<size>
>
> =item B<--block-size> I<size>
> @@ -5562,9 +5535,6 @@ When using GNU B<parallel> for a publication please cite:
> O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login:
> The USENIX Magazine, February 2011:42-47.
>
> -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.
> -
> Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk
>
> Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk
> diff --git a/src/parallel_alternatives.pod b/src/parallel_alternatives.pod
> old mode 100644
> new mode 100755
> index f9a0dfd..67effb3
> --- a/src/parallel_alternatives.pod
> +++ b/src/parallel_alternatives.pod
> @@ -3613,9 +3613,6 @@ When using GNU B<parallel> for a publication please cite:
> O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login:
> The USENIX Magazine, February 2011:42-47.
>
> -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.
> -
> Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk
>
> Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk
> diff --git a/src/parallel_design.pod b/src/parallel_design.pod
> old mode 100644
> new mode 100755
> index 94be7f4..32e9a70
> --- a/src/parallel_design.pod
> +++ b/src/parallel_design.pod
> @@ -1340,18 +1340,6 @@ and if it works, you should post it on the email list. Ideas that will
> cost work and which have not been tested are, however, unlikely to be
> prioritized.
>
> -Running B<parallel --citation> one single time takes less than 10
> -seconds, and will silence the citation notice for future runs. This is
> -comparable to graphical tools where you have to click a checkbox
> -saying "Do not show this again". But if that is too much trouble for
> -you, why not use one of the alternatives instead? See a list in:
> -B<man parallel_alternatives>.
> -
> -As the request for citation is not a legal requirement this is
> -acceptable under GPLv3 and cleared with Richard M. Stallman
> -himself. Thus it does not fall under this:
> -https://www.gnu.org/licenses/gpl-faq.en.html#RequireCitation
> -
>
> =head1 Ideas for new design
>
> diff --git a/src/parallel_tutorial.pod b/src/parallel_tutorial.pod
> old mode 100644
> new mode 100755
> index 210084d..9408e52
> --- a/src/parallel_tutorial.pod
> +++ b/src/parallel_tutorial.pod
> @@ -2993,9 +2993,6 @@ Output:
>
> O. Tange (2011): GNU Parallel - The Command-Line Power Tool,
> ;login: The USENIX Magazine, February 2011:42-47.
> -
> - 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.
>
> When asking for help, always report the full output of this:
>
> @@ -3013,7 +3010,7 @@ Output:
> Web site: https://www.gnu.org/software/parallel
>
> When using programs that use GNU Parallel to process data for publication
> - please cite as described in 'parallel --citation'.
> + please cite as described in the manpage.
>
> In scripts B<--minversion> can be used to ensure the user has at least
> this version:
> @@ -3026,38 +3023,6 @@ Output:
> 20160322
> Your version is at least 20130722.
>
> -If you are using GNU B<parallel> for research the BibTeX citation can be
> -generated using B<--citation>:
> -
> - parallel --citation
> -
> -Output:
> -
> - Academic tradition requires you to cite works you base your article on.
> - When using programs that use GNU Parallel to process data for publication
> - please cite:
> -
> - @article{Tange2011a,
> - title = {GNU Parallel - The Command-Line Power Tool},
> - author = {O. Tange},
> - address = {Frederiksberg, Denmark},
> - journal = {;login: The USENIX Magazine},
> - month = {Feb},
> - number = {1},
> - volume = {36},
> - url = {https://www.gnu.org/s/parallel},
> - year = {2011},
> - pages = {42-47},
> - doi = {10.5281/zenodo.16303}
> - }
> -
> - (Feel free to use \nocite{Tange2011a})
> -
> - 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.
> -
> - If you send a copy of your published article to tange at gnu.org, it will be
> - mentioned in the release notes of next version of GNU Parallel.
>
> With B<--max-line-length-allowed> GNU B<parallel> will report the maximal
> size of the command line:
> @@ -3150,7 +3115,7 @@ If you use GNU B<parallel> for research:
>
> =item *
>
> -Please cite GNU B<parallel> in you publications (use B<--citation>)
> +Please cite GNU B<parallel> in you publications
>
> =back
>
> diff --git a/src/parset.pod b/src/parset.pod
> old mode 100644
> new mode 100755
> index ad9621e..48e20d9
> --- a/src/parset.pod
> +++ b/src/parset.pod
> @@ -195,9 +195,6 @@ When using GNU B<parallel> for a publication please cite:
> O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login:
> The USENIX Magazine, February 2011:42-47.
>
> -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.
> -
> Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk
>
> Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk
> diff --git a/src/parsort b/src/parsort
> index 85c2289..a82e7a3 100755
> --- a/src/parsort
> +++ b/src/parsort
> @@ -402,7 +402,7 @@ sub version() {
> "",
> "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",
> + "please cite as described in the manpage.\n",
> );
> }
>
> diff --git a/src/sem b/src/sem
> index d2f0396..13af30e 100755
> --- a/src/sem
> +++ b/src/sem
> @@ -1607,7 +1607,7 @@ sub options_hash() {
> # Before changing this line, 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
> - "bibtex|citation" => \$opt::citation,
> + # "bibtex|citation" => \$opt::citation,
> "wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite,
> # Termination and retries
> "halt-on-error|halt=s" => \$opt::halt,
> @@ -1764,10 +1764,10 @@ sub parse_options(@) {
> # Before changing this line, 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
> - if(defined $opt::citation) {
> - citation(\@argv_before,\@ARGV);
> - wait_and_exit(0);
> - }
> + # if(defined $opt::citation) {
> + # citation(\@argv_before,\@ARGV);
> + # wait_and_exit(0);
> + # }
> # no-* overrides *
> if($opt::nokeeporder) { $opt::keeporder = undef; }
>
> @@ -2117,7 +2117,7 @@ sub parse_options(@) {
> #
> # If you want GNU Parallel to be maintained in the future you
> # should keep this line.
> - citation_notice();
> + # citation_notice();
> # Seriously: _YOU_ will be harming free software by removing the
> # notice. _YOU_ make it harder to justify spending time developing
> # it. If you *do* remove the line, please email
> @@ -5058,8 +5058,8 @@ sub usage() {
> # Before changing this line, 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
> - "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.",
> + # "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.",
> "",
> "",);
> }
> @@ -5187,7 +5187,7 @@ sub version() {
> "",
> "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",
> + "please cite as described in the manpage.\n",
> );
> }
>
--
http://fam-tille.de
More information about the Debian-med-packaging
mailing list