Permalink
Browse files

replace gmb icon by the svg icon made by zeltak

  • Loading branch information...
squentin committed Aug 9, 2015
1 parent 592d3b7 commit 596b76b7b4d1951f4127e5558ce3d493bb42f821
View
@@ -10,9 +10,7 @@ mandir = ${DESTDIR}/${prefix}/share/man
docdir = ${DESTDIR}/${prefix}/share/doc/$(PACKAGE)-${VERSION}
localedir = ${DESTDIR}/${prefix}/share/locale
menudir = ${DESTDIR}/${prefix}/lib/menu
iconsdir = ${DESTDIR}/${prefix}/share/icons
liconsdir = $(iconsdir)/large
miconsdir = $(iconsdir)/mini
iconsdir = ${DESTDIR}/${prefix}/share/icons/hicolor
DOCS=AUTHORS COPYING README NEWS INSTALL layout_doc.html
@@ -26,7 +24,6 @@ ACTIVE_LINGUAS = $(shell $(LCMD))
MARKDOWN= markdown
all: locale doc
clean:
rm -rf dist/
@@ -80,22 +77,32 @@ install: all
install -pm 644 pix/oxygen/* "$(datadir)/gmusicbrowser/pix/oxygen/"
install -pDm 644 gmusicbrowser.desktop "$(appdir)/gmusicbrowser.desktop"
install -pDm 644 gmusicbrowser.appdata.xml "$(datadir)/appdata/gmusicbrowser.appdata.xml"
install -pDm 644 pix/gmusicbrowser32x32.png "$(iconsdir)/gmusicbrowser.png"
install -pDm 644 pix/gmusicbrowser.png "$(liconsdir)/gmusicbrowser.png"
install -pDm 644 pix/trayicon.png "$(miconsdir)/gmusicbrowser.png"
install -pDm 644 pix/gmusicbrowser.svg "$(iconsdir)/scalable/apps/gmusicbrowser.svg"
install -pDm 644 pix/gmusicbrowser16x16.png "$(iconsdir)/16x16/apps/gmusicbrowser.png"
install -pDm 644 pix/trayicon.png "$(iconsdir)/20x20/apps/gmusicbrowser.png"
install -pDm 644 pix/gmusicbrowser32x32.png "$(iconsdir)/32x32/apps/gmusicbrowser.png"
install -pDm 644 pix/gmusicbrowser48x48.png "$(iconsdir)/48x48/apps/gmusicbrowser.png"
install -pDm 644 pix/gmusicbrowser64x64.png "$(iconsdir)/64x64/apps/gmusicbrowser.png"
for lang in $(ACTIVE_LINGUAS) ; \
do \
install -pd "$(localedir)/$$lang/LC_MESSAGES/"; \
install -pm 644 locale/$$lang/LC_MESSAGES/gmusicbrowser.mo "$(localedir)/$$lang/LC_MESSAGES/"; \
done
$(MAKE) update-icon-cache
uninstall:
rm -f "$(bindir)/gmusicbrowser"
rm -rf "$(datadir)/gmusicbrowser/" "$(docdir)"
rm -f "$(liconsdir)/gmusicbrowser.png" "$(miconsdir)/gmusicbrowser.png" "$(iconsdir)/gmusicbrowser.png"
rm -f "$(iconsdir)/scalable/apps/gmusicbrowser.svg" \
"$(iconsdir)/16x16/apps/gmusicbrowser.png" \
"$(iconsdir)/20x20/apps/gmusicbrowser.png" \
"$(iconsdir)/32x32/apps/gmusicbrowser.png" \
"$(iconsdir)/48x48/apps/gmusicbrowser.png" \
"$(iconsdir)/64x64/apps/gmusicbrowser.png"
rm -f "$(appdir)/gmusicbrowser.desktop" "$(datadir)/appdata/gmusicbrowser.appdata.xml"
rm -f "$(mandir)/man1/gmusicbrowser.1"
rm -f "$(localedir)/*/LC_MESSAGES/gmusicbrowser.mo"
$(MAKE) update-icon-cache
prepackage : all
perl -pi -e 's!Version:.*!Version: '$(VERSION)'!' gmusicbrowser.spec
@@ -108,3 +115,14 @@ dist: prepackage
release: prepackage
tar -czf dist/$(PACKAGE)-$(VERSION).tar.gz . --transform=s/^[.]/$(PACKAGE)-$(VERSION)/ --exclude=\*~ --exclude=.git\* --exclude=.\*swp --exclude=./dist --exclude=./debian && echo wrote dist/$(PACKAGE)-$(VERSION).tar.gz
update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(update_icon_cache) ; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
echo "*** $(update_icon_cache)" ; \
fi
View
@@ -15,7 +15,7 @@ clean:
install:
dh_testdir
dh_testroot
dh_clean -k
dh_clean
$(MAKE) install DESTDIR=$(CURDIR)/debian/gmusicbrowser \
docdir=$(CURDIR)/debian/gmusicbrowser/usr/share/doc/gmusicbrowser
# menu needs an xpm instead of a png
@@ -32,13 +32,13 @@ binary-indep: install
dh_installdocs
dh_installmenu
dh_installman
dh_desktop
dh_compress
dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
dh_icons
binary-arch:
View
@@ -1323,8 +1323,12 @@ sub LoadIcons
closedir $dh;
}
eval { Gtk2::Window->set_default_icon_from_file( delete $icons{gmusicbrowser} || PIXPATH.'gmusicbrowser.png' ); };
warn $@ if $@;
$icons{gmusicbrowser}||= PIXPATH.'gmusicbrowser.svg' unless Gtk2::IconTheme->get_default->has_icon('gmusicbrowser');
if (my $file=delete $icons{gmusicbrowser})
{ eval { Gtk2::Window->set_default_icon_from_file($file); };
warn $@ if $@;
}
else { Gtk2::Window->set_default_icon_name('gmusicbrowser'); }
#trayicons
{ %TrayIcon=();
@@ -6131,7 +6135,11 @@ sub AboutDialog
$dialog->set_license("Released under the GNU General Public Licence version 3\n(http://www.gnu.org/copyleft/gpl.html)");
$dialog->set_website('http://gmusicbrowser.org');
$dialog->set_authors('Quentin Sculo <squentin@free.fr>');
$dialog->set_artists("tango icon theme : Jean-Philippe Guillemin\nelementary icon theme : Simon Steinbeiß");
$dialog->set_artists(join "\n",
"svg icon : zeltak",
"tango icon theme : Jean-Philippe Guillemin",
"elementary icon theme : Simon Steinbeiß",
);
$dialog->set_translator_credits( join "\n", sort
'French : Quentin Sculo, Jonathan Fretin, Frédéric Urbain, Brice Boucard, Hornblende & mgrubert',
'Hungarian : Zsombor',
View
@@ -41,8 +41,10 @@ rm -rf %{buildroot}
rm -rf %{buildroot}
%post
%{update_icon_cache hicolor}
%{update_menus}
%postun
%{clean_icon_cache hicolor}
%{clean_menus}
%files -f %{name}.lang
@@ -52,9 +54,8 @@ rm -rf %{buildroot}
%{_datadir}/applications/gmusicbrowser.desktop
#%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*.mo
#%{_datadir}/locale/*/LC_MESSAGES/*.mo
%{_iconsdir}/gmusicbrowser.png
%{_liconsdir}/gmusicbrowser.png
%{_miconsdir}/gmusicbrowser.png
%{_iconsdir}/hicolor/scalable/apps/gmusicbrowser.svg
%{_iconsdir}/hicolor/*/apps/gmusicbrowser.png
%{_mandir}/man1/*
%{_docdir}/*
#%doc AUTHORS COPYING README NEWS layout_doc.html
File renamed without changes.
Oops, something went wrong.

0 comments on commit 596b76b

Please sign in to comment.