wsutil: Add config_file_exists_with_entries()
[metze/wireshark/wip.git] / debian / patches / 16_licence_about_location.patch
old mode 100755 (executable)
new mode 100644 (file)
index 0806d53..c40e89a
@@ -2,25 +2,14 @@ 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
-@@ -502,7 +502,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
-@@ -312,7 +312,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
+@@ -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);