summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-03-26 19:51:33 +0000
committerGerald Combs <gerald@wireshark.org>2013-03-26 19:51:33 +0000
commitd1b87423df7aca95c50e04530316f9b7447f13ff (patch)
treec06a943a3aad63ec61a1e85bdcdf20f721ef93a8 /debian
parent67ffb10e649188e64cdb58419ffecfba20e19c0d (diff)
downloadwireshark-d1b87423df7aca95c50e04530316f9b7447f13ff.tar.gz
More icon updates.
Use the PNG versions of the new application icons. Remove the XPM versions of the Wireshark application and capture icons. To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove xpm_to_widget_from_parent (which we weren't using and likely won't use in the future). Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the 16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3. This version was used specifically because it's GPLv2 and later versions are GPLv3. Update image/README. svn path=/trunk/; revision=48565
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/wireshark.menu2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index 2661f2d4a9..a4caa297cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ install: build
#cp debian/wireshark-root.desktop $(CURDIR)/debian/tmp/usr/share/applications/
mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/
cp image/hi48-app-wireshark.png $(CURDIR)/debian/tmp/usr/share/pixmaps/
- cp image/wsicon32.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
+ cp image/wsicon32.png $(CURDIR)/debian/tmp/usr/share/pixmaps/
mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/
mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \
$(CURDIR)/debian/tmp/etc/wireshark/
diff --git a/debian/wireshark.menu b/debian/wireshark.menu
index 4cd16e67a4..476db94c24 100644
--- a/debian/wireshark.menu
+++ b/debian/wireshark.menu
@@ -1,5 +1,5 @@
?package(wireshark):needs="X11" section="Applications/Network/Monitoring" \
title="Wireshark" \
command="/usr/bin/wireshark" \
- icon="/usr/share/pixmaps/wsicon32.xpm"
+ icon="/usr/share/pixmaps/wsicon32.png"