[arch-commits] Commit in parallel/repos (4 files)
Date: Monday, December 2, 2019 @ 20:34:16 Author: demize Revision: 534761 archrelease: copy trunk to community-testing-any Added: parallel/repos/community-testing-any/ parallel/repos/community-testing-any/0001-Remove-citation-things.patch (from rev 534760, parallel/trunk/0001-Remove-citation-things.patch) parallel/repos/community-testing-any/0002-Remove-GNU-branding.patch (from rev 534760, parallel/trunk/0002-Remove-GNU-branding.patch) parallel/repos/community-testing-any/PKGBUILD (from rev 534760, parallel/trunk/PKGBUILD) ---+ 0001-Remove-citation-things.patch | 320 0002-Remove-GNU-branding.patch| 245 +++ PKGBUILD | 40 3 files changed, 605 insertions(+) Copied: parallel/repos/community-testing-any/0001-Remove-citation-things.patch (from rev 534760, parallel/trunk/0001-Remove-citation-things.patch) === --- community-testing-any/0001-Remove-citation-things.patch (rev 0) +++ community-testing-any/0001-Remove-citation-things.patch 2019-12-02 20:34:16 UTC (rev 534761) @@ -0,0 +1,320 @@ +From 1eae416754561ffc38da4c07104f48c06c56a30c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= +Date: Fri, 22 Mar 2019 19:03:41 +0100 +Subject: [PATCH 1/2] Remove citation things +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Johannes Löthberg +--- + src/parallel | 245 +-- + 1 file changed, 3 insertions(+), 242 deletions(-) + +diff --git a/src/parallel b/src/parallel +index 8b8359c..9cd4505 100755 +--- a/src/parallel b/src/parallel +@@ -504,7 +504,7 @@ sub pipe_shard_setup() { + } else { + $script = sharder_script(); + } +- ++ + # cat foo | sharder sep col fifo1 fifo2 fifo3 ... fifoN + + if($shardbin =~ /^[a-z_][a-z_0-9]*(\s|$)/i) { +@@ -1534,9 +1534,6 @@ sub options_hash() { +"gnu" => \$opt::gnu, +"link|xapply" => \$opt::link, +"linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource, +- # 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, +"wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite, +# Termination and retries +@@ -1643,13 +1640,6 @@ sub parse_options(@) { + my @argv_before = @ARGV; + @ARGV = read_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); +-} + # no-* overrides * + if($opt::nokeeporder) { $opt::keeporder = undef; } + +@@ -1884,78 +1874,6 @@ sub parse_options(@) { + if(defined $opt::eta) { $opt::progress = $opt::eta; } + if(defined $opt::bar) { $opt::progress = $opt::bar; } + +-# Funding a free software project is hard. GNU Parallel is no +-# exception. On top of that it seems the less visible a project +-# is, the harder it is to get funding. And the nature of GNU +-# Parallel is that it will never be seen by "the guy with the +-# checkbook", but only by the people doing the actual work. +-# +-# This problem has been covered by others - though no solution has +-# been found: +-# https://www.slideshare.net/NadiaEghbal/consider-the-maintainer +-# https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/ +-# +-# If you want GNU Parallel to be maintained in the future, and not +-# just wither away like so many other free software tools, you +-# need to help finance the development. +-# +-# The citation notice is a simple way of doing so, as citations +-# makes it possible to me to get a job where I can maintain GNU +-# Parallel as part of the job. +-# +-# This means you can help financing development +-# +-# WITHOUT PAYING A SINGLE CENT! +-# +-# Before implementing the citation notice it was discussed with +-# the users: +-# https://lists.gnu.org/archive/html/parallel/2013-11/msg6.html +-# +-# Having to spend 10 seconds on running 'parallel --citation' once +-# is no doubt not an ideal solution, but no one has so far come up +-# with an ideal solution - neither for funding GNU Parallel nor +-# other free software. +-# +-# If you believe you have the perfect solution, you should try it +-# out, and if it works, you should post it on the email +-# list.
[arch-commits] Commit in parallel/repos (4 files)
Date: Friday, March 22, 2019 @ 18:12:13 Author: demize Revision: 443177 archrelease: copy trunk to community-testing-any Added: parallel/repos/community-testing-any/ parallel/repos/community-testing-any/0001-Remove-citation-things.patch (from rev 443176, parallel/trunk/0001-Remove-citation-things.patch) parallel/repos/community-testing-any/0002-Remove-GNU-branding.patch (from rev 443176, parallel/trunk/0002-Remove-GNU-branding.patch) parallel/repos/community-testing-any/PKGBUILD (from rev 443176, parallel/trunk/PKGBUILD) ---+ 0001-Remove-citation-things.patch | 277 0002-Remove-GNU-branding.patch| 165 + PKGBUILD | 40 + 3 files changed, 482 insertions(+) Copied: parallel/repos/community-testing-any/0001-Remove-citation-things.patch (from rev 443176, parallel/trunk/0001-Remove-citation-things.patch) === --- community-testing-any/0001-Remove-citation-things.patch (rev 0) +++ community-testing-any/0001-Remove-citation-things.patch 2019-03-22 18:12:13 UTC (rev 443177) @@ -0,0 +1,277 @@ +From e53f497bdd17ea5f6947d3b4af5d44c54b2978f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= +Date: Fri, 22 Mar 2019 19:03:41 +0100 +Subject: [PATCH 1/2] Remove citation things +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Johannes Löthberg +--- + src/parallel | 218 +-- + 1 file changed, 1 insertion(+), 217 deletions(-) + +diff --git a/src/parallel b/src/parallel +index 27a07c1..8e4437a 100755 +--- a/src/parallel b/src/parallel +@@ -1206,8 +1206,6 @@ sub options_hash() { +"gnu" => \$opt::gnu, +"link|xapply" => \$opt::link, +"linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource, +- # Before changing this line, please read +- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice +"bibtex|citation" => \$opt::citation, +"wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite, +# Termination and retries +@@ -1312,12 +1310,6 @@ sub parse_options(@) { + my @argv_before = @ARGV; + @ARGV = read_options(); + +-# Before changing this line, please read +-# https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice +-if(defined $opt::citation) { +- citation(\@argv_before,\@ARGV); +- wait_and_exit(0); +-} + # no-* overrides * + if($opt::nokeeporder) { $opt::keeporder = undef; } + +@@ -1544,59 +1536,6 @@ sub parse_options(@) { + if(defined $opt::eta) { $opt::progress = $opt::eta; } + if(defined $opt::bar) { $opt::progress = $opt::bar; } + +-# Funding a free software project is hard. GNU Parallel is no +-# exception. On top of that it seems the less visible a project +-# is, the harder it is to get funding. And the nature of GNU +-# Parallel is that it will never be seen by "the guy with the +-# checkbook", but only by the people doing the actual work. +-# +-# This problem has been covered by others - though no solution has +-# been found: +-# https://www.slideshare.net/NadiaEghbal/consider-the-maintainer +-# https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/ +-# +-# Before implementing the citation notice it was discussed with +-# the users: +-# https://lists.gnu.org/archive/html/parallel/2013-11/msg6.html +-# +-# Having to spend 10 seconds on running 'parallel --citation' once +-# is no doubt not an ideal solution, but no one has so far come up +-# with an ideal solution - neither for funding GNU Parallel nor +-# other free software. +-# +-# If you believe you have the perfect solution, you should try it +-# out, 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. +-# +-# Please note that GPL version 3 gives you the right to fork GNU +-# Parallel under a new name, but it does not give you the right to +-# distribute modified copies with the citation notice disabled +-# under the name GNU Parallel. To do that you need to be the owner +-# of the GNU Parallel trademark. The xt:Commerce case shows this. +-# +-# Description of the xt:Commerce case in OLG Duesseldorf +-# http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx +-#
[arch-commits] Commit in parallel/repos (4 files)
Date: Friday, March 22, 2019 @ 18:11:00 Author: demize Revision: 443175 archrelease: copy trunk to testing-any Added: parallel/repos/testing-any/ parallel/repos/testing-any/0001-Remove-citation-things.patch (from rev 443174, parallel/trunk/0001-Remove-citation-things.patch) parallel/repos/testing-any/0002-Remove-GNU-branding.patch (from rev 443174, parallel/trunk/0002-Remove-GNU-branding.patch) parallel/repos/testing-any/PKGBUILD (from rev 443174, parallel/trunk/PKGBUILD) ---+ 0001-Remove-citation-things.patch | 277 0002-Remove-GNU-branding.patch| 165 + PKGBUILD | 40 + 3 files changed, 482 insertions(+) Copied: parallel/repos/testing-any/0001-Remove-citation-things.patch (from rev 443174, parallel/trunk/0001-Remove-citation-things.patch) === --- testing-any/0001-Remove-citation-things.patch (rev 0) +++ testing-any/0001-Remove-citation-things.patch 2019-03-22 18:11:00 UTC (rev 443175) @@ -0,0 +1,277 @@ +From e53f497bdd17ea5f6947d3b4af5d44c54b2978f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= +Date: Fri, 22 Mar 2019 19:03:41 +0100 +Subject: [PATCH 1/2] Remove citation things +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Johannes Löthberg +--- + src/parallel | 218 +-- + 1 file changed, 1 insertion(+), 217 deletions(-) + +diff --git a/src/parallel b/src/parallel +index 27a07c1..8e4437a 100755 +--- a/src/parallel b/src/parallel +@@ -1206,8 +1206,6 @@ sub options_hash() { +"gnu" => \$opt::gnu, +"link|xapply" => \$opt::link, +"linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource, +- # Before changing this line, please read +- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice +"bibtex|citation" => \$opt::citation, +"wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite, +# Termination and retries +@@ -1312,12 +1310,6 @@ sub parse_options(@) { + my @argv_before = @ARGV; + @ARGV = read_options(); + +-# Before changing this line, please read +-# https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice +-if(defined $opt::citation) { +- citation(\@argv_before,\@ARGV); +- wait_and_exit(0); +-} + # no-* overrides * + if($opt::nokeeporder) { $opt::keeporder = undef; } + +@@ -1544,59 +1536,6 @@ sub parse_options(@) { + if(defined $opt::eta) { $opt::progress = $opt::eta; } + if(defined $opt::bar) { $opt::progress = $opt::bar; } + +-# Funding a free software project is hard. GNU Parallel is no +-# exception. On top of that it seems the less visible a project +-# is, the harder it is to get funding. And the nature of GNU +-# Parallel is that it will never be seen by "the guy with the +-# checkbook", but only by the people doing the actual work. +-# +-# This problem has been covered by others - though no solution has +-# been found: +-# https://www.slideshare.net/NadiaEghbal/consider-the-maintainer +-# https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/ +-# +-# Before implementing the citation notice it was discussed with +-# the users: +-# https://lists.gnu.org/archive/html/parallel/2013-11/msg6.html +-# +-# Having to spend 10 seconds on running 'parallel --citation' once +-# is no doubt not an ideal solution, but no one has so far come up +-# with an ideal solution - neither for funding GNU Parallel nor +-# other free software. +-# +-# If you believe you have the perfect solution, you should try it +-# out, 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. +-# +-# Please note that GPL version 3 gives you the right to fork GNU +-# Parallel under a new name, but it does not give you the right to +-# distribute modified copies with the citation notice disabled +-# under the name GNU Parallel. To do that you need to be the owner +-# of the GNU Parallel trademark. The xt:Commerce case shows this. +-# +-# Description of the xt:Commerce case in OLG Duesseldorf +-# http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx +-# https://web.archive.org/web/20180715073746/http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx +-# +-# The verdict in German +-#