[Pkg-privacy-commits] [flashproxy] 49/65: Build-Depends on docbook-xsl and disable net when using xsltproc - xsltproc was failing on pbuilder because of missing docbook-xsl, but succeeding on dev machine due to presence of internet; this patch makes it easier to reproduce any future issues.

Ximin Luo infinity0 at moszumanska.debian.org
Fri Aug 21 13:49:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit ec0313d616728fa97cb11146920a272b7157fec3
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Wed Aug 6 01:35:13 2014 +0100

    Build-Depends on docbook-xsl and disable net when using xsltproc
    - xsltproc was failing on pbuilder because of missing docbook-xsl, but
      succeeding on dev machine due to presence of internet; this patch makes it
      easier to reproduce any future issues.
---
 debian/control                            |  1 +
 debian/patches/disable-xsltproc-net.patch | 20 ++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/control b/debian/control
index f1e3a3a..7abe500 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Section: net
 Priority: extra
 Build-Depends: debhelper (>= 9),
  asciidoc,
+ docbook-xsl,
  dh-autoreconf,
  dh-python,
  help2man,
diff --git a/debian/patches/disable-xsltproc-net.patch b/debian/patches/disable-xsltproc-net.patch
new file mode 100644
index 0000000..611675f
--- /dev/null
+++ b/debian/patches/disable-xsltproc-net.patch
@@ -0,0 +1,20 @@
+Description: Disable net when using xsltproc
+ xsltproc was failing on pbuilder because of missing docbook-xsl, but
+ succeeding on dev machine due to presence of internet; this patch makes it
+ easier to reproduce any future issues.
+Author: Ximin Luo <infinity0 at pwned.gg>
+Origin: vendor
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile.client
++++ b/Makefile.client
+@@ -56,7 +56,7 @@
+ 	@echo "warning: $@ *may* be out-of-date; if so then rm and re-checkout from VCS or force a re-build with REBUILD_MAN=1"
+ else
+ 	rm -f $@
+-	a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 24" -d manpage -f manpage $<
++	a2x --no-xmllint --xsltproc-opts "--nonet --stringparam man.th.title.max.length 24" -d manpage -f manpage $<
+ endif
+ 
+ install: all
diff --git a/debian/patches/series b/debian/patches/series
index cb6f223..67012f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ rm-prebuilt-manpages.patch
 nodejs-shebang.patch
 disable-flaky-test.patch
 generate-key-in-initscript.patch
+disable-xsltproc-net.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git



More information about the Pkg-privacy-commits mailing list