From f0f27f82a6005f1097d061961dbfe897705d4782 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 6 Dec 2019 18:29:23 +0100 Subject: [PATCH] bump version number; set release code name --- Building.for.Windows.md | 2 +- NEWS.md | 2 +- README.md | 2 +- configure.ac | 2 +- doc/man/mkvextract.xml | 4 ++-- doc/man/mkvinfo.xml | 4 ++-- doc/man/mkvmerge.xml | 4 ++-- doc/man/mkvpropedit.xml | 4 ++-- doc/man/mkvtoolnix-gui.xml | 4 ++-- doc/man/po4a/po/ca.po | 4 ++-- doc/man/po4a/po/de.po | 4 ++-- doc/man/po4a/po/es.po | 4 ++-- doc/man/po4a/po/ja.po | 2 +- doc/man/po4a/po/ko.po | 2 +- doc/man/po4a/po/nl.po | 2 +- doc/man/po4a/po/pl.po | 2 +- doc/man/po4a/po/uk.po | 2 +- doc/man/po4a/po/zh_CN.po | 2 +- packaging/centos-fedora-opensuse/mkvtoolnix.spec | 5 ++++- packaging/debian/changelog | 6 ++++++ packaging/windows/installer/mkvtoolnix.nsi | 2 +- share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml | 1 + src/common/version.cpp | 2 +- src/extract/resources.rc | 8 ++++---- src/info/resources.rc | 8 ++++---- src/merge/resources.rc | 8 ++++---- src/mkvtoolnix-gui/resources.rc | 8 ++++---- src/propedit/resources.rc | 8 ++++---- 28 files changed, 59 insertions(+), 49 deletions(-) diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 9d68e50e8..00a83050d 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 40.0.0 for Windows +Building MKVToolNix 41.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index bdacad11b..34b97fdfc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 41.0.0 "Smarra" 2019-12-06 ## New features and enhancements diff --git a/README.md b/README.md index 17e099609..26c812318 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 40.0.0 +MKVToolNix 41.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index f133f074b..72c8ad22e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[40.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[41.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) AC_PREREQ(2.50) AC_CONFIG_HEADERS(config.h:config.h.in) diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index 8d2132cf9..20c32bd09 100644 --- a/doc/man/mkvextract.xml +++ b/doc/man/mkvextract.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvinfo.xml b/doc/man/mkvinfo.xml index 954df373e..c9afe4b1e 100644 --- a/doc/man/mkvinfo.xml +++ b/doc/man/mkvinfo.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml index 96871561f..a8aca2649 100644 --- a/doc/man/mkvmerge.xml +++ b/doc/man/mkvmerge.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvpropedit.xml b/doc/man/mkvpropedit.xml index 93b4448af..749838d3d 100644 --- a/doc/man/mkvpropedit.xml +++ b/doc/man/mkvpropedit.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvtoolnix-gui.xml b/doc/man/mkvtoolnix-gui.xml index 5c38503b8..a3548e83a 100644 --- a/doc/man/mkvtoolnix-gui.xml +++ b/doc/man/mkvtoolnix-gui.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/po4a/po/ca.po b/doc/man/po4a/po/ca.po index 89594701f..ad590f79a 100644 --- a/doc/man/po4a/po/ca.po +++ b/doc/man/po4a/po/ca.po @@ -29,8 +29,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "40.0.0" -msgstr "40.0.0" +msgid "41.0.0" +msgstr "41.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/de.po b/doc/man/po4a/po/de.po index 6020f8b70..ebc3a7652 100644 --- a/doc/man/po4a/po/de.po +++ b/doc/man/po4a/po/de.po @@ -27,8 +27,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "40.0.0" -msgstr "40.0.0" +msgid "41.0.0" +msgstr "41.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/es.po b/doc/man/po4a/po/es.po index 08894f46f..5fa5cfd18 100644 --- a/doc/man/po4a/po/es.po +++ b/doc/man/po4a/po/es.po @@ -28,8 +28,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "40.0.0" -msgstr "40.0.0" +msgid "41.0.0" +msgstr "41.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/ja.po b/doc/man/po4a/po/ja.po index cb538aa10..9faf1fdbc 100644 --- a/doc/man/po4a/po/ja.po +++ b/doc/man/po4a/po/ja.po @@ -28,7 +28,7 @@ msgstr "mkvextract" #: doc/man/mkvtoolnix-gui.xml:6 #, fuzzy #| msgid "34.0.0" -msgid "40.0.0" +msgid "41.0.0" msgstr "34.0.0" #. type: Content of the date entity diff --git a/doc/man/po4a/po/ko.po b/doc/man/po4a/po/ko.po index 61f59cd34..eec99e821 100644 --- a/doc/man/po4a/po/ko.po +++ b/doc/man/po4a/po/ko.po @@ -29,7 +29,7 @@ msgstr "mkvextract" #: doc/man/mkvtoolnix-gui.xml:6 #, fuzzy #| msgid "34.0.0" -msgid "40.0.0" +msgid "41.0.0" msgstr "34.0.0" #. type: Content of the date entity diff --git a/doc/man/po4a/po/nl.po b/doc/man/po4a/po/nl.po index ec0117ab9..5a2eb721b 100644 --- a/doc/man/po4a/po/nl.po +++ b/doc/man/po4a/po/nl.po @@ -28,7 +28,7 @@ msgstr "mkvextract" #: doc/man/mkvtoolnix-gui.xml:6 #, fuzzy #| msgid "34.0.0" -msgid "40.0.0" +msgid "41.0.0" msgstr "34.0.0" #. type: Content of the date entity diff --git a/doc/man/po4a/po/pl.po b/doc/man/po4a/po/pl.po index 4747eb057..64bbb6512 100644 --- a/doc/man/po4a/po/pl.po +++ b/doc/man/po4a/po/pl.po @@ -28,7 +28,7 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "40.0.0" +msgid "41.0.0" msgstr "" #. type: Content of the date entity diff --git a/doc/man/po4a/po/uk.po b/doc/man/po4a/po/uk.po index acd9b1832..e7d326aaa 100644 --- a/doc/man/po4a/po/uk.po +++ b/doc/man/po4a/po/uk.po @@ -27,7 +27,7 @@ msgstr "mkvextract" #: doc/man/mkvtoolnix-gui.xml:6 #, fuzzy #| msgid "34.0.0" -msgid "40.0.0" +msgid "41.0.0" msgstr "34.0.0" #. type: Content of the date entity diff --git a/doc/man/po4a/po/zh_CN.po b/doc/man/po4a/po/zh_CN.po index 98d878dcf..fc398ac3a 100644 --- a/doc/man/po4a/po/zh_CN.po +++ b/doc/man/po4a/po/zh_CN.po @@ -29,7 +29,7 @@ msgstr "mkvextract" #: doc/man/mkvtoolnix-gui.xml:6 #, fuzzy #| msgid "34.0.0" -msgid "40.0.0" +msgid "41.0.0" msgstr "34.0.0" #. type: Content of the date entity diff --git a/packaging/centos-fedora-opensuse/mkvtoolnix.spec b/packaging/centos-fedora-opensuse/mkvtoolnix.spec index 953c2be9c..79689ed6c 100644 --- a/packaging/centos-fedora-opensuse/mkvtoolnix.spec +++ b/packaging/centos-fedora-opensuse/mkvtoolnix.spec @@ -4,7 +4,7 @@ Name: mkvtoolnix URL: https://mkvtoolnix.download/ -Version: 40.0.0 +Version: 41.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -168,6 +168,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true %{_datadir}/mkvtoolnix %changelog -n mkvtoolnix +* Fri Dec 6 2019 Moritz Bunkus 41.0.0-1 +- New version + * Sat Nov 9 2019 Moritz Bunkus 40.0.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 3a3429e4a..31663cae9 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (41.0.0-0~bunkus01) eoan; urgency=low + + * New version. + + -- Moritz Bunkus Fri, 06 Dec 2019 18:27:52 +0100 + mkvtoolnix (40.0.0-0~bunkus01) eoan; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index 3bd8c5439..1e92bd153 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "40.0.0" +!define PRODUCT_VERSION "41.0.0" !define PRODUCT_VERSION_BUILD "" !define PRODUCT_PUBLISHER "Moritz Bunkus" !define PRODUCT_WEB_SITE "https://www.bunkus.org/videotools/mkvtoolnix/" diff --git a/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml b/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml index 99781da31..3d3416a70 100644 --- a/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml +++ b/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml @@ -50,6 +50,7 @@ mkvtoolnix + diff --git a/src/common/version.cpp b/src/common/version.cpp index ad7ff20fb..f046d5215 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -23,7 +23,7 @@ #include "common/strings/parsing.h" #include "common/version.h" -#define VERSIONNAME "Old Town Road + Pony" +#define VERSIONNAME "Smarra" version_number_t::version_number_t(const std::string &s) : valid{} diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 35959cbf9..1cf595048 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -5,8 +5,8 @@ mkvextract ICON "../../share/icons/windows/mkvextract.ico" 1 RT_MANIFEST "manifest.xml" 1 VERSIONINFO - FILEVERSION 40, 0, 0, 0 - PRODUCTVERSION 40, 0, 0, 0 + FILEVERSION 41, 0, 0, 0 + PRODUCTVERSION 41, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "40.0.0" + VALUE "FileVersion", "41.0.0" VALUE "InternalName", "mkvextract" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvextract" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "40.0.0" + VALUE "ProductVersion", "41.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index e28e15899..f2a768b8a 100644 --- a/src/info/resources.rc +++ b/src/info/resources.rc @@ -5,8 +5,8 @@ mkvinfo ICON "../../share/icons/windows/mkvinfo.ico" 1 RT_MANIFEST "manifest.xml" 1 VERSIONINFO - FILEVERSION 40, 0, 0, 0 - PRODUCTVERSION 40, 0, 0, 0 + FILEVERSION 41, 0, 0, 0 + PRODUCTVERSION 41, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "40.0.0" + VALUE "FileVersion", "41.0.0" VALUE "InternalName", "mkvinfo" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvinfo" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "40.0.0" + VALUE "ProductVersion", "41.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 426a90c80..4edef428c 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -5,8 +5,8 @@ MATROSKAICON ICON "../../share/icons/windows/mkvmerge.ico" 1 RT_MANIFEST "manifest.xml" 1 VERSIONINFO - FILEVERSION 40, 0, 0, 0 - PRODUCTVERSION 40, 0, 0, 0 + FILEVERSION 41, 0, 0, 0 + PRODUCTVERSION 41, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "40.0.0" + VALUE "FileVersion", "41.0.0" VALUE "InternalName", "mkvmerge" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvmerge" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "40.0.0" + VALUE "ProductVersion", "41.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 1a0558bc8..c065454cf 100644 --- a/src/mkvtoolnix-gui/resources.rc +++ b/src/mkvtoolnix-gui/resources.rc @@ -5,8 +5,8 @@ mkvtoolnix_gui ICON "../../share/icons/windows/mkvtoolnix-gui.ico" 1 RT_MANIFEST "manifest.xml" 1 VERSIONINFO - FILEVERSION 40, 0, 0, 0 - PRODUCTVERSION 40, 0, 0, 0 + FILEVERSION 41, 0, 0, 0 + PRODUCTVERSION 41, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "40.0.0" + VALUE "FileVersion", "41.0.0" VALUE "InternalName", "mkvtoolnix-gui" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvtoolnix-gui" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "40.0.0" + VALUE "ProductVersion", "41.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 4939f45d5..cd2bb45e9 100644 --- a/src/propedit/resources.rc +++ b/src/propedit/resources.rc @@ -5,8 +5,8 @@ mkvpropedit ICON "../../share/icons/windows/mkvpropedit.ico" 1 RT_MANIFEST "manifest.xml" 1 VERSIONINFO - FILEVERSION 40, 0, 0, 0 - PRODUCTVERSION 40, 0, 0, 0 + FILEVERSION 41, 0, 0, 0 + PRODUCTVERSION 41, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "40.0.0" + VALUE "FileVersion", "41.0.0" VALUE "InternalName", "mkvpropedit" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvpropedit" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "40.0.0" + VALUE "ProductVersion", "41.0.0" END END BLOCK "VarFileInfo"