diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 663fdc3e8..a7bc05f94 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 48.0.0 for Windows +Building MKVToolNix 49.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index d41001e52..1cb702951 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 49.0.0 "Sick Of Losing Soulmates" 2020-08-02 ## New features and enhancements diff --git a/README.md b/README.md index da2716f14..24d3c8ead 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 48.0.0 +MKVToolNix 49.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index abc170761..909d30b0f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[48.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[49.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 33d32796d..87adbb43e 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 9e1185307..e9e080446 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 82aeacc0d..33121a132 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 0208253cb..e84cd40b6 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 adb78e9e3..1ad095b73 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 4b487bb16..978a4ac7a 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 "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.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 ba1c08e23..cdb2e7720 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 "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.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 d32b9907d..72f259fcd 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 "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/fr.po b/doc/man/po4a/po/fr.po index e8449bca3..24d89389b 100644 --- a/doc/man/po4a/po/fr.po +++ b/doc/man/po4a/po/fr.po @@ -32,8 +32,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/it.po b/doc/man/po4a/po/it.po index f80ab9f8b..2b8c5c062 100644 --- a/doc/man/po4a/po/it.po +++ b/doc/man/po4a/po/it.po @@ -29,8 +29,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.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 ecf66ecc6..a41717314 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 "48.0.0" +msgid "49.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 af4dcbfd9..59f2de109 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 "48.0.0" +msgid "49.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 a665b51ec..9b6a99a2a 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 "48.0.0" +msgid "49.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 6b9f92851..0cacf116b 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 "48.0.0" +msgid "49.0.0" msgstr "" #. type: Content of the date entity diff --git a/doc/man/po4a/po/ru.po b/doc/man/po4a/po/ru.po index 24539a269..30956477f 100644 --- a/doc/man/po4a/po/ru.po +++ b/doc/man/po4a/po/ru.po @@ -29,8 +29,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/uk.po b/doc/man/po4a/po/uk.po index e57e8efe9..556769ee1 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 "48.0.0" +msgid "49.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 fcb4bbf2f..a05cca235 100644 --- a/doc/man/po4a/po/zh_CN.po +++ b/doc/man/po4a/po/zh_CN.po @@ -27,8 +27,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/zh_TW.po b/doc/man/po4a/po/zh_TW.po index 1d627da13..fd2fb7503 100644 --- a/doc/man/po4a/po/zh_TW.po +++ b/doc/man/po4a/po/zh_TW.po @@ -28,8 +28,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "48.0.0" -msgstr "48.0.0" +msgid "49.0.0" +msgstr "49.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/packaging/centos-fedora-opensuse/mkvtoolnix.spec b/packaging/centos-fedora-opensuse/mkvtoolnix.spec index 2d509db3d..834d3b1a0 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: 48.0.0 +Version: 49.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -172,6 +172,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true %{_datadir}/mkvtoolnix %changelog -n mkvtoolnix +* Sun Aug 2 2020 Moritz Bunkus 49.0.0-1 +- New version + * Sat Jun 27 2020 Moritz Bunkus 48.0.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 5c01d6b5a..ff92b2855 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (49.0.0-0~bunkus01) focal; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 02 Aug 2020 13:13:55 +0200 + mkvtoolnix (48.0.0-0~bunkus01) focal; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index fa6146893..e9e40afce 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "48.0.0" +!define PRODUCT_VERSION "49.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 bde68c125..cd6f2af1f 100644 --- a/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml +++ b/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml @@ -57,6 +57,7 @@ mkvtoolnix + diff --git a/src/common/version.cpp b/src/common/version.cpp index e006a77d7..f7c1099ea 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 "Fortress Around Your Heart" +#define VERSIONNAME "Sick Of Losing Soulmates" version_number_t::version_number_t(const std::string &s) : valid{} diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 4b933fd47..d866ade2c 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 48, 0, 0, 0 - PRODUCTVERSION 48, 0, 0, 0 + FILEVERSION 49, 0, 0, 0 + PRODUCTVERSION 49, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "48.0.0" + VALUE "FileVersion", "49.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", "48.0.0" + VALUE "ProductVersion", "49.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index cc03044ee..f9ab0e188 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 48, 0, 0, 0 - PRODUCTVERSION 48, 0, 0, 0 + FILEVERSION 49, 0, 0, 0 + PRODUCTVERSION 49, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "48.0.0" + VALUE "FileVersion", "49.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", "48.0.0" + VALUE "ProductVersion", "49.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index c177d5423..501575cd5 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 48, 0, 0, 0 - PRODUCTVERSION 48, 0, 0, 0 + FILEVERSION 49, 0, 0, 0 + PRODUCTVERSION 49, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "48.0.0" + VALUE "FileVersion", "49.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", "48.0.0" + VALUE "ProductVersion", "49.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 4af444c06..7656c6505 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 48, 0, 0, 0 - PRODUCTVERSION 48, 0, 0, 0 + FILEVERSION 49, 0, 0, 0 + PRODUCTVERSION 49, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "48.0.0" + VALUE "FileVersion", "49.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", "48.0.0" + VALUE "ProductVersion", "49.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 5ed998de7..15fa342eb 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 48, 0, 0, 0 - PRODUCTVERSION 48, 0, 0, 0 + FILEVERSION 49, 0, 0, 0 + PRODUCTVERSION 49, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "48.0.0" + VALUE "FileVersion", "49.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", "48.0.0" + VALUE "ProductVersion", "49.0.0" END END BLOCK "VarFileInfo"