From 0b026ef4d8fec7e092dab38f949bff5de9d01e72 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Mar 2014 15:50:53 -0400 Subject: rename favicon.png to logo_16x16.png This was never used as a favicon, it's just a png version of the favicon.ico. It's actually used for the freedesktop menu file. --- Assistant/Install/Menu.hs | 2 +- Makefile | 2 +- doc/favicon.png | Bin 714 -> 0 bytes doc/logo_16x16.png | Bin 0 -> 714 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 doc/favicon.png create mode 100644 doc/logo_16x16.png diff --git a/Assistant/Install/Menu.hs b/Assistant/Install/Menu.hs index 22ca1da9c..d095cdd88 100644 --- a/Assistant/Install/Menu.hs +++ b/Assistant/Install/Menu.hs @@ -21,7 +21,7 @@ installMenu command menufile iconsrcdir icondir = do writeDesktopMenuFile (fdoDesktopMenu command) menufile installIcon (iconsrcdir "logo.svg") $ iconFilePath (iconBaseName ++ ".svg") "scalable" icondir - installIcon (iconsrcdir "favicon.png") $ + installIcon (iconsrcdir "logo_16x16.png") $ iconFilePath (iconBaseName ++ ".png") "16x16" icondir #endif diff --git a/Makefile b/Makefile index 50d1acd9a..45b9a578b 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs strip "$(LINUXSTANDALONE_DEST)/bin/git-annex" ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell" zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE - cp doc/favicon.png doc/logo.svg $(LINUXSTANDALONE_DEST) + cp doc/logo_16x16.png doc/logo.svg $(LINUXSTANDALONE_DEST) ./Build/Standalone "$(LINUXSTANDALONE_DEST)" diff --git a/doc/favicon.png b/doc/favicon.png deleted file mode 100644 index 1efbebdd7..000000000 Binary files a/doc/favicon.png and /dev/null differ diff --git a/doc/logo_16x16.png b/doc/logo_16x16.png new file mode 100644 index 000000000..1efbebdd7 Binary files /dev/null and b/doc/logo_16x16.png differ -- cgit v1.2.3