diff options
author | Balint Reczey <balint@balintreczey.hu> | 2016-10-18 13:52:04 +0200 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2016-10-20 23:04:41 +0000 |
commit | 511e80128e15be8ce2bcdca912d599217fa8ebd6 (patch) | |
tree | 52baf58abce533f2489ce615a96be6ecd781f6a7 | |
parent | 3fb32662a861fffbdda802a0bb7fd359f2a837fd (diff) | |
download | wireshark-511e80128e15be8ce2bcdca912d599217fa8ebd6.tar.gz |
debian: Ship ciscodump and sshdump
Both binaries use libssh. Libssh can be linked to OpenSSL or to
Libgcrypt. Since the ciscodump and sshdump executables are
covered by GPL-2+ the Debian package build depends on the libssh
flavor built with libgcrypt.
Change-Id: If2dd85beb08e4b04f0c3aac46966fce67828b473
Reviewed-on: https://code.wireshark.org/review/18263
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | tools/debian-setup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 4155ac2849..0a5082ecc1 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: libgtk-3-dev, lsb-release, libgcrypt-dev, portaudio19-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev, libgeoip-dev, dpkg-dev (>= 1.16.1~), imagemagick, xdg-utils, libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoc, - cmake (>= 2.8.8), w3m, libsbc-dev, libnghttp2-dev + cmake (>= 2.8.8), w3m, libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev Build-Conflicts: libsnmp4.2-dev, libsnmp-dev Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/wireshark/trunk Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/trunk/ diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 96b57339e0..aeb03d1472 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -40,7 +40,7 @@ ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \ libc-ares-dev libssh-dev libkrb5-dev libqt5svg5-dev lynx libsmi2-dev \ portaudio19-dev asciidoc libgcrypt-dev libsbc-dev libgeoip-dev \ libgnutls-dev qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \ - libparse-yapp-perl qt5-default cmake libcap-dev" + libparse-yapp-perl qt5-default cmake libcap-dev libssh-gcrypt-dev" # Check for lsb_release command in $PATH if ! which lsb_release > /dev/null; then |