[med-svn] [Git][med-team/parallel][master] 2 commits: Update patches

Sat Nov 26 17:07:36 GMT 2022


Andreas Tille pushed to branch master at Debian Med / parallel


Commits:
6104d99c by Andreas Tille at 2022-11-26T18:01:21+01:00
Update patches

- - - - -
6d3521e8 by Andreas Tille at 2022-11-26T18:04:18+01:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/remove-overreaching-citation-request.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,10 @@
-parallel (20221122+ds-1) UNRELEASED; urgency=medium
+parallel (20221122+ds-1) unstable; urgency=medium
 
   * New upstream version
   * Build-Depends: s/libreoffice-writer/libreoffice-writer-nogui/
     Closes: #1024841
 
- -- Andreas Tille <tille at debian.org>  Sat, 26 Nov 2022 17:53:22 +0100
+ -- Andreas Tille <tille at debian.org>  Sat, 26 Nov 2022 18:01:37 +0100
 
 parallel (20220722+ds-1) unstable; urgency=medium
 


=====================================
debian/patches/remove-overreaching-citation-request.patch
=====================================
@@ -97,7 +97,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
      fi
 --- a/src/parallel
 +++ b/src/parallel
-@@ -1932,11 +1932,11 @@ sub options_completion_hash() {
+@@ -1957,11 +1957,11 @@ sub options_completion_hash() {
  	 # 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.
@@ -114,7 +114,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  	 "will-cite|willcite|nn|nonotice|no-notice" => \$opt::willcite,
  	 # Termination and retries
  	 ('halt-on-error|haltonerror|halt=s'.
-@@ -2171,10 +2171,10 @@ sub parse_options(@) {
+@@ -2196,10 +2196,10 @@ sub parse_options(@) {
      # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
      # You accept to be added to a public hall of shame by
      # removing the lines.
@@ -129,16 +129,16 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
      # no-* overrides *
      if($opt::nokeeporder) { $opt::keeporder = undef; }
  
-@@ -2532,7 +2532,7 @@ sub parse_options(@) {
+@@ -2575,7 +2575,7 @@ sub parse_options(@) {
      #
      # If you want GNU Parallel to be maintained in the future you
      # should keep this line.
 -    citation_notice();
 +#    citation_notice();
-     # _YOU_ will be harming free software by removing the notice. You
+     # *YOU* will be harming free software by removing the notice.  You
      # accept to be added to a public hall of shame by removing the
      # line.  This is because _YOU_ actively make it harder to justify
-@@ -5543,9 +5543,9 @@ sub usage() {
+@@ -5623,9 +5623,9 @@ sub usage() {
  	 # 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.
@@ -151,7 +151,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  	 "",);
  }
  
-@@ -5676,7 +5676,7 @@ sub version() {
+@@ -5756,7 +5756,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",
@@ -162,7 +162,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  
 --- a/src/parallel.pod
 +++ b/src/parallel.pod
-@@ -639,31 +639,31 @@ See also: B<--fg> B<man sem>
+@@ -641,31 +641,31 @@ See also: B<--fg> B<man sem>
  
  # You accept to be added to a public hall of shame by
  # removing this section.
@@ -219,7 +219,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  
  =item B<--block> I<size>
  
-@@ -6174,9 +6174,6 @@ When using GNU B<parallel> for a publica
+@@ -4377,9 +4377,6 @@ When using GNU B<parallel> for a publica
  O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login:
  The USENIX Magazine, February 2011:42-47.
  
@@ -243,7 +243,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk
 --- a/src/parallel_design.pod
 +++ b/src/parallel_design.pod
-@@ -1402,18 +1402,6 @@ and if it works, you should post it on t
+@@ -1413,18 +1413,6 @@ and if it works, you should post it on t
  cost work and which have not been tested are, however, unlikely to be
  prioritized.
  
@@ -343,20 +343,9 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk
  
  Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk
---- a/src/parsort
-+++ b/src/parsort
-@@ -415,7 +415,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",
-         );
- }
- 
 --- a/src/sem
 +++ b/src/sem
-@@ -1932,11 +1932,11 @@ sub options_completion_hash() {
+@@ -1957,11 +1957,11 @@ sub options_completion_hash() {
  	 # 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.
@@ -373,7 +362,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  	 "will-cite|willcite|nn|nonotice|no-notice" => \$opt::willcite,
  	 # Termination and retries
  	 ('halt-on-error|haltonerror|halt=s'.
-@@ -2171,10 +2171,10 @@ sub parse_options(@) {
+@@ -2196,10 +2196,10 @@ sub parse_options(@) {
      # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
      # You accept to be added to a public hall of shame by
      # removing the lines.
@@ -388,16 +377,16 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
      # no-* overrides *
      if($opt::nokeeporder) { $opt::keeporder = undef; }
  
-@@ -2532,7 +2532,7 @@ sub parse_options(@) {
+@@ -2575,7 +2575,7 @@ sub parse_options(@) {
      #
      # If you want GNU Parallel to be maintained in the future you
      # should keep this line.
 -    citation_notice();
 +#    citation_notice();
-     # _YOU_ will be harming free software by removing the notice. You
+     # *YOU* will be harming free software by removing the notice.  You
      # accept to be added to a public hall of shame by removing the
      # line.  This is because _YOU_ actively make it harder to justify
-@@ -5543,8 +5543,8 @@ sub usage() {
+@@ -5623,8 +5623,8 @@ sub usage() {
  	 # 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.
@@ -408,7 +397,7 @@ Last-Update:  Andreas Tille  Wed, 27 Jul 2022 09:27:03 +0200
  	 "",
  	 "",);
  }
-@@ -5676,7 +5676,7 @@ sub version() {
+@@ -5756,7 +5756,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",



View it on GitLab: https://salsa.debian.org/med-team/parallel/-/compare/942b662ea3ab6ede3c13b1742498b29338fa1b8b...6d3521e8b02cf0df6a756472f0c86c831d7d2765

-- 
View it on GitLab: https://salsa.debian.org/med-team/parallel/-/compare/942b662ea3ab6ede3c13b1742498b29338fa1b8b...6d3521e8b02cf0df6a756472f0c86c831d7d2765
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221126/ebdda62c/attachment-0001.htm>
