Creak
GitHub
commit
246ddfc340
|
|
@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
- Added MetaInfo file
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
- Changed AppID to io.github.mightycreak.Diffuse (as explained in
|
||||||
|
[Flatpak documentation](https://docs.flatpak.org/en/latest/conventions.html#application-ids))
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,15 +83,15 @@ writable directory on the pen drive).
|
||||||
To install Diffuse locally:
|
To install Diffuse locally:
|
||||||
|
|
||||||
flatpak install flatpak install runtime/org.gnome.Sdk/$(uname -p)/3.38
|
flatpak install flatpak install runtime/org.gnome.Sdk/$(uname -p)/3.38
|
||||||
flatpak-builder builddir-flatpak --user --install com.github.mightycreak.Diffuse.yml
|
flatpak-builder builddir-flatpak --user --install io.github.mightycreak.Diffuse.yml
|
||||||
|
|
||||||
To run Diffuse through Flatpak:
|
To run Diffuse through Flatpak:
|
||||||
|
|
||||||
flatpak run com.github.mightycreak.Diffuse
|
flatpak run io.github.mightycreak.Diffuse
|
||||||
|
|
||||||
To uninstall Diffuse:
|
To uninstall Diffuse:
|
||||||
|
|
||||||
flatpak remove com.github.mightycreak.Diffuse
|
flatpak remove io.github.mightycreak.Diffuse
|
||||||
|
|
||||||
## Help Documentation
|
## Help Documentation
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
app-id: com.github.mightycreak.Diffuse
|
app-id: io.github.mightycreak.Diffuse
|
||||||
runtime: org.gnome.Platform
|
runtime: org.gnome.Platform
|
||||||
runtime-version: '3.38'
|
runtime-version: '3.38'
|
||||||
sdk: org.gnome.Sdk
|
sdk: org.gnome.Sdk
|
||||||
|
|
@ -22,5 +22,18 @@ configure_file(
|
||||||
install_dir: sysconfdir
|
install_dir: sysconfdir
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Validate MetaInfo file
|
||||||
|
metainfo_file = join_paths(meson.source_root(), 'src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml')
|
||||||
|
ascli_exe = find_program('appstreamcli', required: false)
|
||||||
|
if ascli_exe.found()
|
||||||
|
test('validate metainfo file',
|
||||||
|
ascli_exe,
|
||||||
|
args: ['validate',
|
||||||
|
'--no-net',
|
||||||
|
'--pedantic',
|
||||||
|
metainfo_file]
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
# Data files
|
# Data files
|
||||||
install_subdir('usr/share', install_dir: datadir, strip_directory: true)
|
install_subdir('usr/share', install_dir: datadir, strip_directory: true)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,108 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component type="desktop-application">
|
||||||
|
<id>io.github.mightycreak.Diffuse</id>
|
||||||
|
|
||||||
|
<name>Diffuse</name>
|
||||||
|
<summary>Graphical merge tool</summary>
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
|
||||||
|
</p>
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<metadata_license>FSFAP</metadata_license>
|
||||||
|
<project_license>GPL-2.0-or-later</project_license>
|
||||||
|
<content_rating type="oars-1.1" />
|
||||||
|
|
||||||
|
<launchable type="desktop-id">io.github.mightycreak.Diffuse.desktop</launchable>
|
||||||
|
|
||||||
|
<url type="homepage">https://mightycreak.github.io/diffuse/</url>
|
||||||
|
<url type="bugtracker">https://github.com/MightyCreak/diffuse/issues</url>
|
||||||
|
|
||||||
|
<screenshots>
|
||||||
|
<screenshot type="default">
|
||||||
|
<image>https://mightycreak.github.io/diffuse/images/screenshot_v0.5.0.png</image>
|
||||||
|
<caption>Main window: diff between two files</caption>
|
||||||
|
</screenshot>
|
||||||
|
</screenshots>
|
||||||
|
|
||||||
|
<releases>
|
||||||
|
<release version="0.6.0" date="2020-11-29">
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
Mainly under the hood changes in this release, so nothing really visible to the users in this version. That
|
||||||
|
said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse
|
||||||
|
development to be a bit more active and iterative.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available
|
||||||
|
through Flathub!
|
||||||
|
</p>
|
||||||
|
<p>Added:</p>
|
||||||
|
<ul>
|
||||||
|
<li>New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse</li>
|
||||||
|
</ul>
|
||||||
|
<p>Changed:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Replace old install.py with the more standard Meson</li>
|
||||||
|
<li>Remove u string prefixes since Python 3 is in UTF-8 by default</li>
|
||||||
|
<li>Replaced some interpolation operators (%) for the f string prefix</li>
|
||||||
|
<li>Use the window scale factor for the icons generation</li>
|
||||||
|
</ul>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
|
<release version="0.5.0" date="2020-07-18">
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
There is a lot to do on this application, and some features didn't make the release. The main one being the
|
||||||
|
Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python
|
||||||
|
scripts should work on Windows, but no executable is produced (yet) with the release.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the
|
||||||
|
latest commits from upstream (which were never released).
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
The next version will not take 6 years, I promise you! 😄
|
||||||
|
</p>
|
||||||
|
<p>Added:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Added Pedro Albuquerque's Portuguese translation</li>
|
||||||
|
<li>Added Åke Engelbrektson's Swedish translation</li>
|
||||||
|
<li>Added Guillaume Hoffmann's Darcs support improvements</li>
|
||||||
|
<li>Added Akom Chotiphantawanon's Thai translation</li>
|
||||||
|
<li>Added support for Git submodules</li>
|
||||||
|
<li>Added a preference and command line option to specify the version control system search order</li>
|
||||||
|
<li>Added .editorconfig file</li>
|
||||||
|
<li>Added .gitignore file</li>
|
||||||
|
<li>Added message when removing files during uninstallation</li>
|
||||||
|
<li>Added Python script to update all the translation files at once</li>
|
||||||
|
</ul>
|
||||||
|
<p>Changed:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Convert to Python 3</li>
|
||||||
|
<li>Convert to GTK 3</li>
|
||||||
|
<li>Updated Python highlighting for Python 3 grammar</li>
|
||||||
|
<li>Updated copyrights years and authors</li>
|
||||||
|
<li>Improve Spanish translation</li>
|
||||||
|
<li>Convert translation README to MarkDown</li>
|
||||||
|
<li>Updated all the translation files</li>
|
||||||
|
</ul>
|
||||||
|
<p>Fixed:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Fixed wrong icons directory for gtk-update-icon-cache</li>
|
||||||
|
<li>Fixed missing directories when uninstalling</li>
|
||||||
|
<li>Fixed bug introduced by r420 with RCS VCS</li>
|
||||||
|
<li>Fixed broken drag'n'drop since migration to Python3/GTK3</li>
|
||||||
|
<li>Fixed error when using '-m' in an SVN repo</li>
|
||||||
|
</ul>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
|
</releases>
|
||||||
|
|
||||||
|
<developer_name>Romain Failliot</developer_name>
|
||||||
|
<update_contact>romain.failliot@foolstep.com</update_contact>
|
||||||
|
</component>
|
||||||
Loading…
Reference in New Issue