[med-svn] [Git][med-team/parallel][master] 2 commits: d/control: build-dep on graphviz for neato

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / parallel


Commits:
f7ec8f7a by Michael R. Crusoe at 2024-03-21T18:34:05+01:00
d/control: build-dep on graphviz for neato

- - - - -
a0ff8253 by Michael R. Crusoe at 2024-03-21T18:42:36+01:00
d/pod2rst-fix: copy from upstream, it is missing from the distribution archive. Fixes empty .rst docs.

- - - - -


5 changed files:

- debian/changelog
- + debian/clean
- debian/control
- + debian/pod2rst-fix
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+parallel (20240222+ds-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * d/control: build-dep on graphviz for neato.
+  * d/pod2rst-fix: copy from upstream, it is missing from the
+    distribution archive. Fixes empty .rst docs.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Thu, 21 Mar 2024 18:33:22 +0100
+
 parallel (20240222+ds-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+src/pod2rst-fix


=====================================
debian/control
=====================================
@@ -12,7 +12,8 @@ Build-Depends:
  libpod-pom-view-restructured-perl,
  texinfo,
  libreoffice-writer-nogui,
- libreoffice-core
+ libreoffice-core,
+ graphviz
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://www.gnu.org/software/parallel/


=====================================
debian/pod2rst-fix
=====================================
@@ -0,0 +1,113 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free
+# Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses/>
+# or write to the Free Software Foundation, Inc., 51 Franklin St,
+# Fifth Floor, Boston, MA 02110-1301 USA
+#
+# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc.
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This fixes problems in pod2rst conversion
+
+# Conversion errors:
+
+# B<foo `bar` baz>
+
+# Fixed:
+# ... B<foo>
+# bar
+
+# Fixed:
+# =item - - a
+
+# Fixed:
+# \\` => \`
+
+# Not fixed (RST does not support Bold-Italic):
+# B<cat | xargs -d "\n" -n1 I<command>>
+
+sub pipefunc {
+    # Emulate a shell pipe but between Perl functions
+    # stdin | func1 | func2 | ... | funcN
+    # pipefunc(*func1, *func2, ..., *funcN);
+    my $func = pop;
+
+    my $pid = open(my $kid_to_read, "-|");
+    defined($pid) || die "can't fork: $!";
+    if ($pid) {
+	open STDIN, "<&", $kid_to_read or die;
+	&$func();
+    } else { # child
+	close $kid_to_read;
+	if($_[1]) {
+	    # More than one function remaining: Recurse
+	    pipefunc(@_);
+	} else {
+	    # Only one function remaining: Run it
+	    $func = pop;
+	    &$func();
+	}
+	exit 0;
+    }
+}
+
+sub pre1 {
+    while(<STDIN>) {
+	# Remove comments
+	/^\#/ and next;
+	# quote -
+	s/^=item -/=item \001/;
+
+	if(/^ /) {
+	    # ignore source blocks
+	} else {
+	    # \\ => \
+	    s/\\/\\\\/g;
+	}
+	print;
+    }
+}
+
+sub pre2 {
+    $/="\n\n";
+    while(<STDIN>) {
+	# join lines in each paragraph
+	s/(\S)\n(\S)/$1 $2/g;
+	print;
+    }
+}
+
+sub pod2rst {
+    exec "pod2rst";
+}
+
+sub post {
+    while(<STDIN>) {
+	# =item in =item
+	s/- \\[*]/- /;
+	# B<*.log>
+	s/\\\\[*]/\\*/g;
+	# - -
+	s/^-(\s+)\001/-$1\\-/g;
+	# \\` => \`
+	s/\\\\`/\\`/g;
+	print;
+    }
+}
+
+# stdin | pre1() | pre2() | pod2rst() | post()
+pipefunc(*pre1,*pre2,*pod2rst,*post);


=====================================
debian/rules
=====================================
@@ -7,6 +7,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	echo "Upstream does not provide test suite"
 endif
 
+execute_before_dh_auto_configure:
+	cp debian/pod2rst-fix src/
+
 override_dh_install:
 	dh_install
 	for pl in `grep -Rl '#!/usr/bin/env[[:space:]]\+perl' debian/*/usr/*` ; do \



View it on GitLab: https://salsa.debian.org/med-team/parallel/-/compare/1e5c1b0a666b76a701e38e01ccd2b6d937ed1de3...a0ff8253a8f82be36ac89f7a9968599c1cce5584

-- 
View it on GitLab: https://salsa.debian.org/med-team/parallel/-/compare/1e5c1b0a666b76a701e38e01ccd2b6d937ed1de3...a0ff8253a8f82be36ac89f7a9968599c1cce5584
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/20240322/8d53c43f/attachment-0001.htm>