diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-15 14:31:35 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-15 14:31:35 +0000 |
| commit | 891854ca7a69fe6947b510e527728a6c0b45bd35 (patch) | |
| tree | 1c8c45abc0f62eeec55bc1abb275751f42531eed | |
| parent | 9fd357b17488d89210495771d29813c4a20f38d3 (diff) | |
As suggest by Balint:
Remove the 03-preferences patch: there's an ongoing discussion over at Debian
about using xdg-open to open URLs[1] (instead of sensible-browser as this
patch was doing) and anyway xdg-open behaves better for Balint.
Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested
by Balint).
Both changes are untested.
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436
svn path=/trunk/; revision=50611
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 2 | ||||
| -rw-r--r-- | debian/patches/03_preferences.dpatch | 19 |
4 files changed, 2 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index f513b43f4e..c44ee0a8d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -682,7 +682,6 @@ EXTRA_DIST = \ debian/dirs \ debian/headers-check.c \ debian/patches/00list \ - debian/patches/03_preferences.dpatch \ debian/postinst \ debian/pycompat \ debian/pyversions \ diff --git a/debian/control b/debian/control index 3df4b9f98f..723cf8a861 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Description: network traffic analyser (common files) Package: wireshark Architecture: any -Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version}) +Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version}), xdg-utils Recommends: gksu Replaces: ethereal (<< 0.99.2-0) Conflicts: ethereal (<< 0.99.2-0) diff --git a/debian/patches/00list b/debian/patches/00list index 8c6dbb5f94..64fbf26eb4 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,4 @@ -03_preferences +#03_preferences #04_drop-capabilities #05_plugin-libdir #06_giop-buffer diff --git a/debian/patches/03_preferences.dpatch b/debian/patches/03_preferences.dpatch deleted file mode 100644 index a1a4eb762e..0000000000 --- a/debian/patches/03_preferences.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /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@ ---- a/epan/prefs.c (revision 50600) -+++ b/epan/prefs.c (working copy) -@@ -2753,7 +2753,7 @@ - prefs.gui_update_enabled = TRUE; - prefs.gui_update_channel = UPDATE_CHANNEL_STABLE; - prefs.gui_update_interval = 60*60*24; /* Seconds */ -- prefs.gui_webbrowser = (char *) HTML_VIEWER " %s"; -+ prefs.gui_webbrowser = (char *) "sensible-browser %s"; - prefs.gui_window_title = (char *) ""; - prefs.gui_start_title = "The World's Most Popular Network Protocol Analyzer"; - prefs.gui_version_placement = version_both; |