Skip to content

[pull] master from flameshot-org:master #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Aug 16, 2025
Merged

[pull] master from flameshot-org:master #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c7024d
<strong> is not a supported tag per flathub guidelines (#4160)
borgmanJeremy Aug 15, 2025
be25a13
Flathub linting (#4161)
borgmanJeremy Aug 15, 2025
79395fd
bump for v13.1.0 (#4162)
borgmanJeremy Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.13)
# cmake_policy(SET CMP0076 OLD)

set(FLAMESHOT_VERSION 13.0.1)
set(FLAMESHOT_VERSION 13.1.0)

# Flameshot-org
set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
Expand Down
15 changes: 7 additions & 8 deletions data/appdata/org.flameshot.Flameshot.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ SPDX-License-Identifier: CC0-1.0
</developer>

<supports>
<control>pointing</control>
<control>keyboard</control>
<control>touch</control>
</supports>

Expand All @@ -36,7 +34,7 @@ SPDX-License-Identifier: CC0-1.0
Powerful and simple to use screenshot software with built-in
editor with advanced features.
</p>
<p><strong>Features:</strong></p>
<p>Features:</p>
<ul>
<li>Customizable appearance</li>
<li>Very easy to use</li>
Expand All @@ -50,23 +48,23 @@ SPDX-License-Identifier: CC0-1.0

<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/large_demo.png</image>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/docs/images/large_demo.png</image>
<caption>Flameshot Usage</caption>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/small_demo.png</image>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/docs/images/small_demo.png</image>
<caption>Demo of Pixelation, Arrow, Box, And Counter Bubble</caption>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/launcher.png</image>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/docs/images/launcher.png</image>
<caption>The Launcher Window</caption>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/config_interface.png</image>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/docs/images/config_interface.png</image>
<caption>Configuration Window - Interface tab</caption>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/config_shortcuts.png</image>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/docs/images/config_shortcuts.png</image>
<caption>Configuration Window - Shortcuts tab</caption>
</screenshot>
</screenshots>
Expand All @@ -93,6 +91,7 @@ SPDX-License-Identifier: CC0-1.0
</categories>

<releases>
<release version="13.1.0" date="2025-08-15"/>
<release version="13.0.1" date="2025-08-06"/>
<release version="13.0.0" date="2025-08-03"/>
<release version="12.1.0" date="2022-07-03"/>
Expand Down
6 changes: 3 additions & 3 deletions packaging/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
flameshot (13.0.1-1) unstable; urgency=medium
flameshot (13.1.0-1) unstable; urgency=medium

* Release for v13
* Release for v13.1.0

-- Jeremy Borgman <[email protected]> Sun, 03 Aug 2025 18:24:29 -0600
-- Jeremy Borgman <[email protected]> Fri, 15 Aug 2025 18:24:29 -0600
3 changes: 3 additions & 0 deletions packaging/rpm/fedora/flameshot.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/%{name}.1*

%changelog
* Sun Aug 13 2025 Jeremy Borgman <[email protected]> - 13.1.0
- Update for v13.1.0 release

* Sun Aug 06 2025 Jeremy Borgman <[email protected]> - 13.0.1
- Update for v13.0.1 release

Expand Down
3 changes: 3 additions & 0 deletions packaging/rpm/opensuse/flameshot.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/%{name}.1*

%changelog
* Sun Aug 15 2025 Jeremy Borgman <[email protected]> - 13.1.0
- Update for v13.1.0 release

* Sun Aug 06 2025 Jeremy Borgman <[email protected]> - 13.0.1
- Update for v13.0.1 release

Expand Down
Loading