diff options
author | kcgen <1557255+kcgen@users.noreply.github.com> | 2021-08-28 17:23:08 +0300 |
---|---|---|
committer | kcgen <1557255+kcgen@users.noreply.github.com> | 2021-08-28 18:26:41 +0300 |
commit | 4084e3dd9aa4225dceced6659f2e85b7d1b22afb (patch) | |
tree | 5dc4b3ebeac3fd94d6f107298b13dd2f6e5bb6da | |
parent | d6204e1d0fe41a99fec968324b4c4a87df8e8237 (diff) |
Update version strings to 0.77.1
-rw-r--r-- | .github/workflows/linux.yml | 2 | ||||
-rw-r--r-- | .github/workflows/macos.yml | 2 | ||||
-rw-r--r-- | .github/workflows/windows.yml | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | contrib/fedora/RPMBUILD.md | 2 | ||||
-rw-r--r-- | contrib/fedora/dosbox-staging.spec | 6 | ||||
-rw-r--r-- | contrib/linux/dosbox-staging.metainfo.xml | 1 | ||||
-rw-r--r-- | contrib/macos/Info.plist.template | 2 | ||||
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | src/platform/visualc/config.h | 2 | ||||
-rw-r--r-- | src/winres.rc | 8 |
11 files changed, 18 insertions, 13 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8babce7b3..383140324 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -306,7 +306,7 @@ jobs: run: | set +x git fetch --unshallow - VERSION=$(git describe --abbrev=4) + VERSION=$(git describe --abbrev=0) echo "VERSION=$VERSION" >> $GITHUB_ENV NEWEST_TAG=$(git describe --abbrev=0) git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 81eb6b54e..8cd99c801 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -346,7 +346,7 @@ jobs: run: | set +x git fetch --unshallow - VERSION=$(git describe --abbrev=4) + VERSION=$(git describe --abbrev=0) echo "VERSION=$VERSION" >> $GITHUB_ENV NEWEST_TAG=$(git describe --abbrev=0) git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6a6bb7586..d353da0a5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -247,7 +247,7 @@ jobs: run: | set +x git fetch --unshallow - VERSION=$(git describe --abbrev=4) + VERSION=$(git describe --abbrev=0) echo "VERSION=$VERSION" >> $GITHUB_ENV NEWEST_TAG=$(git describe --abbrev=0) git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt @@ -1,4 +1,4 @@ -DOSBox (dosbox-staging) 0.77.0 Manual +DOSBox (dosbox-staging) 0.77.1 Manual ====== INDEX: diff --git a/contrib/fedora/RPMBUILD.md b/contrib/fedora/RPMBUILD.md index aa6f2669d..9407a4167 100644 --- a/contrib/fedora/RPMBUILD.md +++ b/contrib/fedora/RPMBUILD.md @@ -23,6 +23,6 @@ Fedora build (via Koji buildsystem): $ sudo dnf install -y fedora-packager $ echo "<user>" > ~/.fedora.upn $ kinit <user>@FEDORAPROJECT.ORG - $ koji build --scratch f33 ~/rpmbuild/SRPMS/dosbox-staging-0.77.0-* + $ koji build --scratch f33 ~/rpmbuild/SRPMS/dosbox-staging-0.77.1-* Koji will print build status and URL (Task info). diff --git a/contrib/fedora/dosbox-staging.spec b/contrib/fedora/dosbox-staging.spec index 8a439d800..f5580d156 100644 --- a/contrib/fedora/dosbox-staging.spec +++ b/contrib/fedora/dosbox-staging.spec @@ -1,5 +1,5 @@ Name: dosbox-staging -Version: 0.77.0 +Version: 0.77.1 Release: 2%{?dist} Summary: DOS/x86 emulator focusing on ease of use License: GPLv2+ @@ -85,6 +85,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml %changelog +* Sat Aug 28 2021 kcgen <kcgen@users.noreply.github.com> +- 0.77.1-1 +- Update to 0.77.1 + * Fri Jun 2 2021 kcgen <kcgen@users.noreply.github.com> - 0.77.0-1 - Replace autotools with Meson diff --git a/contrib/linux/dosbox-staging.metainfo.xml b/contrib/linux/dosbox-staging.metainfo.xml index f3cbf797a..7ab4bbc8a 100644 --- a/contrib/linux/dosbox-staging.metainfo.xml +++ b/contrib/linux/dosbox-staging.metainfo.xml @@ -58,6 +58,7 @@ <category>Emulator</category> </categories> <releases> + <release version="0.77.1" date="2021-08-28"/> <release version="0.77.0" date="2021-07-02"/> <release version="0.76.0" date="2020-12-03"/> <release version="0.75.2" date="2020-10-26"/> diff --git a/contrib/macos/Info.plist.template b/contrib/macos/Info.plist.template index 5a0e839a8..24e5a0a7f 100644 --- a/contrib/macos/Info.plist.template +++ b/contrib/macos/Info.plist.template @@ -27,7 +27,7 @@ <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.77.0</string> + <string>0.77.1</string> <key>CFBundleVersion</key> <string>%VERSION%</string> diff --git a/meson.build b/meson.build index ca8527105..d07940722 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('dosbox-staging', 'c', 'cpp', - version : '0.77.0', + version : '0.77.1', license : 'GPL-2.0-or-later', default_options : ['cpp_std=c++14', 'b_ndebug=if-release', 'b_staticpic=false'], meson_version : '>= 0.54.2') diff --git a/src/platform/visualc/config.h b/src/platform/visualc/config.h index 64fc5a491..f24834aa8 100644 --- a/src/platform/visualc/config.h +++ b/src/platform/visualc/config.h @@ -2,7 +2,7 @@ #define CONF_SUFFIX "-staging-git" /* Version number of package */ -#define VERSION "0.77.0" +#define VERSION "0.77.1" /* This macro is going to be overriden via CI */ #define DOSBOX_DETAILED_VERSION "git" diff --git a/src/winres.rc b/src/winres.rc index b9baa65b9..2545b57be 100644 --- a/src/winres.rc +++ b/src/winres.rc @@ -6,8 +6,8 @@ DOSBOX_ICO ICON "..\\contrib\\icons\\dosbox-staging.ico" // version resource VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,77,0,0 - PRODUCTVERSION 0,77,0,0 + FILEVERSION 0,77,1,0 + PRODUCTVERSION 0,77,1,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -21,12 +21,12 @@ BEGIN VALUE "Comments", "© 2021 DOSBox Staging Team, published under GNU GPL" VALUE "CompanyName", "DOSBox Staging" VALUE "FileDescription", "DOSBox Staging DOS Emulator" - VALUE "FileVersion", "0, 77, 0, 0" + VALUE "FileVersion", "0, 77, 1, 0" VALUE "InternalName", "dosbox-staging" VALUE "LegalCopyright", "Copyright © 2021 DOSBox Staging Team" VALUE "OriginalFilename", "dosbox.exe" VALUE "ProductName", "DOSBox Staging" - VALUE "ProductVersion", "0, 77, 0, 0" + VALUE "ProductVersion", "0, 77, 1, 0" END END BLOCK "VarFileInfo" |