diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2015-12-15 17:30:40 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-12-16 05:34:22 +0000 |
| commit | 7ce903bee7b01558361b98e6cd6481ed1e257156 (patch) | |
| tree | f9f40e54e31f7f132b7a37233182cb9568b47876 /debian/patches/16_licence_about_location.patch | |
| parent | 04d72727a88f224a80f8bd63640a6889a939729c (diff) | |
debian: Sync patches with Debian
Change-Id: Iec369a7c5ecd559310198efca2cadb56a449de49
Reviewed-on: https://code.wireshark.org/review/12662
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'debian/patches/16_licence_about_location.patch')
| -rwxr-xr-x[-rw-r--r--] | debian/patches/16_licence_about_location.patch | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/debian/patches/16_licence_about_location.patch b/debian/patches/16_licence_about_location.patch index 36cebffc18..0806d53a52 100644..100755 --- a/debian/patches/16_licence_about_location.patch +++ b/debian/patches/16_licence_about_location.patch @@ -4,7 +4,7 @@ Author: Frederic Peters <fpeters@debian.org> --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c -@@ -506,7 +506,7 @@ +@@ -502,7 +502,7 @@ #if defined(_WIN32) absolute_path = get_datafile_path("COPYING.txt"); #else @@ -12,3 +12,15 @@ Author: Frederic Peters <fpeters@debian.org> + 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 +@@ -312,7 +312,7 @@ AboutDialog::AboutDialog(QWidget *parent) : + #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); |