From: Uwe Hermann <redacted>
Date: Sun, 11 Jun 2017 21:03:09 +0000 (+0200)
Subject: Rename sigrok-logo-notext.png to libsigrok_112x112.png.
X-Git-Tag: libsigrok-0.5.0~5
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=6b21d9a77e58bb9586491ba17968a9edb5a8df93

Rename sigrok-logo-notext.png to libsigrok_112x112.png.

This is more specific and prevents any potential issues e.g. when
multiple distro packages might ship with a generic file like
sigrok-logo-notext.png that's supposed to be installed in the same place.
---

diff --git a/Doxyfile b/Doxyfile
index 39d8491b..2ffff8c8 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "sigrok hardware access and backend library"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = contrib/sigrok-logo-notext.png
+PROJECT_LOGO           = contrib/libsigrok_112x112.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/Doxyfile_internal b/Doxyfile_internal
index fa7a3a2d..22c58331 100644
--- a/Doxyfile_internal
+++ b/Doxyfile_internal
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "sigrok hardware access and backend library"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = contrib/sigrok-logo-notext.png
+PROJECT_LOGO           = contrib/libsigrok_112x112.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/Makefile.am b/Makefile.am
index 5501968f..1afed1e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -568,7 +568,7 @@ EXTRA_DIST = \
 	bindings/swig/classes.i \
 	bindings/swig/doc.py \
 	bindings/swig/templates.i \
-	contrib/sigrok-logo-notext.png \
+	contrib/libsigrok_112x112.png \
 	contrib/z60_libsigrok.rules
 
 if HAVE_CHECK
diff --git a/bindings/cxx/Doxyfile b/bindings/cxx/Doxyfile
index 6152a671..7d35ae9b 100644
--- a/bindings/cxx/Doxyfile
+++ b/bindings/cxx/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "C++ bindings for libsigrok"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = ../../contrib/sigrok-logo-notext.png
+PROJECT_LOGO           = ../../contrib/libsigrok_112x112.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/bindings/java/Doxyfile b/bindings/java/Doxyfile
index 14627c23..fd2313bd 100644
--- a/bindings/java/Doxyfile
+++ b/bindings/java/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Java bindings for libsigrok"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = ../../contrib/sigrok-logo-notext.png
+PROJECT_LOGO           = ../../contrib/libsigrok_112x112.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/bindings/python/Doxyfile b/bindings/python/Doxyfile
index c24da9d5..d561284e 100644
--- a/bindings/python/Doxyfile
+++ b/bindings/python/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Python bindings for libsigrok"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = ../../contrib/sigrok-logo-notext.png
+PROJECT_LOGO           = ../../contrib/libsigrok_112x112.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/contrib/libsigrok_112x112.png b/contrib/libsigrok_112x112.png
new file mode 100644
index 00000000..a3ca65fb
Binary files /dev/null and b/contrib/libsigrok_112x112.png differ
diff --git a/contrib/sigrok-logo-notext.png b/contrib/sigrok-logo-notext.png
deleted file mode 100644
index a3ca65fb..00000000
Binary files a/contrib/sigrok-logo-notext.png and /dev/null differ