Source: graphviz
Version: 2.42.2-5
Severity: wishlist
Dear Maintainer,
Using sbuild and a set of changes (attached file) I was able to generate new
packages.
Here are some points addressed with remarks:
* Update watch file.
* Remove patches applied upstream:
- fix_out-of-bounds_write_on_invalid_label.patch
- update_documentation_link.patch
* Refresh patches:
- gvmap.sh_bashism.patch
see my report: https://gitlab.com/graphviz/graphviz/-/issues/2151
- build_with_libann.patch
- 50_remove_changelog_in
* Inactivated patch:
- fix-kfreebsd-chroots
Remark: still needed?
* Remove all manpages and related files, provided by upstream.
* Replace graphviz-doc.install by graphviz-doc.docs and graphviz-
doc.examples.
* Remove orphan mksvgfonts.pl.
Remark: it is no more hidden in the upstream and was not included in
any packages of the previous release.
* Add gvpr(3) manpage to libgvpr2.
* Add xdot(3) manpage to libxdot4.
* Add pack(3) manpage to libgraphviz-dev.
* Add upstream/metadata.
* Add not-installed.
Remark: its content may be adjusted.
* Simplify and update control to build and add:
- gvedit, gvpr and smyrna
Remark: new bins in graphviz.
- lasi, poppler, devil and gs plugins
Remark: new libs in libgvc6.
README.Debian-packaging and README.source are mostly similar.
And I haven't check the content to verify its relevance.
Bindings to Java, R, Go, and C# are also available in the upstream.
But they are not considered yet even if I was able to build them all
using the commented depends in d/control.
Don't know yet if the new binaries and plugins have to be added.
It may be useful in future to split headless binaries to the other, no?
Fill free to take what you want.
Regards,
Patrice
-- System Information:
Debian Release: bookworm/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1,
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.14.0-3-amd64 (SMP w/12 CPU threads)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nur graphviz.old/debian/control graphviz/debian/control
--- graphviz.old/debian/control 2020-04-26 07:25:24.000000000 +0200
+++ graphviz/debian/control 2021-11-01 11:34:30.114084895 +0100
@@ -2,51 +2,55 @@
Section: graphics
Priority: optional
Maintainer: Laszlo Boszormenyi (GCS) <[email protected]>
-Standards-Version: 4.5.0
-Build-Depends: tk-dev,
- tcl-dev,
- debhelper-compat (= 11),
+Standards-Version: 4.6.0
+Build-Depends: debhelper-compat (= 13),
dh-python,
- libfreetype6-dev,
- zlib1g-dev,
- libjpeg-dev,
- libpng-dev,
- libxaw7-dev,
+ libltdl-dev,
+ pkg-config,
+ tcl-dev,
bison,
flex,
libexpat1-dev,
- libfontconfig1-dev,
swig,
libperl-dev,
- libgd-dev (>= 2.0.33),
+ libgd-dev,
guile-3.0-dev,
- groff-base,
ghostscript,
- lua5.2,
- liblua5.2-dev,
- ruby,
- ruby-dev (>= 1:2.2),
+ libgs-dev,
+ libpoppler-glib-dev,
+ lua5.4,
+ liblua5.4-dev,
+ ruby-dev,
libargon2-dev,
libsodium-dev,
- libxml2-dev,
php-dev,
python3-dev,
libcairo2-dev,
- libpango1.0-dev,
- d-shlibs,
- chrpath,
- libgtk2.0-dev,
+ libgtkgl2.0-dev,
+ libgtkglext1-dev,
+ libglade2-dev,
libgts-dev,
libann-dev,
librsvg2-dev,
- libwebp-dev
-Build-Conflicts: tcl8.3, tcl8.4, tcl8.5
+ freeglut3-dev,
+ libwebp-dev,
+ libdevil-dev,
+ liblasi-dev,
+ qt5-qmake,
+ qtbase5-dev,
+# mono-devel,
+# golang,
+# default-jdk-headless,
+# r-base-dev,
+# ocaml-nox,
+ libcriterion-dev <!nocheck>
Homepage: https://www.graphviz.org/
+Rules-Requires-Root: no
Package: graphviz
Architecture: any
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, libgvc6 (>= 2.42.1), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: fonts-liberation
Suggests: gsfonts, graphviz-doc
Description: rich set of graph drawing tools
@@ -109,7 +113,7 @@
Architecture: any
Multi-Arch: same
Section: php
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}
+Depends: ${php7:Depends}, ${shlibs:Depends}, ${misc:Depends}
Description: PHP7 bindings for graphviz
Graphviz is a set of graph drawing tools. See the description of the graphviz
package for a full description.
@@ -119,7 +123,8 @@
Package: python3-gv
Architecture: any
Section: python
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
+Multi-Arch: same
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
Breaks: libgv-python (<< 2.40.1-0~)
Replaces: libgv-python (<< 2.40.1-0~)
Description: Python3 bindings for graphviz
@@ -139,7 +144,6 @@
.
This package contains the Ruby bindings.
-
Package: libgv-tcl
Architecture: any
Multi-Arch: same
diff -Nur graphviz.old/debian/diffimg.1 graphviz/debian/diffimg.1
--- graphviz.old/debian/diffimg.1 2014-12-10 16:25:41.000000000 +0100
+++ graphviz/debian/diffimg.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.TH DIFFIMG 1 "Jan 31, 2010"
-.SH NAME
-diffimg \- Calculates intersection between two images
-.SH SYNOPSIS
-.B diffimg
-.RI image1
-.RI image2
-.RI [ outimage ]
-.SH DESCRIPTION
-.PP
-\fBdiffimg\fP generates an image where each pixel is the difference between
the corresponding pixel
-in each of the two source images. Thus, if the source images are the same the
resulting image will
-be black, otherwise it will have regions of non-black where the images differ.
-.PP
-Currently supports: .png, .gif, .jpg, and .ps by using ghostscript
-.SH AUTHOR
-diffimg was written by John Ellson <[email protected]>
-.PP
-This manual page was written by David Claughton <[email protected]>,
-for the Debian project (but may be used by others).
diff -Nur graphviz.old/debian/graphviz-doc.docs
graphviz/debian/graphviz-doc.docs
--- graphviz.old/debian/graphviz-doc.docs 1970-01-01 01:00:00.000000000
+0100
+++ graphviz/debian/graphviz-doc.docs 2021-11-01 10:28:25.829757231 +0100
@@ -0,0 +1,9 @@
+usr/share/graphviz/doc/AUTHORS
+usr/share/graphviz/doc/NEWS
+usr/share/graphviz/doc/CHANGELOG.md
+usr/share/graphviz/doc/Dot.ref
+usr/share/graphviz/doc/latex_suggestions.txt
+usr/share/graphviz/doc/fontfaq.txt
+usr/share/graphviz/doc/addingLayout.txt
+usr/share/graphviz/doc/pdf
+usr/share/graphviz/doc/html
diff -Nur graphviz.old/debian/graphviz-doc.examples
graphviz/debian/graphviz-doc.examples
--- graphviz.old/debian/graphviz-doc.examples 1970-01-01 01:00:00.000000000
+0100
+++ graphviz/debian/graphviz-doc.examples 2021-11-01 10:28:05.189712439
+0100
@@ -0,0 +1,4 @@
+usr/share/graphviz/lefty
+usr/share/graphviz/graphs
+usr/share/graphviz/demo
+usr/share/graphviz/examples/*
diff -Nur graphviz.old/debian/graphviz-doc.install
graphviz/debian/graphviz-doc.install
--- graphviz.old/debian/graphviz-doc.install 2014-12-10 16:25:41.000000000
+0100
+++ graphviz/debian/graphviz-doc.install 1970-01-01 01:00:00.000000000
+0100
@@ -1,11 +0,0 @@
-usr/share/graphviz/lefty usr/share/doc/graphviz/examples
-usr/share/graphviz/graphs usr/share/doc/graphviz/examples
-usr/share/graphviz/demo usr/share/doc/graphviz/examples
-usr/share/graphviz/doc/pdf usr/share/doc/graphviz
-usr/share/graphviz/doc/html usr/share/doc/graphviz
-
-usr/share/graphviz/doc/AUTHORS usr/share/doc/graphviz
-usr/share/graphviz/doc/ChangeLog usr/share/doc/graphviz
-usr/share/graphviz/doc/Dot.ref usr/share/doc/graphviz
-usr/share/graphviz/doc/latex_suggestions.txt usr/share/doc/graphviz
-usr/share/graphviz/doc/fontfaq.txt usr/share/doc/graphviz
diff -Nur graphviz.old/debian/graphviz.install graphviz/debian/graphviz.install
--- graphviz.old/debian/graphviz.install 2014-12-10 16:25:41.000000000
+0100
+++ graphviz/debian/graphviz.install 2021-10-31 12:24:51.664749820 +0100
@@ -2,3 +2,6 @@
usr/share/man/man1
usr/share/man/man7
usr/share/graphviz/lefty
+usr/share/graphviz/gvedit
+usr/share/graphviz/gvpr
+usr/share/graphviz/smyrna
diff -Nur graphviz.old/debian/libgraphviz-dev.install
graphviz/debian/libgraphviz-dev.install
--- graphviz.old/debian/libgraphviz-dev.install 2018-02-25 15:26:18.000000000
+0100
+++ graphviz/debian/libgraphviz-dev.install 2021-11-01 10:48:02.954620815
+0100
@@ -8,3 +8,4 @@
usr/share/man/man3/cgraph.3
usr/share/man/man3/pathplan.3
usr/share/man/man3/gvc.3
+usr/share/man/man3/pack.3
diff -Nur graphviz.old/debian/libgvc6.install graphviz/debian/libgvc6.install
--- graphviz.old/debian/libgvc6.install 2019-10-09 18:24:32.000000000 +0200
+++ graphviz/debian/libgvc6.install 2021-10-31 12:42:43.367451752 +0100
@@ -7,6 +7,10 @@
usr/lib/*/graphviz/libgvplugin_xlib.so.*
usr/lib/*/graphviz/libgvplugin_dot_layout.so.*
usr/lib/*/graphviz/libgvplugin_visio.so.*
+usr/lib/*/graphviz/libgvplugin_lasi.so.*
+usr/lib/*/graphviz/libgvplugin_poppler.so.*
+usr/lib/*/graphviz/libgvplugin_devil.so.*
+usr/lib/*/graphviz/libgvplugin_gs.so.*
usr/lib/*/libgvc*.so.*
# Renamed afterwards to libgvcN-config-update in debian/rules
diff -Nur graphviz.old/debian/libgvpr2.install graphviz/debian/libgvpr2.install
--- graphviz.old/debian/libgvpr2.install 2018-02-25 15:26:18.000000000
+0100
+++ graphviz/debian/libgvpr2.install 2021-10-31 13:02:52.576250464 +0100
@@ -1 +1,2 @@
usr/lib/*/libgvpr*.so.*
+usr/share/man/man3/gvpr.3
diff -Nur graphviz.old/debian/libxdot4.install graphviz/debian/libxdot4.install
--- graphviz.old/debian/libxdot4.install 2018-02-25 15:26:18.000000000
+0100
+++ graphviz/debian/libxdot4.install 2021-10-31 13:01:34.200022350 +0100
@@ -1 +1,2 @@
usr/lib/*/libxdot*.so.*
+usr/share/man/man3/xdot.3
diff -Nur graphviz.old/debian/manpages graphviz/debian/manpages
--- graphviz.old/debian/manpages 2014-12-10 16:25:41.000000000 +0100
+++ graphviz/debian/manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/diffimg.1
-debian/vimdot.1
diff -Nur graphviz.old/debian/mksvgfonts.pl graphviz/debian/mksvgfonts.pl
--- graphviz.old/debian/mksvgfonts.pl 2014-12-10 16:25:41.000000000 +0100
+++ graphviz/debian/mksvgfonts.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-
-# translate a ghostscript config to a graphviz ps_font_equiv.h table
-use English;
-my %features = ();
-
-my %map = (
-"roman" => "serif",
-"sans-serif" => "sans-Serif",
-"typewriter" => "monospace"
-);
-
-# weight normal or bold
-# style normal or italic
-
-if ($#ARGV + 1 != 2) { die "usage: cf2psfe.pl fontmap.cfg ps_font_equiv.txt";}
-
-open(CONFIG,"< $ARGV[0]");
-while (<CONFIG>) {
- next if /^#/;
- if (/\[(.+)\]/) { $fontname = $1;}
- if (/features\s*=\s*(.+)/) { $features{$fontname} = $1;}
-}
-
-open(SOURCE,"< $ARGV[1]");
-while (<SOURCE>) {
- my ($fontfam, $weight, $style);
- m/"([^"]+)"/;
- $f = $features{$1};
- while (($key,$value) = each(%map)) {
- $fontfam = $value if ($f =~ /$key/);
- }
- $style = ($f =~ /italic/? q("italic") : 0);
- $weight= ($f =~ /bold/? q("bold") : 0);
- if ($fontfam eq "") {warn "don't know about $1\n"; $fontfam =
"fantasy";}
- $_ =~ s/},$/,\t\"$fontfam\",\t$weight,\t$style},/;
- print $_;
-}
diff -Nur graphviz.old/debian/not-installed graphviz/debian/not-installed
--- graphviz.old/debian/not-installed 1970-01-01 01:00:00.000000000 +0100
+++ graphviz/debian/not-installed 2021-11-01 12:21:05.176732184 +0100
@@ -0,0 +1,11 @@
+usr/share/graphviz/doc/COPYING
+usr/share/graphviz/doc/cpl1.0.txt
+#
+usr/lib/php/20190902/gv.so
+usr/lib/*/graphviz/ruby/gv.so
+usr/lib/*/perl5/5.32/gv.pm
+usr/lib/*/perl5/5.32/gv.so
+usr/*/lua/gv.so
+usr/*/tcl8.6/graphviz/*
+#
+usr/share/man/man3/expr.3
diff -Nur graphviz.old/debian/patches/50_remove_changelog_in
graphviz/debian/patches/50_remove_changelog_in
--- graphviz.old/debian/patches/50_remove_changelog_in 2019-09-01
13:07:19.000000000 +0200
+++ graphviz/debian/patches/50_remove_changelog_in 2021-10-30
17:48:44.732921256 +0200
@@ -1,24 +1,14 @@
Description: remove Debian references from upstream
Don't alter files under debian/ directory.
Author: Laszlo Boszormenyi (GCS) <[email protected]>
-Last-Update: 2019-09-01
+Author: Patrice Duroux <[email protected]>
+Last-Update: 2021-10-30
---
---- graphviz-2.42.1.orig/Makefile.am
-+++ graphviz-2.42.1/Makefile.am
-@@ -45,7 +45,7 @@ EXTRA_DIST = $(txt) $(html) graphviz.spe
- graphviz.7 Doxyfile.in Doxyfile awk \
- config/config_perl.pl config/config_python.py \
- config/config_ruby.rb config/config_tcl.tcl dot.demo plugin.demo \
-- macosx windows debian redhat graphviz.sln
-+ macosx windows redhat graphviz.sln
-
- .PHONY: rpm
- rpm: dist
---- graphviz-2.42.1.orig/configure.ac
-+++ graphviz-2.42.1/configure.ac
-@@ -2886,7 +2886,6 @@ AM_CONDITIONAL(HAVE_CRITERION, test "$us
+--- graphviz-2.49.3.orig/configure.ac 2021-10-23 02:02:14.000000000 +0200
++++ graphviz-2.49.3/configure.ac 2021-10-30 17:40:27.336587810 +0200
+@@ -2651,7 +2651,6 @@
# Generate Makefiles
# tests/regression_tests/vuln/Makefile was removed
AC_CONFIG_FILES(Makefile
@@ -26,3 +16,16 @@
doc/Makefile
doc/info/Makefile
doc/schema/Makefile
+
+--- graphviz-2.49.3.orig/Makefile.am 2021-10-23 02:02:14.000000000 +0200
++++ graphviz-2.49.3/Makefile.am 2021-10-30 17:40:12.756534446 +0200
+@@ -41,7 +41,7 @@
+ graphviz.7 Doxyfile.in Doxyfile awk \
+ config/config_perl.pl \
+ config/config_ruby.rb config/config_tcl.tcl dot.demo plugin.demo \
+- macosx windows debian redhat graphviz.sln
++ macosx windows redhat graphviz.sln
+
+ .PHONY: rpm
+ rpm: dist
+
diff -Nur graphviz.old/debian/patches/build_with_libann.patch
graphviz/debian/patches/build_with_libann.patch
--- graphviz.old/debian/patches/build_with_libann.patch 2019-09-01
13:07:19.000000000 +0200
+++ graphviz/debian/patches/build_with_libann.patch 2021-10-31
10:49:14.505052305 +0100
@@ -1,6 +1,6 @@
---- graphviz-2.42.1.orig/configure.ac
-+++ graphviz-2.42.1/configure.ac
-@@ -2255,15 +2255,15 @@ AC_ARG_WITH(ann,
+--- graphviz-2.49.3.orig/configure.ac 2021-10-23 02:02:14.000000000 +0200
++++ graphviz-2.49.3/configure.ac 2021-10-31 10:47:29.683423135 +0100
+@@ -2082,15 +2082,15 @@
if test "x$with_ann" != "xyes"; then
use_ann="No (disabled)"
else
@@ -19,6 +19,6 @@
+ else
+ use_ann="No (ANN library not available)"
+ fi
- # if test "$use_ann" != "Yes"; then
- # if test -f /usr/lib$LIBPOSTFIX/libANN.so; then
- # AC_DEFINE_UNQUOTED(HAVE_ANN,1,
+ fi
+ AM_CONDITIONAL(WITH_ANN, [test x"${use_ann%% *}" = "xYes"])
+
diff -Nur
graphviz.old/debian/patches/fix_out-of-bounds_write_on_invalid_label.patch
graphviz/debian/patches/fix_out-of-bounds_write_on_invalid_label.patch
--- graphviz.old/debian/patches/fix_out-of-bounds_write_on_invalid_label.patch
2021-05-08 11:09:33.000000000 +0200
+++ graphviz/debian/patches/fix_out-of-bounds_write_on_invalid_label.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-commit 784411ca3655c80da0f6025ab20634b2a6ff696b
-Author: Matthew Fernandez <[email protected]>
-Date: Sat Jul 25 19:31:01 2020 -0700
-
- fix: out-of-bounds write on invalid label
-
- When the label for a node cannot be parsed (due to it being malformed), it
falls
- back on the symbol name of the node itself. I.e. the default label the node
- would have had if it had no label attribute at all. However, this is
applied by
- dynamically altering the node's label to "\N", a shortcut for the symbol
name of
- the node. All of this is fine, however if the hand written label itself is
- shorter than the literal string "\N", not enough memory would have been
- allocated to write "\N" into the label text.
-
- Here we account for the possibility of error during label parsing, and
assume
- that the label text may need to be overwritten with "\N" after the fact.
Fixes
- issue #1700.
-
-diff --git a/lib/common/shapes.c b/lib/common/shapes.c
-index 0a0635fc3..9dca9ba6e 100644
---- a/lib/common/shapes.c
-+++ b/lib/common/shapes.c
-@@ -3546,9 +3546,10 @@ static void record_init(node_t * n)
- reclblp = ND_label(n)->text;
- len = strlen(reclblp);
- /* For some forgotten reason, an empty label is parsed into a space, so
-- * we need at least two bytes in textbuf.
-+ * we need at least two bytes in textbuf, as well as accounting for the
-+ * error path involving "\\N" below.
- */
-- len = MAX(len, 1);
-+ len = MAX(MAX(len, 1), (int)strlen("\\N"));
- textbuf = N_NEW(len + 1, char);
- if (!(info = parse_reclbl(n, flip, TRUE, textbuf))) {
- agerr(AGERR, "bad label format %s\n", ND_label(n)->text);
diff -Nur graphviz.old/debian/patches/gvmap.sh_bashism.patch
graphviz/debian/patches/gvmap.sh_bashism.patch
--- graphviz.old/debian/patches/gvmap.sh_bashism.patch 2016-06-10
12:20:16.000000000 +0200
+++ graphviz/debian/patches/gvmap.sh_bashism.patch 2021-10-31
11:25:13.639078633 +0100
@@ -1,43 +1,19 @@
Description: remove bashism from gvmap.sh
Author: Laszlo Boszormenyi (GCS) <[email protected]>
Bug-Debian: https://bugs.debian.org/772234
-Last-Update: 2016-06-10
+Last-Update: 2021-10-31
---
---- graphviz-2.38.0.orig/cmd/gvmap/gvmap.sh
-+++ graphviz-2.38.0/cmd/gvmap/gvmap.sh
-@@ -64,7 +64,7 @@ do
- exit 2
- ;;
- \? )
-- if [[ "$OPTARG" == '?' ]]
-+ if [ "$OPTARG" = '?' ]
- then
- getopts -a gvmap "$OPTSTR" x '-?'
- exit 0
-@@ -76,19 +76,19 @@ do
- done
- shift $((OPTIND-1))
-
--if [[ $# == 0 ]]
-+if [ $# -eq 0 ]
- then
-- if [[ -n $VERBOSE ]]
-+ if [ -n $VERBOSE ]
- then
- print -u 2 "$LAYOUT -Goverlap=prism $FLAGS1 | gvmap $FLAGS2 | neato -n2
$FLAGS3"
+--- graphviz-2.49.3.orig/cmd/gvmap/gvmap.sh 2021-10-23 02:02:14.000000000
+0200
++++ graphviz-2.49.3/cmd/gvmap/gvmap.sh 2021-10-31 11:23:18.456549369 +0100
+@@ -86,7 +86,7 @@
fi
$LAYOUT -Goverlap=prism $FLAGS1 | gvmap $FLAGS2 | neato -n2 $FLAGS3
else
- while (( $# > 0 ))
+ while $(( $# > 0 ))
do
-- if [[ -f $1 ]]
-+ if [ -f $1 ]
+ if [ -f "$1" ]
then
-- if [[ -n $VERBOSE ]]
-+ if [ -n $VERBOSE ]
- then
- print -u 2 "$LAYOUT -Goverlap=prism $FLAGS1 $1 | gvmap $FLAGS2 |
neato -n2 $FLAGS3"
- fi
+
diff -Nur graphviz.old/debian/patches/series graphviz/debian/patches/series
--- graphviz.old/debian/patches/series 2021-05-08 11:09:50.000000000 +0200
+++ graphviz/debian/patches/series 2021-11-01 12:27:58.161523968 +0100
@@ -1,11 +1,9 @@
0_bindings_documentation
50_remove_changelog_in
3_minor_fixes_to_dot_manpage
-fix-kfreebsd-chroots
+#fix-kfreebsd-chroots
kfreebsd-hang.patch
ruby-config.diff
versioned-plugin-config-file.diff
gvmap.sh_bashism.patch
build_with_libann.patch
-update_documentation_link.patch
-fix_out-of-bounds_write_on_invalid_label.patch
diff -Nur graphviz.old/debian/patches/update_documentation_link.patch
graphviz/debian/patches/update_documentation_link.patch
--- graphviz.old/debian/patches/update_documentation_link.patch 2019-10-06
00:04:01.000000000 +0200
+++ graphviz/debian/patches/update_documentation_link.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-Description: direct link to documentation
- It's not in CVS anymore.
-Author: Laszlo Boszormenyi (GCS) <[email protected]>
-Bug-Debian: https://bugs.debian.org/710377
-Last-Update: 2019-10-06
-
----
-
---- graphviz-2.42.2.orig/cmd/dot/osage.1
-+++ graphviz-2.42.2/cmd/dot/osage.1
-@@ -54,7 +54,7 @@ Traditionally, osage supports the follow
- that has a non\(hynull "href" attribute.),
- \fB\-Tcmapx\fP (client\(hyside imagemap for use in html and xhtml).
- Additional less common or more special\(hypurpose output formats
--can be found at http://www.graphviz.org/cvs/doc/info/output.html.)
-+can be found at http://www.graphviz.org/doc/info/output.html.)
- .P
- Alternative plugins providing support for a given output format
- can be found from the error message resulting from appending a ':' to the
format. e.g. \fB-Tpng:\fP
---- graphviz-2.42.2.orig/cmd/dot/patchwork.1
-+++ graphviz-2.42.2/cmd/dot/patchwork.1
-@@ -48,7 +48,7 @@ Traditionally, patchwork supports the fo
- that has a non\(hynull "href" attribute.),
- \fB\-Tcmapx\fP (client\(hyside imagemap for use in html and xhtml).
- Additional less common or more special\(hypurpose output formats
--can be found at http://www.graphviz.org/cvs/doc/info/output.html.)
-+can be found at http://www.graphviz.org/doc/info/output.html.)
- .P
- Alternative plugins providing support for a given output format
- can be found from the error message resulting from appending a ':' to the
format. e.g. \fB-Tpng:\fP
diff -Nur graphviz.old/debian/python-gv.install
graphviz/debian/python-gv.install
--- graphviz.old/debian/python-gv.install 2018-02-25 15:26:18.000000000
+0100
+++ graphviz/debian/python-gv.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/python2*
-usr/lib/*/graphviz/python2*
diff -Nur graphviz.old/debian/rules graphviz/debian/rules
--- graphviz.old/debian/rules 2019-10-09 18:24:32.000000000 +0200
+++ graphviz/debian/rules 2021-11-01 12:06:17.222948440 +0100
@@ -32,56 +32,60 @@
PHP_EXTENSION_DIR = $(shell php-config --extension-dir)
PHP_PACKAGE = $(CURDIR)/debian/libgv-php7
-override_dh_clean:
- dh_clean
- rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
- rm -f $(CURDIR)/tclpkg/gv/*.pdf $(CURDIR)/cmd/dot/*.pdf
- rm -f $(CURDIR)/configure $(CURDIR)/version.m4
- find $(CURDIR) -name Makefile.in -delete
+#override_dh_clean:
+# dh_clean
+# rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
+# rm -f $(CURDIR)/tclpkg/gv/*.pdf $(CURDIR)/cmd/dot/*.pdf
+# rm -f $(CURDIR)/configure $(CURDIR)/version.m4
+# find $(CURDIR) -name Makefile.in -delete
override_dh_autoreconf:
$(CURDIR)/autogen.sh NOCONFIG
dh_autoreconf
+#override_dh_auto_configure:
+# for f in ${AUTOGENERATED} ; do \
+# sed -e 's%@TRIPLET@%${DEB_HOST_MULTIARCH}%g' \
+# < debian/$$f.in \
+# > debian/$$f ; \
+# done
+# dh_auto_configure -- \
+# --disable-silent-rules \
+# --prefix=/usr \
+# --datadir=\$${prefix}/share \
+# --infodir=\$${prefix}/share/info \
+# --mandir=\$${prefix}/share/man \
+# --disable-static \
+# --without-included-ltdl \
+# --with-pangocairo \
+# --with-x \
+# --with-gdk-pixbuf \
+# --without-glut \
+# --with-gnomeui \
+# --with-gtk \
+# --without-poppler \
+# --with-gts \
+# --with-ipsepcola \
+# --without-qt \
+# --with-rsvg \
+# --with-ann \
+# --with-webp \
+# --disable-go \
+# --enable-guile \
+# --enable-lua \
+# --enable-php \
+# --enable-ruby \
+# --enable-tcl \
+# --disable-java \
+# --disable-ocaml \
+# --disable-r \
+# --disable-sharp \
+# --disable-python2 \
+# --enable-python3 \
+# $(CONFIGURE_LIBS) \
+# $(shell $(dpkg_buildflags) --export=configure)
override_dh_auto_configure:
- for f in ${AUTOGENERATED} ; do \
- sed -e 's%@TRIPLET@%${DEB_HOST_MULTIARCH}%g' \
- < debian/$$f.in \
- > debian/$$f ; \
- done
dh_auto_configure -- \
- --disable-silent-rules \
- --prefix=/usr \
- --datadir=\$${prefix}/share \
- --infodir=\$${prefix}/share/info \
- --mandir=\$${prefix}/share/man \
- --disable-static \
- --without-included-ltdl \
- --with-pangocairo \
- --with-x \
- --with-gdk-pixbuf \
- --without-glut \
- --with-gnomeui \
- --with-gtk \
- --without-poppler \
- --with-gts \
- --with-ipsepcola \
- --without-qt \
- --with-rsvg \
- --with-ann \
- --with-webp \
- --disable-go \
- --enable-guile \
- --enable-lua \
- --enable-php \
- --enable-ruby \
- --enable-tcl \
- --disable-java \
- --disable-ocaml \
- --disable-r \
- --disable-sharp \
- --disable-python2 \
- --enable-python3 \
$(CONFIGURE_LIBS) \
$(shell $(dpkg_buildflags) --export=configure)
@@ -94,25 +98,19 @@
# Duplicate library
# rm $(CURDIR)/debian/tmp/usr/lib/tcl*/graphviz/libgv_tcl.so
-override_dh_install-arch:
- dh_install --arch
- mv $(CURDIR)/debian/libgvc$(SO_GVC)/usr/sbin/dot \
-
$(CURDIR)/debian/libgvc$(SO_GVC)/usr/sbin/libgvc$(SO_GVC)-config-update
- # Symlink dot due to #868546 (debug packages conflict)
- rm $(CURDIR)/debian/graphviz/usr/bin/dot
- ln -s /usr/sbin/libgvc$(SO_GVC)-config-update \
- $(CURDIR)/debian/graphviz/usr/bin/dot
- # NFU
- rm -rf $(CURDIR)/debian/tmp/usr/lib64/
-
-override_dh_install-indep:
- dh_install --indep
- # Remove duplicate changelog
- rm -f $(CURDIR)/debian/graphviz-doc/usr/share/doc/graphviz/ChangeLog
+#override_dh_install-arch:
+# dh_install --arch
+# mv $(CURDIR)/debian/libgvc$(SO_GVC)/usr/sbin/dot \
+#
$(CURDIR)/debian/libgvc$(SO_GVC)/usr/sbin/libgvc$(SO_GVC)-config-update
+# # Symlink dot due to #868546 (debug packages conflict)
+# rm $(CURDIR)/debian/graphviz/usr/bin/dot
+# ln -s /usr/sbin/libgvc$(SO_GVC)-config-update \
+# $(CURDIR)/debian/graphviz/usr/bin/dot
+# # NFU
+# rm -rf $(CURDIR)/debian/tmp/usr/lib64/
%:
dh $@ --with python3
-.PHONY: override_dh_clean override_dh_autoreconf override_dh_auto_configure \
- override_dh_auto_test override_dh_auto_install \
- override_dh_install-arch override_dh_install-indep
+.PHONY: override_dh_autoreconf override_dh_auto_configure \
+ override_dh_auto_test override_dh_auto_install
diff -Nur graphviz.old/debian/upstream/metadata
graphviz/debian/upstream/metadata
--- graphviz.old/debian/upstream/metadata 1970-01-01 01:00:00.000000000
+0100
+++ graphviz/debian/upstream/metadata 2021-11-01 10:09:24.579082927 +0100
@@ -0,0 +1,5 @@
+Bug-Database: https://gitlab.com/graphviz/graphviz/-/issues
+Bug-Submit:
https://gitlab.com/graphviz/graphviz/-/issues/new?issue%5Bmilestone_id%5D=
+Changelog: https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md
+Repository: https://gitlab.com/graphviz/graphviz.git
+Repository-Browse: https://gitlab.com/graphviz/graphviz
diff -Nur graphviz.old/debian/vimdot.1 graphviz/debian/vimdot.1
--- graphviz.old/debian/vimdot.1 2014-12-10 16:25:41.000000000 +0100
+++ graphviz/debian/vimdot.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.TH VIMDOT 1 "Jan 31, 2010"
-.SH NAME
-vimdot \- Combined text editor and dot viewer
-.SH SYNOPSIS
-.B vimdot
-.RI [ file ]
-.SH DESCRIPTION
-.PP
-\fBvimdot\fP is a simple script which launches the gvim or vim editor along
with a GUI window showing the
-dot output of the edited file. The dot output window automatically refreshes
everytime the file is saved
-in the editor.
-.PP
-If no filename is given, vimdot will use 'noname.dot' and initialise it with
an example graph to get you
-started.
-.SH SEE ALSO
-.br
-vim(1), dot(1)
-.SH AUTHOR
-vimdot was written by John Ellson <[email protected]>
-.PP
-This manual page was written by David Claughton <[email protected]>,
-for the Debian project (but may be used by others).
diff -Nur graphviz.old/debian/watch graphviz/debian/watch
--- graphviz.old/debian/watch 2019-09-23 18:09:12.000000000 +0200
+++ graphviz/debian/watch 2021-10-30 15:49:03.676137798 +0200
@@ -1,2 +1,2 @@
version=4
-https://gitlab.com/graphviz/graphviz/-/tags
.*stable_release_(\d\S+)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+https://gitlab.com/graphviz/graphviz/-/tags
(?:.*/)@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
