diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2014-06-11 16:52:56 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2014-06-15 16:33:08 +0000 |
| commit | 14903d65c340b89a8b5fbbe80f8d40fd8a290719 (patch) | |
| tree | 2d55e49055a4fc18954c49903f6f29ea27537d42 /debian | |
| parent | 3081fe05b1d283db824e8210e40a1318f7af65d3 (diff) | |
Depend on docbook-xml and drop obsoleted 0005-...patch
Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c
Reviewed-on: https://code.wireshark.org/review/2137
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/0005-Disable-xmllint-for-release-notes.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 42 deletions
diff --git a/debian/control b/debian/control index 9efd0db491..009bdbf1bc 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: libgtk-3-dev, qt4-qmake, libqt4-dev, libpcap0.8-dev, flex, libz-dev, debhelper (>= 9), po-debconf, libtool, python (>= 2.6.6-3~), python-ply, libc-ares-dev, xsltproc, - docbook-xsl (>= 1.64.1.0-0), libxml2-utils, libpcre3-dev, + docbook-xsl (>= 1.64.1.0-0), docbook-xml, libxml2-utils, libpcre3-dev, libcap2-dev [linux-any] | libcap-dev (>= 2.17) [linux-any], bison, quilt, # enable versioned libgnutls28-dev below to have GPLv2+ compatible GMP diff --git a/debian/patches/0005-Disable-xmllint-for-release-notes.patch b/debian/patches/0005-Disable-xmllint-for-release-notes.patch deleted file mode 100644 index df874aab67..0000000000 --- a/debian/patches/0005-Disable-xmllint-for-release-notes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a687b01c0796f9b8a883626a654f31a45a3137ab Mon Sep 17 00:00:00 2001 -From: Balint Reczey <balint@balintreczey.hu> -Date: Thu, 29 May 2014 23:22:12 +0700 -Subject: [PATCH] Disable xmllint for release-notes - -Change-Id: I1148341710f064e1d92e2b0eb60708c4af528f1b ---- - cmake/modules/FindASCIIDOC.cmake | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake -index f414c54..175f2dd 100644 ---- a/cmake/modules/FindASCIIDOC.cmake -+++ b/cmake/modules/FindASCIIDOC.cmake -@@ -38,6 +38,7 @@ MACRO( ASCIIDOC2HTML _output _asciidocsource _conffile ) - --destination-dir=${CMAKE_CURRENT_BINARY_DIR} - --asciidoc-opts="--conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conffile}" - --fop -+ --no-xmllint - ${A2X_HTML_OPTS} - ${_asciidocsource} - # Replacing file with itself will fail -@@ -66,6 +67,7 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conffile ) - --destination-dir=${CMAKE_CURRENT_BINARY_DIR} - --asciidoc-opts="--conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conffile}" - --fop -+ --no-xmllint - ${A2X_TEXT_OPTS} - --xsltproc-opts '--stringparam generate.toc "article nop"' - ${_asciidocsource} -@@ -93,6 +95,7 @@ MACRO( ASCIIDOC2PDF _output _asciidocsource _conffile _paper ) - --destination-dir=${CMAKE_CURRENT_BINARY_DIR} - --asciidoc-opts="--conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conffile}" - --fop -+ --no-xmllint - ${A2X_HTML_OPTS} - --xsltproc-opts "--stringparam paper.type ${_paper} --nonet" - --xsl-file=custom_layer_pdf.xsl --- -1.9.1 diff --git a/debian/patches/series b/debian/patches/series index 5a7314e2a9..b6e36631c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -0005-Disable-xmllint-for-release-notes.patch 01_Disable-building-documentation-in-PDF-and-release-no.patch 04_asn2wrs_ply.patch 05_note-README-when-running-as-root.patch |