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 39d8491bdddc5a4a4919f8020c1bd8e38c4571f7..2ffff8c80ca55a8949090c92dd5a5efb6099169b 100644 (file)
--- 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 fa7a3a2dd8a32c3298ec80678f6f727a6315b729..22c58331a08688a47bf5be91f3cb1b97638b8207 100644 (file)
--- 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 5501968fa42bfc28d2e848fcc079fd50a0705880..1afed1e1f9f89bfcf544984a02310bea0ba81a7b 100644 (file)
--- 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 6152a671457cacb4643a44c8162e84883a854864..7d35ae9b2f23d2213c423b8a253f598cabc747ee 100644 (file)
--- 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 14627c23ee950ca8f63dda4e55571465c0df7849..fd2313bd8de4e7ae98f582303c003a32181897fc 100644 (file)
--- 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 c24da9d577f31f5cbd15442544b0d323d484e1e8..d561284e8e83acf9d1af8bf7fc229687d3fb5398 100644 (file)
--- 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 (file)
index 0000000..a3ca65f
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 (file)
index a3ca65f..0000000
Binary files a/contrib/sigrok-logo-notext.png and /dev/null differ