As suggest by Balint:
authorJeff Morriss <jeff.morriss.ws@gmail.com>
Mon, 15 Jul 2013 14:31:35 +0000 (14:31 -0000)
committerJeff Morriss <jeff.morriss.ws@gmail.com>
Mon, 15 Jul 2013 14:31:35 +0000 (14:31 -0000)
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

Makefile.am
debian/control
debian/patches/00list
debian/patches/03_preferences.dpatch [deleted file]

index f513b43f4effd7d5e2cca91e6a9610b2feddb208..c44ee0a8d23e4275e6e7bb788342443827f4d247 100644 (file)
@@ -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       \
index 3df4b9f98f1bd7206159f32c73946f540b4af063..723cf8a8614dadfb8c399c85619bb2ec2b83f49b 100644 (file)
@@ -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)
index 8c6dbb5f94ad3bdee45af3fc9b287fe701b32da9..64fbf26eb49de57535f63167a13d6999f15d6f21 100644 (file)
@@ -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 (file)
index a1a4eb7..0000000
+++ /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;