diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d72440..6dc933a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added MetaInfo file +- New SVG icon (thanks @creepertron95, @jimmac and @freddii) ### Changed - Changed AppID to io.github.mightycreak.Diffuse (as explained in diff --git a/README.md b/README.md index 6362deb..6e527cf 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,5 @@ # Diffuse -Copyright (C) 2006-2019 Derrick Moser -Copyright (C) 2015-2020 Romain Failliot - ----- - Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line matching and directly edit files. Diffuse can @@ -103,3 +98,16 @@ Diffuse's help documentation is written in the DocBook format and can be easily converted into other formats using XSLT stylesheets. If the local help documentation or its browser are unavailable, Diffuse will attempt to display the on-line help documentation using a web browser. + +## Licenses + +Diffuse is under the [GPLv2](COPYING). + +The file [io.github.mightycreak.Diffuse.metainfo.xml](src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml) +is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html) +license. + +Copyright (C) 2006-2019 Derrick Moser +Copyright (C) 2015-2021 Romain Failliot + +Icon made by [@jimmac](https://github.com/jimmac). diff --git a/data/diffuse.desktop.in b/data/diffuse.desktop.in index 81a7132..31eb46a 100644 --- a/data/diffuse.desktop.in +++ b/data/diffuse.desktop.in @@ -2,7 +2,7 @@ Name=Diffuse Merge Tool Comment=Graphical tool for merging and comparing text files Exec=diffuse -s %F -Icon=diffuse +Icon=io.github.mightycreak.Diffuse Terminal=false Type=Application MimeType=text/plain;text/x-csrc;text/x-chdr; diff --git a/io.github.mightycreak.Diffuse.yml b/io.github.mightycreak.Diffuse.yml index 3613261..a9cde15 100644 --- a/io.github.mightycreak.Diffuse.yml +++ b/io.github.mightycreak.Diffuse.yml @@ -16,4 +16,3 @@ modules: url: https://github.com/MightyCreak/diffuse branch: v0.6.0 rename-desktop-file: diffuse.desktop -rename-icon: diffuse diff --git a/src/usr/share/icons/hicolor/16x16/apps/diffuse.png b/src/usr/share/icons/hicolor/16x16/apps/diffuse.png deleted file mode 100644 index 87a7584..0000000 Binary files a/src/usr/share/icons/hicolor/16x16/apps/diffuse.png and /dev/null differ diff --git a/src/usr/share/icons/hicolor/22x22/apps/diffuse.png b/src/usr/share/icons/hicolor/22x22/apps/diffuse.png deleted file mode 100644 index d054046..0000000 Binary files a/src/usr/share/icons/hicolor/22x22/apps/diffuse.png and /dev/null differ diff --git a/src/usr/share/icons/hicolor/24x24/apps/diffuse.png b/src/usr/share/icons/hicolor/24x24/apps/diffuse.png deleted file mode 100644 index fc082fa..0000000 Binary files a/src/usr/share/icons/hicolor/24x24/apps/diffuse.png and /dev/null differ diff --git a/src/usr/share/icons/hicolor/256x256/apps/diffuse.png b/src/usr/share/icons/hicolor/256x256/apps/diffuse.png deleted file mode 100644 index 8f77f3b..0000000 Binary files a/src/usr/share/icons/hicolor/256x256/apps/diffuse.png and /dev/null differ diff --git a/src/usr/share/icons/hicolor/32x32/apps/diffuse.png b/src/usr/share/icons/hicolor/32x32/apps/diffuse.png deleted file mode 100644 index 91cf181..0000000 Binary files a/src/usr/share/icons/hicolor/32x32/apps/diffuse.png and /dev/null differ diff --git a/src/usr/share/icons/hicolor/48x48/apps/diffuse.png b/src/usr/share/icons/hicolor/48x48/apps/diffuse.png deleted file mode 100644 index c94a4b9..0000000 Binary files a/src/usr/share/icons/hicolor/48x48/apps/diffuse.png and /dev/null differ diff --git a/src/usr/share/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.Devel.svg b/src/usr/share/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.Devel.svg new file mode 100644 index 0000000..4b98f7a --- /dev/null +++ b/src/usr/share/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.Devel.svg @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/usr/share/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg b/src/usr/share/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg new file mode 100644 index 0000000..1d2a161 --- /dev/null +++ b/src/usr/share/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/usr/share/icons/hicolor/symbolic/apps/io.github.mightycreak.Diffuse-symbolic.svg b/src/usr/share/icons/hicolor/symbolic/apps/io.github.mightycreak.Diffuse-symbolic.svg new file mode 100644 index 0000000..a786ba1 --- /dev/null +++ b/src/usr/share/icons/hicolor/symbolic/apps/io.github.mightycreak.Diffuse-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file