diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | image/README.image | 9 | ||||
| -rw-r--r-- | image/eiconcap48.xpm | 2 | ||||
| -rw-r--r-- | image/elogo3d48x48.png | bin | 4817 -> 0 bytes | |||
| -rw-r--r-- | image/elogo3d64x64.png | bin | 5553 -> 0 bytes | |||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 10 |
6 files changed, 10 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index a85514ca81..145267a122 100644 --- a/Makefile.am +++ b/Makefile.am @@ -575,7 +575,6 @@ EXTRA_DIST = \ image/eiconcap16.xpm \ image/eiconcap32.xpm \ image/eiconcap48.xpm \ - image/elogo3d48x48.png \ image/ethereal48x48.png \ image/ethereal48x48-trans.png \ image/Ethereal.icns \ @@ -807,7 +806,7 @@ rpm-package: dist cd SOURCES ; \ ln -s ../../../$(distdir).tar.gz ; \ ln -s ../../../wireshark.desktop ; \ - ln -s ../../../image/elogo3d64x64.png ethereal.png ; \ + ln -s ../../../image/wsicon64.png wireshark.png ; \ cd .. ; \ rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/wireshark.spec && \ echo "Package successfully built in `pwd`/RPMS." ; \ diff --git a/image/README.image b/image/README.image index cf210f6f9c..fb90565bba 100644 --- a/image/README.image +++ b/image/README.image @@ -18,12 +18,7 @@ wsicon32.xpm wsicon48.xpm wsicon64.xpm -elogo3d48x48.png 3D Ethereal logo with transparent background -elogo3d64x64.png - -Ethereal.icns Mac OS X icon file - -ethereal.ico Windows icon file with 16 and 32 pixel +wireshark.ico Windows icon file with 16 and 32 pixel 3D logo icons, high and low color ethereal48x48-trans.png Old (flat, black & white) logo icon with @@ -31,6 +26,8 @@ ethereal48x48-trans.png Old (flat, black & white) logo icon with ethereal48x48.png Old (flat, black & white) logo icon with white background +Ethereal.icns Mac OS X icon file + hi16-app-ethereal.png KDE Icon Factory Styleguide-compliant hi32-app-ethereal.png (http://www.kde.org/artist/introduction.html) hi48-app-ethereal.png icons diff --git a/image/eiconcap48.xpm b/image/eiconcap48.xpm index 60c2d818ce..b07b19fb3c 100644 --- a/image/eiconcap48.xpm +++ b/image/eiconcap48.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * eiconcap48_xpm[] = { +static char * eiconcap48_xpm[] = { "48 48 1162 2", " c None", ". c #B2B5B2", diff --git a/image/elogo3d48x48.png b/image/elogo3d48x48.png Binary files differdeleted file mode 100644 index 46eefa6fbb..0000000000 --- a/image/elogo3d48x48.png +++ /dev/null diff --git a/image/elogo3d64x64.png b/image/elogo3d64x64.png Binary files differdeleted file mode 100644 index f8fd62939d..0000000000 --- a/image/elogo3d64x64.png +++ /dev/null diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 5e7ae89792..c14913a5c5 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -4,7 +4,7 @@ %define prefix /usr Summary: Network protocol analyzer -Name: ethereal +Name: wireshark Version: %ver Release: %rel License: GPL @@ -35,8 +35,8 @@ make rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%prefix/X11R6/bin $RPM_BUILD_ROOT%prefix/X11R6/man/man1 -mv $RPM_BUILD_ROOT%prefix/bin/ethereal $RPM_BUILD_ROOT%prefix/X11R6/bin/ethereal -mv $RPM_BUILD_ROOT%prefix/man/man1/ethereal.1* $RPM_BUILD_ROOT%prefix/X11R6/man/man1/ +mv $RPM_BUILD_ROOT%prefix/bin/wireshark $RPM_BUILD_ROOT%prefix/X11R6/bin/wireshark +mv $RPM_BUILD_ROOT%prefix/man/man1/wireshark.1* $RPM_BUILD_ROOT%prefix/X11R6/man/man1/ %clean rm -rf $RPM_BUILD_ROOT @@ -48,8 +48,8 @@ rm -rf $RPM_BUILD_ROOT %prefix/X11R6/man/*/* %prefix/bin/* %prefix/lib/* -%prefix/share/ethereal/* -%prefix/share/ethereal/*/* +%prefix/share/wireshark/* +%prefix/share/wireshark/*/* %prefix/man/*/* %changelog |
