Control: tags -1 +pending Le dimanche, 21 octobre 2018, 18.59:26 h CET Ole Tange a écrit : > Upgrading from 20141022 to 20180922 seems to address all issues. > > Can we close this ticket?
Live from the Bern BSP.
I have taken a long look at this bugreport log, and have concluded that under
GPL, Debian can as well just remove the concerned "parallel --citation"
functionality, and keep "parallel" in Debian main.
I have therefore uploaded a DELAYED/0 NMU with version 20161222-1.1 fixing
this bug through removal of all the citation mechanism. The full debdiff is
attached.
Cheers,
OdyXdiff -Nru parallel-20161222/debian/changelog parallel-20161222/debian/changelog
--- parallel-20161222/debian/changelog 2016-12-31 14:24:10.000000000 +0100
+++ parallel-20161222/debian/changelog 2018-12-01 23:18:34.000000000 +0100
@@ -1,3 +1,11 @@
+parallel (20161222-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Update Vcs-* to point to salsa
+ * Remove citation requirements completely (Closes: #905674)
+
+ -- Didier Raboud <o...@debian.org> Sat, 01 Dec 2018 23:18:34 +0100
+
parallel (20161222-1) unstable; urgency=medium
[ Rogério Brito ]
diff -Nru parallel-20161222/debian/control parallel-20161222/debian/control
--- parallel-20161222/debian/control 2016-12-31 14:24:10.000000000 +0100
+++ parallel-20161222/debian/control 2018-12-01 21:08:59.000000000 +0100
@@ -10,8 +10,8 @@
texinfo
Standards-Version: 3.9.6
Homepage: https://www.gnu.org/software/parallel/
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/parallel.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/parallel.git
+Vcs-Git: https://salsa.debian.org/debian/parallel.git
+Vcs-Browser: https://salsa.debian.org/debian/parallel
Package: parallel
Architecture: all
diff -Nru parallel-20161222/debian/patches/remove-overreaching-citation-request.patch parallel-20161222/debian/patches/remove-overreaching-citation-request.patch
--- parallel-20161222/debian/patches/remove-overreaching-citation-request.patch 1970-01-01 01:00:00.000000000 +0100
+++ parallel-20161222/debian/patches/remove-overreaching-citation-request.patch 2018-12-01 23:11:50.000000000 +0100
@@ -0,0 +1,169 @@
+Description: Remove overreaching citation notice
+ Quoting the gpl-faq:
+ .
+ > Does the GPL allow me to add terms that would require citation or
+ > acknowledgment in research papers which use the GPL-covered software or its
+ > output? (#RequireCitation)
+ > .
+ > No, this is not permitted under the terms of the GPL. While we recognize
+ > that proper citation is an important part of academic publications,
+ > citation cannot be added as an additional requirement to the GPL. Requiring
+ > citation in research papers which made use of GPL'd software goes beyond
+ > what would be an acceptable additional requirement under section 7(b) of
+ > GPLv3, and therefore would be considered an additional restriction under
+ > Section 7 of the GPL. And copyright law does not allow you to place such a
+ > requirement on the output of software, regardless of whether it is licensed
+ > under the terms of the GPL or some other license.
+ .
+ Therefore, removing this to make parallel GPL-compliant.
+
+Author: Didier Raboud <o...@debian.org>
+Bug-Debian: https://bugs.debian.org/905674
+
+Last-Update: 2018-12-01
+
+--- a/src/parallel
++++ b/src/parallel
+@@ -906,7 +906,6 @@
+ "gnu" => \$opt::gnu,
+ "link|xapply" => \$opt::link,
+ "linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource,
+- "bibtex|citation" => \$opt::citation,
+ "wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite,
+ # Termination and retries
+ "halt-on-error|halt=s" => \$opt::halt,
+@@ -1040,7 +1039,6 @@
+ print Limits::Command::real_max_length(),"\n"; wait_and_exit(0);
+ }
+ if(defined $opt::version) { version(); wait_and_exit(0); }
+- if(defined $opt::citation) { citation(); wait_and_exit(0); }
+ if(defined $opt::record_env) { record_env(); wait_and_exit(0); }
+ if(defined $opt::show_limits) { show_limits(); }
+ if(@opt::sshlogin) { @Global::sshlogin = @opt::sshlogin; }
+@@ -1181,7 +1179,6 @@
+ if(defined $opt::bar) {
+ $opt::progress = $opt::bar;
+ }
+- citation_notice();
+
+ parse_halt();
+ parse_sshlogin();
+@@ -3801,43 +3798,9 @@
+ " 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.",
+- "",
+ "",);
+ }
+
+-sub citation_notice {
+- # if --will-cite or --plain: do nothing
+- # if stderr redirected: do nothing
+- # if ~/.parallel/will-cite: do nothing
+- # else: print citation notice to stderr
+- if($opt::willcite
+- or
+- $opt::plain
+- or
+- not -t $Global::original_stderr
+- or
+- -e $ENV{'HOME'}."/.parallel/will-cite") {
+- # skip
+- } else {
+- ::status
+- ("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:",
+- "",
+- " 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.",
+- "",
+- "To silence this citation notice: run 'parallel --citation'.",
+- ""
+- );
+- }
+-}
+-
+ sub status {
+ my @w = @_;
+ my $fh = $Global::status_fd || *STDERR;
+@@ -3889,74 +3852,7 @@
+ "GNU $Global::progname comes with no warranty.",
+ "",
+ "Web site: http://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 {
+- # Returns: N/A
+- ::status(
+- "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 = {http://www.gnu.org/s/parallel},";,
+- " year = {2011},",
+- " pages = {42-47},",
+- " doi = {http://dx.doi.org/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\@gnu.org, it will be",
+- "mentioned in the release notes of next version of GNU Parallel.",
+- "",
+- ""
+ );
+- while(not -e $ENV{'HOME'}."/.parallel/will-cite") {
+- print "\nType: 'will cite' and press enter.\n> ";
+- my $input = <STDIN>;
+- if(not defined $input) {
+- exit(255);
+- }
+- if($input =~ /will cite/i) {
+- mkdir $ENV{'HOME'}."/.parallel";
+- if(open (my $fh, ">", $ENV{'HOME'}."/.parallel/will-cite")) {
+- close $fh;
+- ::status(
+- "",
+- "Thank you for your support. It is much appreciated. The citation",
+- "notice is now silenced.",
+- "");
+- } else {
+- ::status(
+- "",
+- "Thank you for your support. It is much appreciated. The citation",
+- "cannot permanently be silenced. Use '--will-cite' instead.",
+- "",
+- "If you use '--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 parallel is indirectly financed through citations, so if users",
+- "do not know they should cite then you are making it harder to finance",
+- "development. However, if you pay 10000 EUR, you should feel free to",
+- "use '--will-cite' in scripts.",
+- "");
+- last;
+- }
+- }
+- }
+ }
+
+ sub show_limits {
diff -Nru parallel-20161222/debian/patches/series parallel-20161222/debian/patches/series
--- parallel-20161222/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ parallel-20161222/debian/patches/series 2018-12-01 21:13:00.000000000 +0100
@@ -0,0 +1 @@
+remove-overreaching-citation-request.patch
signature.asc
Description: This is a digitally signed message part.
