diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2015-10-05 02:58:00 +0200 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-05 23:17:33 +0000 |
| commit | edc3d361f89170583d43f216970ff44d2ed6a518 (patch) | |
| tree | 81b215a91334ffbfb8bca659fb61d2d01b9443f8 /debian | |
| parent | 970b53780de392ca3651e546cea524a6e2197a5f (diff) | |
| download | wireshark-edc3d361f89170583d43f216970ff44d2ed6a518.tar.gz | |
debian: Build .debs with Qt 5
Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7
Reviewed-on: https://code.wireshark.org/review/10800
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
(cherry picked from commit fd603f6f99c3ad3527616a1491804953a2a591c0)
Reviewed-on: https://code.wireshark.org/review/10817
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 2efc4c4c2f..e853edfb54 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Balint Reczey <balint@balintreczey.hu> Standards-Version: 3.9.5 Build-Depends: libgtk-3-dev, hardening-includes, # enable Qt 5 related depandencies for Qt 5-enabled build -# qtbase5-dev, qtbase5-dev-tools, qttools5-dev, qttools5-dev-tools, + qtbase5-dev, qtbase5-dev-tools, qttools5-dev, qttools5-dev-tools, # enable Qt 4 related dependencies for Qt 4-enabled build - qt4-qmake, libqt4-dev, +# qt4-qmake, libqt4-dev, libpcap0.8-dev, flex, libz-dev, debhelper (>= 9), po-debconf, libtool, python (>= 2.6.6-3~), python-ply, libc-ares-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), docbook-xml, libxml2-utils, libpcre3-dev, diff --git a/debian/rules b/debian/rules index c2cabc15cc..596a738aa5 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ export docdir = /usr/share/doc/wireshark-doc override_dh_auto_configure: dh_auto_configure -- -DENABLE_HTML_GUIDES=ON -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ - -DENABLE_QT5=OFF +# -DENABLE_QT5=OFF override_dh_auto_build: dh_auto_build |