From a94167fa901d4f9295dae85064231f4018097ce2 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Fri, 2 Sep 2022 12:46:48 -0700 Subject: [PATCH] Prepare for another release (pre-release?) --- configure.ac | 2 +- contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in | 2 +- contrib/translations/de/de_DE.lng | 2 +- contrib/translations/en/en_US.lng | 2 +- contrib/translations/es/es_ES.lng | 2 +- contrib/translations/fr/fr_FR.lng | 2 +- contrib/translations/ja/ja_JP.lng | 2 +- contrib/translations/ko/ko_KR.lng | 2 +- contrib/translations/pt/pt_BR.lng | 2 +- contrib/translations/tr/tr_TR.lng | 2 +- contrib/translations/zh/zh_CN.lng | 2 +- contrib/translations/zh/zh_TW.lng | 2 +- contrib/windows/installer/DOSBox-X-setup.iss | 2 +- contrib/windows/installer/dosbox-x.reference.setup.conf | 2 +- dosbox-x.reference.conf | 2 +- dosbox-x.reference.full.conf | 2 +- include/build_timestamp.h | 4 ++-- src/winres.rc | 2 +- vs/config_package.h | 6 +++--- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index ed4249ec8..e37395d84 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,2022.09.0,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,2022.09.1,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(README.md) diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index 7941fcc62..3c762bb40 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng index ec5570db7..088e2c4a5 100644 --- a/contrib/translations/de/de_DE.lng +++ b/contrib/translations/de/de_DE.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:850 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Befehle in diesen Zeilen werden zum Start ausgeführt. diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index b613fb209..d2c35264c 100644 --- a/contrib/translations/en/en_US.lng +++ b/contrib/translations/en/en_US.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:English (United States) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index 758c0e40a..a449c3c91 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Spanish (Spain) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Las líneas de esta sección se iniciarán al inicio. diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng index 5ea6cf2f9..9ca57a2f4 100644 --- a/contrib/translations/fr/fr_FR.lng +++ b/contrib/translations/fr/fr_FR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:French (France) :DOSBOX-X:CODEPAGE:859 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index 082cc442d..882db75d1 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Japanese :DOSBOX-X:CODEPAGE:932 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします :AUTOEXEC_CONFIGFILE_HELP このセクションに記載の行は起動時に実行されます。 diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng index 7bab8fad6..906d55918 100644 --- a/contrib/translations/ko/ko_KR.lng +++ b/contrib/translations/ko/ko_KR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Korean :DOSBOX-X:CODEPAGE:949 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다. :AUTOEXEC_CONFIGFILE_HELP 이 섹션에 나열된 줄은 시작할 때 실행됩니다. diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng index 552fe0f39..b2831d385 100644 --- a/contrib/translations/pt/pt_BR.lng +++ b/contrib/translations/pt/pt_BR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Portuguese (Brazil) :DOSBOX-X:CODEPAGE:860 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X. diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index df9ed7950..7179b0e94 100644 --- a/contrib/translations/tr/tr_TR.lng +++ b/contrib/translations/tr/tr_TR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Turkish (Turkey) :DOSBOX-X:CODEPAGE:857 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng index 872c14237..36dff4ff6 100644 --- a/contrib/translations/zh/zh_CN.lng +++ b/contrib/translations/zh/zh_CN.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Simplified Chinese :DOSBOX-X:CODEPAGE:936 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印 :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng index 5e1862954..a022a5320 100644 --- a/contrib/translations/zh/zh_TW.lng +++ b/contrib/translations/zh/zh_TW.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Traditional Chinese :DOSBOX-X:CODEPAGE:950 -:DOSBOX-X:VERSION:2022.09.0 +:DOSBOX-X:VERSION:2022.09.1 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印 :AUTOEXEC_CONFIGFILE_HELP 段落中的指令行會在啟動時執行. diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss index 2a9edd164..5ade0bf14 100644 --- a/contrib/windows/installer/DOSBox-X-setup.iss +++ b/contrib/windows/installer/DOSBox-X-setup.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2022.09.0" +#define MyAppVersion "2022.09.1" #define MyAppBit "(32-bit)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 6f264ca21..b218fb907 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2022.09.0. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2022.09.1. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index ca723024a..5257b5612 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2022.09.0. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2022.09.1. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index cee346583..2a1eb4b5f 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2022.09.0. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2022.09.1. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 974f64597..801ba9a5e 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Aug 31, 2022 7:38:21pm" -#define GIT_COMMIT_HASH "eb258d1" +#define UPDATED_STR "Sep 2, 2022 12:41:19pm" +#define GIT_COMMIT_HASH "fcee38f" #define COPYRIGHT_END_YEAR "2022" diff --git a/src/winres.rc b/src/winres.rc index 88fc7dc85..76d650239 100755 --- a/src/winres.rc +++ b/src/winres.rc @@ -3,7 +3,7 @@ #include "../include/resource.h" #include "../vs/config_package.h" -#define VERSION_NUMBER 2022,09,0,0 +#define VERSION_NUMBER 2022,09,1,0 // icon resource dosbox_ico ICON "../contrib/icons/dosbox-x.ico" diff --git a/vs/config_package.h b/vs/config_package.h index 3a8ccb98b..6dc09cda3 100644 --- a/vs/config_package.h +++ b/vs/config_package.h @@ -1,8 +1,8 @@ #define PACKAGE "dosbox-x" #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" #define PACKAGE_NAME "dosbox-x" -#define PACKAGE_STRING "dosbox-x 2022.09.0" +#define PACKAGE_STRING "dosbox-x 2022.09.1" #define PACKAGE_TARNAME "dosbox-x" #define PACKAGE_URL "https://dosbox-x.com" -#define PACKAGE_VERSION "2022.09.0" -#define VERSION "2022.09.0" +#define PACKAGE_VERSION "2022.09.1" +#define VERSION "2022.09.1"