diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-15 02:03:36 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-15 02:03:36 +0000 |
| commit | a05830e8b2eb75887a821381c4609f9b77f01681 (patch) | |
| tree | f4873cc78f189581797e76197b5ed03fa0cb3464 /debian/patches | |
| parent | 021175097a4f2e4987e726a4318445a004a9706b (diff) | |
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.
svn path=/trunk/; revision=50596
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03_preferences.dpatch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/03_preferences.dpatch b/debian/patches/03_preferences.dpatch index 3c1c434e1e..3f21d456f5 100644 --- 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"); |