Source: gnutls28
Version: 3.7.2-4
Tags: patch
Building the HTML api-reference docs seems to have been broken for
quite a while due to XML shenanigans. The first of the attached
patches makes it work again, but fixing makeinfo to emit DocBook that
is actually valid XML would be better.
The second patch polishes d/rules a bit.
The patches apply cleanly to 3.7.2-4, but I only ran the build with
3.7.1-5.
Regards.
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"https://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
[
- <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'https://www.w3.org/2003/XInclude'">
+ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
<!ENTITY version SYSTEM "version.xml">
]>
<book id="index">
--- a/lib/cert-cred.c
+++ b/lib/cert-cred.c
@@ -905,7 +905,7 @@
* chain is incomplete due a missing intermediate certificate. The callback
* may provide the missing certificate for use during verification.
*
- * The callback's function prototype is defined in <gnutls/x509.h> as:
+ * The callback's function prototype is defined in gnutls/x509.h as:
*
* int (*callback)(gnutls_x509_trust_list_t list,
* const gnutls_x509_crt_t cert,
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@
$(AMCONFBUILDINDEP)
override_dh_autoreconf:
- rm -v `grep -rl gettext-0.20 m4/`
+ -rm -v `grep -rl gettext-0.20 m4/`
if ! dh_listpackages | grep -q gnutls-doc ; \
then env GTKDOCIZE="echo DISABLED running gtkdocize" \
dh_autoreconf --verbose $(BDIR) ; \
@@ -78,7 +78,7 @@
# restore gnutls.pdf
if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; \
then mv -v doc/gnutls.pdf.debbackup doc/gnutls.pdf ; fi
- rm -fv \
+ -rm -fv \
`grep -El 'has been AutoGen-ed |has been AutoGen-ed *$$' doc/manpages/*.?`
override_dh_auto_build:
@@ -93,9 +93,9 @@
override_dh_auto_install:
dh_auto_install $(BDIR) --verbose
ifneq ($(filter --disable-doc,$(AMCONFBUILDINDEP)),)
- $(MAKE) -C b4deb/doc/manpages DESTDIR=`pwd`/debian/tmp install
+ $(MAKE) -C b4deb/doc/manpages DESTDIR=$(CURDIR)/debian/tmp install
else
- $(MAKE) -C b4deb/doc/ DESTDIR=`pwd`/debian/tmp install-html
+ $(MAKE) -C b4deb/doc/ DESTDIR=$(CURDIR)/debian/tmp install-html
# we symlink these
rm -vf debian/tmp/usr/share/info/*.png
endif
@@ -126,7 +126,7 @@
# Fails with "dwz: Section overlap detected"
override_dh_dwz:
- dh_dwz -O--builddirectory=b4deb -Xextra.go -Xgnutls.go
+ dh_dwz $(BDIR) -Xextra.go -Xgnutls.go
%:
- dh $@ --builddirectory=b4deb
+ dh $@ $(BDIR)
