Merge pull request #338 from autocrypt/favicon

Revert the last 2 commits and use a favicon.ico generated by gimp

doc/Makefile

@@ -48,7 +48,6 @@ help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 	@echo "  coverage   to run coverage check of the documentation (if enabled)"
 	@echo "  dummy      to check syntax errors of document sources"
-	@echo "  favicon    to generate a multi-resolution favicon.ico from autocrypt_logo_alone_orig.png"
 
 #
 # Pattern rule for converting SVG to PDF
@@ -65,7 +64,7 @@ clean:
 	rm -f $(PDFs)
 
 .PHONY: html
-html: favicon
+html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
@@ -239,14 +238,3 @@ dummy:
 	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
 	@echo
 	@echo "Build finished. Dummy builder generates no files."
-
-.PHONY: favicon
-favicon: 
-	mkdir -p $(BUILDDIR)/html
-	convert.im6 images/autocrypt_logo_alone_orig.png -resize 256x256 -transparent white /tmp/favicon-256.png
-	convert.im6 /tmp/favicon-256.png -resize 16x16 /tmp/favicon-16.png
-	convert.im6 /tmp/favicon-256.png -resize 32x32 /tmp/favicon-32.png
-	convert.im6 /tmp/favicon-256.png -resize 64x64 /tmp/favicon-64.png
-	convert.im6 /tmp/favicon-256.png -resize 128x128 /tmp/favicon-128.png
-	convert.im6 /tmp/favicon-16.png /tmp/favicon-32.png /tmp/favicon-64.png /tmp/favicon-128.png /tmp/favicon-256.png -colors 256 $(BUILDDIR)/html/favicon.ico
-	rm -f /tmp/favicon-16.png /tmp/favicon-32.png /tmp/favicon-64.png /tmp/favicon-128.png /tmp/favicon-256.png

doc/conf.py

@@ -161,7 +161,7 @@
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
 #
-html_favicon = '_build/html/favicon.ico'
+html_favicon = 'images/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,