aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2013-01-14 21:39:10 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2013-01-14 21:39:10 +0000
commit21f9ab573dc775eafd64e8408cc647bf1cb7eedb (patch)
treedb90f11496e081ea31e40012db260f1ca4d78db0 /debian
parentaafa77c6f4bab4d2ca32e52c5ad577b4d023d0b0 (diff)
Add missing files to package.
Allow more recent automake. svn path=/trunk/; revision=47082
Diffstat (limited to 'debian')
-rw-r--r--debian/control2
-rw-r--r--debian/wireshark-common.files5
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index b4cbb14970..3df4b9f98f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ X-Orig-Maintainer: Frederic Peters <fpeters@debian.org>
X-Orig-Uploaders: Joost Yervante Damad <andete@debian.org>
Standards-Version: 3.8.1.0
Homepage: http://www.wireshark.org
-Build-Depends: libgtk2.0-dev (>=2.12.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 6), libtool, python, automake1.9, autoconf, autotools-dev, libc-ares-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), portaudio19-dev, libkrb5-dev, liblua5.1-0-dev, libsmi2-dev, libgeoip-dev
+Build-Depends: libgtk2.0-dev (>=2.12.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 6), libtool, python, automake1.9 | automake1.10 | automake, autoconf, autotools-dev, libc-ares-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), portaudio19-dev, libkrb5-dev, liblua5.1-0-dev, libsmi2-dev, libgeoip-dev
Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
XS-Python-Version: all
diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files
index 50cf1e6e0d..ead5f8edbe 100644
--- a/debian/wireshark-common.files
+++ b/debian/wireshark-common.files
@@ -1,9 +1,12 @@
+/usr/bin/dftest
/usr/bin/dumpcap
/usr/bin/capinfos
/usr/bin/editcap
/usr/bin/mergecap
-/usr/bin/text2pcap
+/usr/bin/randpkt
/usr/bin/rawshark
+/usr/bin/reordercap
+/usr/bin/text2pcap
/usr/lib/wireshark/libwireshark.so.0
/usr/lib/wireshark/libwireshark.so.0.0.0
/usr/lib/wireshark/libwiretap.so.0