summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-16 15:50:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-16 15:52:16 -0400
commit0b026ef4d8fec7e092dab38f949bff5de9d01e72 (patch)
treed830723d50590c7d2c6a85cfca6b262e11cad9b0
parent41234a46a232df21516c03c6ce56a49356b6decc (diff)
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.
-rw-r--r--Assistant/Install/Menu.hs2
-rw-r--r--Makefile2
-rw-r--r--doc/logo_16x16.png (renamed from doc/favicon.png)bin714 -> 714 bytes
3 files changed, 2 insertions, 2 deletions
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/logo_16x16.png
index 1efbebdd7..1efbebdd7 100644
--- a/doc/favicon.png
+++ b/doc/logo_16x16.png
Binary files differ