diff options
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | debian/source/format | 2 | ||||
-rw-r--r-- | debian/watch | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 94d53ef6ec..9efd0db491 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: libgtk-3-dev, python (>= 2.6.6-3~), python-ply, libc-ares-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libxml2-utils, libpcre3-dev, libcap2-dev [linux-any] | libcap-dev (>= 2.17) [linux-any], - bison, + bison, quilt, # enable versioned libgnutls28-dev below to have GPLv2+ compatible GMP # libgnutls28-dev (>= 3.2.14-1~), # enable backports-compatible libgnutls-dev diff --git a/debian/rules b/debian/rules index 77c8e774e2..8a7d9fd2cd 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-.*/\1/p') export docdir = /usr/share/doc/wireshark-doc %: - dh $@ --with python2 --buildsystem cmake # --parallel + dh $@ --with python2 --buildsystem cmake --with quilt # --parallel override_dh_auto_configure: dh_auto_configure -- -DENABLE_GUIDES=ON -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ diff --git a/debian/source/format b/debian/source/format index 163aaf8d82..89ae9db8f8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 150695d866..0000000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://www.wireshark.org/download/src/all-versions/wireshark-([0-9]+\.[0-9]*[24680]\.[0-9]+)\.tar\.bz2 |