summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2014-06-06 22:54:50 +0700
committerBalint Reczey <balint@balintreczey.hu>2014-06-08 15:33:29 +0000
commitcb4ec166d83afac0077b5a2e45bc07f7815458dd (patch)
treedd613a744f94acc669ea36518f4b05d7492c0aaf /debian
parent6d783f228c9148b04c2da097727931237c742bd4 (diff)
downloadwireshark-cb4ec166d83afac0077b5a2e45bc07f7815458dd.tar.gz
.deb package format is 'native'
Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf Reviewed-on: https://code.wireshark.org/review/2001 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/control2
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/source/format2
-rw-r--r--debian/watch2
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