diff options
author | Roland Knall <rknall@gmail.com> | 2018-04-14 08:15:01 +0200 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2018-04-15 05:45:32 +0000 |
commit | 9c5049a80b635d5d12829a4c51db9696dadaee00 (patch) | |
tree | bc96aadd93f726d01c65277bd3f8e91d7b382fc7 /debian | |
parent | f5330163396c85e080ffff1348df8e12c78f2411 (diff) |
Gtk: Remove source code
Removing all gtk source code, except for main.? which will remain
for the official removal during SFUS18
Change-Id: I4273baf207df1eaaa4b94623cfd10bf74b1fc4a4
Reviewed-on: https://code.wireshark.org/review/26937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/control | 8 | ||||
-rw-r--r-- | debian/patches/16_licence_about_location.patch | 13 | ||||
-rw-r--r-- | debian/wireshark-gtk.docs | 1 | ||||
-rw-r--r-- | debian/wireshark-gtk.install | 2 | ||||
-rw-r--r-- | debian/wireshark-gtk.lintian-overrides | 2 |
5 files changed, 3 insertions, 23 deletions
diff --git a/debian/control b/debian/control index c93ef2404f..0ca79538ac 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,9 @@ Section: net Priority: optional Maintainer: Balint Reczey <balint@balintreczey.hu> Standards-Version: 3.9.7 -Build-Depends: libgtk-3-dev, lsb-release, -# enable Qt 5 related dependencies for Qt 5-enabled build +Build-Depends: lsb-release, qtbase5-dev, qtbase5-dev-tools, qttools5-dev, qttools5-dev-tools, qtmultimedia5-dev, libqt5svg5-dev, -# enable Qt 4 related dependencies for Qt 4-enabled build -# 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, @@ -44,8 +41,7 @@ Description: network traffic analyzer - common files packets off the wire. Wireshark can decode too many protocols to list here. . - This package provides files common to both wireshark (the GTK+ version) - and tshark (the console version). + This package provides files common to both wireshark and tshark (the console version). Package: wireshark Architecture: any diff --git a/debian/patches/16_licence_about_location.patch b/debian/patches/16_licence_about_location.patch index fb44ba890a..c40e89af59 100644 --- a/debian/patches/16_licence_about_location.patch +++ b/debian/patches/16_licence_about_location.patch @@ -2,17 +2,6 @@ Description: Change location of license file in about dialog Forwarded: not-needed Author: Frederic Peters <fpeters@debian.org> ---- a/ui/gtk/about_dlg.c -+++ b/ui/gtk/about_dlg.c -@@ -522,7 +522,7 @@ - #if defined(_WIN32) - absolute_path = get_datafile_path("COPYING.txt"); - #else -- absolute_path = get_datafile_path("COPYING"); -+ absolute_path = get_datafile_path("ABOUT.GPL"); - #endif - page = text_page_new(absolute_path); - --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -335,7 +335,7 @@ @@ -22,5 +11,5 @@ Author: Frederic Peters <fpeters@debian.org> - f_license.setFileName(get_datafile_path("COPYING")); + f_license.setFileName(get_datafile_path("ABOUT.GPL")); #endif - + f_license.open(QFile::ReadOnly | QFile::Text); diff --git a/debian/wireshark-gtk.docs b/debian/wireshark-gtk.docs deleted file mode 100644 index e174728f54..0000000000 --- a/debian/wireshark-gtk.docs +++ /dev/null @@ -1 +0,0 @@ -debian/README.Debian diff --git a/debian/wireshark-gtk.install b/debian/wireshark-gtk.install deleted file mode 100644 index c109852f63..0000000000 --- a/debian/wireshark-gtk.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/wireshark-gtk -usr/share/applications/wireshark-gtk.desktop diff --git a/debian/wireshark-gtk.lintian-overrides b/debian/wireshark-gtk.lintian-overrides deleted file mode 100644 index 1b412d3f52..0000000000 --- a/debian/wireshark-gtk.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# the wireshark manpage covers wireshark-gtk, too -wireshark-gtk: binary-without-manpage usr/bin/wireshark-gtk
\ No newline at end of file |