GNOME.org
 

[gnome-break-timer] Specify NEWS in yaml and update metainfo

commit fe967bbf7d9e8955c1d915c7df898d990e0cbaa8
Author: Dylan McCall <dylan dylanmccall ca>
Date:   Sun Nov 14 13:07:34 2021 -0800

    Specify NEWS in yaml and update metainfo
    
    This change allows us to update releases in metainfo.xml by running
    `build-aux/update-release-info.sh`.

 NEWS                                               | 114 ++++++++++-----------
 build-aux/update-release-info.sh                   |   7 ++
 data/metainfo/meson.build                          |   2 +-
 .../org.gnome.BreakTimer.metainfo.xml.in.in        | 102 ++++++++----------
 4 files changed, 106 insertions(+), 119 deletions(-)
---
diff --git a/NEWS b/NEWS
index ea1b3ac..27a4ac5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,58 +1,56 @@
-gnome-break-timer master
-========================
-
-gnome-break-timer 2.1.0
-========================
-
-* Add break interval and duration choices for the 20-20-20 rule (#6)
-* Add an option to disable screen locking (#15)
-
-gnome-break-timer 2.0.3
-=======================
-
-* Change icon for the break settings button
-* Fix an issue where breaks never stop when the session is inhibited
-* Fix incorrect autostart file location
-* Set a minimum GLib version to support the gnome-3-34 Snap extension
-* Change Flatpak manifest to use socket=fallback-x11
-* Work around metainfo being processed incorrectly in some cases
-
-gnome-break-timer 2.0.2
-=======================
-
-* Fix timer circle colours with themes other than Adwaita
-* Change Flatpak manifest to use socket=fallback-x11
-
-gnome-break-timer 2.0.1
-=======================
-
-* Fix a bug where the idle monitor would be in an incorrect state at login
-
-gnome-break-timer 2.0
-=====================
-
-* Support running as a Flatpak application
-* Replace xrecord with MutterIdleMonitor
-* Remove the app menu from the settings dialog
-* Add a new application icon
-* Animate the timer circles in the settings dialog
-* Improve error handling
-
-gnome-break-timer 1.2
-=====================
-
-* Bumped minimum GTK version
-* Minor fixes for settings dialog
-
-gnome-break-timer 1.1
-=====================
-
-* Redesigned "take a break" notifications
-* New status and settings application
-* Break timers are saved between sessions
-* Bug fixes
-
-gnome-break-timer 1.0
-=====================
-
-* First release
+---
+Version: 2.1.0
+Date: 2021-11-13
+Description:
+- Add break interval and duration choices for the 20-20-20 rule (#6)
+- Add an option to disable screen locking (#15)
+---
+Version: 2.0.3
+Date: 2020-12-16
+Description:
+- Change icon for the break settings button
+- Fix an issue where breaks never stop when the session is inhibited
+- Fix incorrect autostart file location
+- Set a minimum GLib version to support the gnome-3-34 Snap extension
+- Change Flatpak manifest to use socket=fallback-x11
+- Work around metainfo being processed incorrectly in some cases
+---
+Version: 2.0.2
+Date: 2020-11-25
+Description:
+- Fix timer circle colours with themes other than Adwaita
+- Change Flatpak manifest to use socket=fallback-x11
+---
+Version: 2.0.1
+Date: 2020-11-24
+Description:
+- Fix a bug where the idle monitor would be in an incorrect state at login
+---
+Version: 2.0
+Date: 2020-11-24
+Description:
+- Support running as a Flatpak application
+- Replace xrecord with MutterIdleMonitor
+- Remove the app menu from the settings dialog
+- Add a new application icon
+- Animate the timer circles in the settings dialog
+- Improve error handling
+---
+Version: 1.2
+Date: 2014-03-28
+Description:
+- Bumped minimum GTK version
+- Minor fixes for settings dialog
+---
+Version: 1.1
+Date: 2013-09-22
+Description:
+- Redesigned "take a break" notifications
+- New status and settings application
+- Break timers are saved between sessions
+- Bug fixes
+---
+Version: 1.0
+Date: 2013-09-22
+Description:
+- First release
diff --git a/build-aux/update-release-info.sh b/build-aux/update-release-info.sh
new file mode 100755
index 0000000..3d4a217
--- /dev/null
+++ b/build-aux/update-release-info.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# It would be better to do this in our build process, but appstreamcli is not
+# available in the GNOME flatpak Sdk, and I don't understand the equivalent
+# command in appstream-util.
+
+appstreamcli news-to-metainfo NEWS --format=yaml --limit=6 
data/metainfo/org.gnome.BreakTimer.metainfo.xml.in.in
diff --git a/data/metainfo/meson.build b/data/metainfo/meson.build
index ba26719..4c5dcf5 100644
--- a/data/metainfo/meson.build
+++ b/data/metainfo/meson.build
@@ -19,6 +19,6 @@ if appstream_util.found()
     test(
         'Validate org.gnome.BreakTimer.metainfo.xml',
         appstream_util,
-        args: ['validate', '--nonet', metainfo_file]
+        args: ['validate-relax', '--nonet', metainfo_file]
     )
 endif
diff --git a/data/metainfo/org.gnome.BreakTimer.metainfo.xml.in.in 
b/data/metainfo/org.gnome.BreakTimer.metainfo.xml.in.in
index 98f419b..113a823 100644
--- a/data/metainfo/org.gnome.BreakTimer.metainfo.xml.in.in
+++ b/data/metainfo/org.gnome.BreakTimer.metainfo.xml.in.in
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <component type="desktop-application">
   <id>@APPLICATION_ID@</id>
-
   <name>Break Timer</name>
   <summary>Computer break reminders for GNOME</summary>
-
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
-
   <description>
     <p>
       Break Timer keeps track of how much you are using the computer, and it reminds you to take regular 
breaks. It is designed to encourage healthy behaviour, with a mix of short breaks for your eyes and wrists, 
as well as longer breaks to keep your body moving and your mind on task.
@@ -16,88 +13,73 @@
       Break Timer is easy to set up, so you can pick a break schedule that works for you and it will carry 
on working in the background.
     </p>
   </description>
-
+  <launchable type="desktop-id">@DAEMON_APPLICATION_ID@.desktop</launchable>
   <url type="homepage">https://wiki.gnome.org/Apps/BreakTimer</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-break-timer/issues</url>
-
   <screenshots>
     <screenshot type="default">
       <caption>Easily turn on break timers</caption>
-      
<image>https://gitlab.gnome.org/GNOME/gnome-break-timer/raw/master/data/metainfo/gnome-break-timer-2-0-welcome.png</image>
+      <image 
type="source">https://gitlab.gnome.org/GNOME/gnome-break-timer/raw/master/data/metainfo/gnome-break-timer-2-0-welcome.png</image>
     </screenshot>
     <screenshot>
       <caption>Check on their status at any time</caption>
-      
<image>https://gitlab.gnome.org/GNOME/gnome-break-timer/raw/master/data/metainfo/gnome-break-timer-2-0-status.png</image>
+      <image 
type="source">https://gitlab.gnome.org/GNOME/gnome-break-timer/raw/master/data/metainfo/gnome-break-timer-2-0-status.png</image>
     </screenshot>
   </screenshots>
-
-  <launchable type="desktop-id">@DAEMON_APPLICATION_ID@.desktop</launchable>
-
-  <content_rating type="oars-1.1" />
-
   <releases>
-    <release version="2.1.0" date="2021-11-13">
-        <ul>
-            <li>Add break interval and duration choices for the 20-20-20 rule (#6)</li>
-            <li>Add an option to disable screen locking (#15)</li>
-        </ul>
-    </release>
-
-    <release version="2.0.3" date="2020-12-16">
+    <release type="stable" version="2.1.0" date="2021-11-13T00:00:00Z">
+      <description>
         <ul>
-            <li>Change icon for the break settings button</li>
-            <li>Fix an issue where breaks never stop when the session is inhibited</li>
-            <li>Fix incorrect autostart file location</li>
-            <li>Set a minimum GLib version to support the gnome-3-34 Snap extension</li>
-            <li>Change Flatpak manifest to use socket=fallback-x11</li>
-            <li>Work around metainfo being processed incorrectly in some cases</li>
+          <li>Add break interval and duration choices for the 20-20-20 rule (#6)</li>
+          <li>Add an option to disable screen locking (#15)</li>
         </ul>
+      </description>
     </release>
-
-    <release version="2.0.2" date="2020-11-25">
+    <release type="stable" version="2.0.3" date="2020-12-16T00:00:00Z">
+      <description>
         <ul>
-            <li>Fix timer circle colours with themes other than Adwaita</li>
-            <li>Change Flatpak manifest to use socket=fallback-x11</li>
+          <li>Change icon for the break settings button</li>
+          <li>Fix an issue where breaks never stop when the session is inhibited</li>
+          <li>Fix incorrect autostart file location</li>
+          <li>Set a minimum GLib version to support the gnome-3-34 Snap extension</li>
+          <li>Change Flatpak manifest to use socket=fallback-x11</li>
+          <li>Work around metainfo being processed incorrectly in some cases</li>
         </ul>
+      </description>
     </release>
-
-    <release version="2.0.1" date="2020-11-24">
+    <release type="stable" version="2.0.2" date="2020-11-25T00:00:00Z">
+      <description>
         <ul>
-            <li>Fix a bug where the idle monitor would be in an incorrect state at login</li>
+          <li>Fix timer circle colours with themes other than Adwaita</li>
+          <li>Change Flatpak manifest to use socket=fallback-x11</li>
         </ul>
+      </description>
     </release>
-
-    <release version="2.0" date="2020-11-24">
-        <ul>
-            <li>Support running as a Flatpak application</li>
-            <li>Replace xrecord with MutterIdleMonitor</li>
-            <li>Remove the app menu from the settings dialog</li>
-            <li>Add a new application icon</li>
-            <li>Animate the timer circles in the settings dialog</li>
-            <li>Improve error handling</li>
-        </ul>
-    </release>
-
-    <release version="1.2" date="2014-03-28">
-        <ul>
-            <li>Bumped minimum GTK version</li>
-            <li>Minor fixes for settings dialog</li>
-        </ul>
+    <release type="stable" version="2.0.1" date="2020-11-24T00:00:00Z">
+      <description>
+        <p>Fix a bug where the idle monitor would be in an incorrect state at login</p>
+      </description>
     </release>
-
-    <release version="1.1" date="2013-09-22">
+    <release type="stable" version="2.0" date="2020-11-24T00:00:00Z">
+      <description>
         <ul>
-            <li>Redesigned "take a break" notifications</li>
-            <li>New status and settings application</li>
-            <li>Break timers are saved between sessions</li>
-            <li>Bug fixes</li>
+          <li>Support running as a Flatpak application</li>
+          <li>Replace xrecord with MutterIdleMonitor</li>
+          <li>Remove the app menu from the settings dialog</li>
+          <li>Add a new application icon</li>
+          <li>Animate the timer circles in the settings dialog</li>
+          <li>Improve error handling</li>
         </ul>
+      </description>
     </release>
-
-    <release version="1.0" date="2013-09-22">
+    <release type="stable" version="1.2" date="2014-03-28T00:00:00Z">
+      <description>
         <ul>
-            <li>First release</li>
+          <li>Bumped minimum GTK version</li>
+          <li>Minor fixes for settings dialog</li>
         </ul>
+      </description>
     </release>
   </releases>
+  <content_rating type="oars-1.1"/>
 </component>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]