aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/control8
-rw-r--r--debian/patches/16_licence_about_location.patch13
-rw-r--r--debian/wireshark-gtk.docs1
-rw-r--r--debian/wireshark-gtk.install2
-rw-r--r--debian/wireshark-gtk.lintian-overrides2
5 files changed, 3 insertions, 23 deletions
diff --git a/debian/control b/debian/control
index c93ef24..0ca7953 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 fb44ba8..c40e89a 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 e174728..0000000
--- 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 c109852..0000000
--- 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 1b412d3..0000000
--- 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