diff --git a/packaging/debian/license-text-about-dialog b/packaging/debian/license-text-about-dialog deleted file mode 100644 index 9aa38b2b67..0000000000 --- a/packaging/debian/license-text-about-dialog +++ /dev/null @@ -1,15 +0,0 @@ -Wireshark is distributed under the GNU GPL version 2. There are no -restrictions on its use. There are significant restrictions on its -distribution. - -Parts of Wireshark can be built and distributed as libraries. These -parts are still covered by the GPL, and NOT by the Lesser General Public -License or any other license. - -If you create a combined work using all or part of Wireshark, then your -combined work must be released under a license compatible with the GPL. - -...and don't get us started on trademarks. - -The full text of the GNU GPL may be viewed in -/usr/share/common-licenses/GPL-2. diff --git a/packaging/debian/patches/16_licence_about_location.patch b/packaging/debian/patches/16_licence_about_location.patch deleted file mode 100644 index c40e89af59..0000000000 --- a/packaging/debian/patches/16_licence_about_location.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Change location of license file in about dialog -Forwarded: not-needed -Author: Frederic Peters - ---- a/ui/qt/about_dialog.cpp -+++ b/ui/qt/about_dialog.cpp -@@ -335,7 +335,7 @@ - #if defined(_WIN32) - f_license.setFileName(get_datafile_path("COPYING.txt")); - #else -- 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/packaging/debian/patches/series b/packaging/debian/patches/series index 07c543b0a4..339a8663b3 100644 --- a/packaging/debian/patches/series +++ b/packaging/debian/patches/series @@ -1,2 +1 @@ 09_idl2wrs.patch -16_licence_about_location.patch diff --git a/packaging/debian/rules b/packaging/debian/rules index fbb8a1371d..40d8ce257f 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -60,7 +60,6 @@ override_dh_auto_install: dh_auto_install rm -f debian/*.shlibs rm -rf $(CURDIR)/debian/tmp/usr/share/wireshark/COPYING - cp debian/license-text-about-dialog $(CURDIR)/debian/tmp/usr/share/wireshark/ABOUT.GPL mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/ mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \ $(CURDIR)/debian/tmp/etc/wireshark/