diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2014-06-05 17:30:41 +0700 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2014-06-08 15:32:10 +0000 |
| commit | 97e1491aa8f418a7f5bd7fdd92561d2403c187f6 (patch) | |
| tree | eadecb1b66ac3900a7e5db76eb2b993693ba0b9f /debian/patches/0005-Disable-xmllint-for-release-notes.patch | |
| parent | 9b4991098f42bfe10da9ce34c4c7711fbcf87ca7 (diff) | |
Sync .deb packaging from Debian
The sync makes CMake the build system for the .deb package
and starts providing wireshark-qt in the wireshark-qt package.
The package structure, i.e. the libraries are shipped in separate
packages is also sync-ed.
Wireshark-qt uses the Qt 4 libraries, but it is easy to switch
it to Qt 5.
Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2
Reviewed-on: https://code.wireshark.org/review/1986
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'debian/patches/0005-Disable-xmllint-for-release-notes.patch')
| -rw-r--r-- | debian/patches/0005-Disable-xmllint-for-release-notes.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/0005-Disable-xmllint-for-release-notes.patch b/debian/patches/0005-Disable-xmllint-for-release-notes.patch new file mode 100644 index 0000000000..df874aab67 --- /dev/null +++ b/debian/patches/0005-Disable-xmllint-for-release-notes.patch @@ -0,0 +1,40 @@ +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 |