Debian: Don't override our license in the About dialog.
This commit is contained in:
parent
fa9703cb27
commit
6fc9667b16
|
@ -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.
|
|
|
@ -1,15 +0,0 @@
|
||||||
Description: Change location of license file in about dialog
|
|
||||||
Forwarded: not-needed
|
|
||||||
Author: Frederic Peters <fpeters@debian.org>
|
|
||||||
|
|
||||||
--- 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);
|
|
|
@ -1,2 +1 @@
|
||||||
09_idl2wrs.patch
|
09_idl2wrs.patch
|
||||||
16_licence_about_location.patch
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ override_dh_auto_install:
|
||||||
dh_auto_install
|
dh_auto_install
|
||||||
rm -f debian/*.shlibs
|
rm -f debian/*.shlibs
|
||||||
rm -rf $(CURDIR)/debian/tmp/usr/share/wireshark/COPYING
|
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/
|
mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/
|
||||||
mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \
|
mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \
|
||||||
$(CURDIR)/debian/tmp/etc/wireshark/
|
$(CURDIR)/debian/tmp/etc/wireshark/
|
||||||
|
|
Loading…
Reference in New Issue