Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
stsdc committed Jan 28, 2023
2 parents 08deaa3 + 9c280fb commit 990a8b7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.github.stsdc.monitor (0.15.0) focal; urgency=low
com.github.stsdc.monitor (0.15.0-ci5) focal; urgency=low

* Show containers stats (inspired by Whaler)
* Add GPU usage in Indicator
Expand All @@ -12,7 +12,7 @@ com.github.stsdc.monitor (0.15.0) focal; urgency=low
* Add an option to choose refresh rate
* Use harmonic mean to calculate frequency values

-- Stanisław Dac <[email protected]> Sun, 22 Jan 2023 15:38:27
-- Stanisław Dac <[email protected]> Sun, 22 Jan 2023 15:38:27 +0000

com.github.stsdc.monitor (0.14.0) focal; urgency=low

Expand Down
3 changes: 2 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ Build-Depends: meson,
libudisks2-dev,
libxnvctrl0,
libxnvctrl-dev,
libcurl4-gnutls-dev
libcurl4-gnutls-dev,
libjson-glib-dev,
sassc
Standards-Version: 4.1.1

Expand Down
2 changes: 1 addition & 1 deletion meson/bump_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def bump_deb_changelog():
DEB_CHANGELOG_FILENAME = "../debian/changelog"
now = datetime.datetime.now()
deb_changelog_content = f"""com.github.stsdc.monitor ({sys.argv[1]}) focal; urgency=low\n
* <NEW FEATURE>\n -- Stanisław Dac <[email protected]> {now.strftime("%a, %d %b %Y %H:%M:%S %z")}\n\n"""
* <NEW FEATURE>\n -- Stanisław Dac <[email protected]> {now.strftime("%a, %d %b %Y %H:%M:%S %z")} +0000\n\n"""

with open(DEB_CHANGELOG_FILENAME, 'r+') as f_deb_changelog:
content = f_deb_changelog.read()
Expand Down

0 comments on commit 990a8b7

Please sign in to comment.