Try to fix the "make debian-package" buildbot step: update patch 03-preferences

so it applies more cleanly to the modern prefs.c .

Note: I built this patch partially by hand from "svn diff"; hopefully the
Debian stuff likes it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@50596 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/debian/patches/03_preferences.dpatch b/debian/patches/03_preferences.dpatch
index 3c1c434e1eb94313e63f0777b7c2f35fdfc3b6f9..3f21d456f56f165a482d186f4be475408cca02d8 100644 (file)
--- a/debian/patches/03_preferences.dpatch
+++ b/debian/patches/03_preferences.dpatch
@@ -6,11 +6,11 @@
 ## DP: use Debian sensible-browser
 
 @DPATCH@
---- a/epan/prefs.c     (revision 47051)
+--- a/epan/prefs.c     (revision 50546)
 +++ b/epan/prefs.c     (working copy)
-@@ -2644,7 +2644,7 @@
-   prefs.gui_find_wrap              = TRUE;
-   prefs.gui_use_pref_save          = FALSE;
+@@ -2753,7 +2753,7 @@
+   prefs.gui_update_channel         = UPDATE_CHANNEL_STABLE;
+   prefs.gui_update_interval        = 60*60*24; /* Seconds */
    /* 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");