diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-13 23:00:38 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-13 23:00:38 +0000 |
| commit | 917510f0873fc3b1cccaf47ab8dcd0887db002c6 (patch) | |
| tree | d65394b98b426acd09485827409cabf8ff755971 /debian/patches | |
| parent | a0df458eb843a90f8aef0b40454d0634218d9aa5 (diff) | |
Fix building a Debian package.
svn path=/trunk/; revision=47053
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03_preferences.dpatch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/03_preferences.dpatch b/debian/patches/03_preferences.dpatch index 6cc0183ff6..3c1c434e1e 100644 --- a/debian/patches/03_preferences.dpatch +++ b/debian/patches/03_preferences.dpatch @@ -1,19 +1,19 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 03_preferences.dpatch by <fpeters@debian.org> +## Updated from original Debian version to match the 1.9 trunk. ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: use Debian sensible-browser @DPATCH@ -diff -urNad wireshark-0.99.7~pre1~/epan/prefs.c wireshark-0.99.7~pre1/epan/prefs.c ---- wireshark-0.99.7~pre1~/epan/prefs.c 2007-11-22 17:57:25.000000000 +0100 -+++ wireshark-0.99.7~pre1/epan/prefs.c 2007-11-22 18:04:50.555226510 +0100 -@@ -1198,7 +1198,7 @@ - prefs.gui_ask_unsaved = TRUE; +--- a/epan/prefs.c (revision 47051) ++++ b/epan/prefs.c (working copy) +@@ -2644,7 +2644,7 @@ prefs.gui_find_wrap = TRUE; prefs.gui_use_pref_save = FALSE; + /* This can be g_freed, so it must be g_mallocated. */ - prefs.gui_webbrowser = g_strdup(HTML_VIEWER " %s"); + prefs.gui_webbrowser = g_strdup("sensible-browser %s"); + /* This can be g_freed, so it must be g_mallocated. */ prefs.gui_window_title = g_strdup(""); - prefs.gui_layout_type = layout_type_5; - prefs.gui_layout_content_1 = layout_pane_content_plist; + prefs.gui_start_title = "The World's Most Popular Network Protocol Analyzer"; |