diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 20bee808e..56ad65a1b 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 24.0.0 for Windows +Building MKVToolNix 25.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index d71873b18..44887218c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 25.0.0 "Prog Noir" 2018-07-12 ## New features and enhancements diff --git a/README.md b/README.md index 207ff47d6..14956c9ad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 24.0.0 +MKVToolNix 25.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index a2f611769..c53b5d4d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[24.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[25.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 2124516e3..0e7a5febd 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 a080fec25..0821702b2 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 ff9a97520..574469ab6 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 ec269e33c..8b5bc4e16 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 e717d854d..726d0aa55 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 2d5390154..5c95a6cc4 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 "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.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 71123cd35..42de79abf 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 "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.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 525064271..4c087edef 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 "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.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 947f22e02..021aa9972 100644 --- a/doc/man/po4a/po/ja.po +++ b/doc/man/po4a/po/ja.po @@ -26,8 +26,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/ko.po b/doc/man/po4a/po/ko.po index 5562aa3f2..8c0bd4a08 100644 --- a/doc/man/po4a/po/ko.po +++ b/doc/man/po4a/po/ko.po @@ -27,8 +27,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/nl.po b/doc/man/po4a/po/nl.po index 11a336f37..b5212688f 100644 --- a/doc/man/po4a/po/nl.po +++ b/doc/man/po4a/po/nl.po @@ -26,8 +26,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/pl.po b/doc/man/po4a/po/pl.po index e942fa071..4fa8baf2c 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 "24.0.0" +msgid "25.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 0c89ca8c5..e3122c3ae 100644 --- a/doc/man/po4a/po/uk.po +++ b/doc/man/po4a/po/uk.po @@ -25,8 +25,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mkvtoolnix-gui.xml:6 -msgid "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/zh_CN.po b/doc/man/po4a/po/zh_CN.po index 320704657..d4f5f4e7d 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 "24.0.0" -msgstr "24.0.0" +msgid "25.0.0" +msgstr "25.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 cc78cc9d9..6ba59f950 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: 24.0.0 +Version: 25.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -158,6 +158,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true %{_datadir}/mkvtoolnix %changelog -n mkvtoolnix +* Thu Jul 12 2018 Moritz Bunkus 25.0.0-1 +- New version + * Sun Jun 10 2018 Moritz Bunkus 24.0.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 2cd29a924..e44f16ea6 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (25.0.0-0~bunkus01) bionic; urgency=low + + * New version. + + -- Moritz Bunkus Thu, 12 Jul 2018 19:55:51 +0200 + mkvtoolnix (24.0.0-0~bunkus01) bionic; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index 3dd0aecad..8365b77d4 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "24.0.0" +!define PRODUCT_VERSION "25.0.0" !define PRODUCT_VERSION_BUILD "" !define PRODUCT_PUBLISHER "Moritz Bunkus" !define PRODUCT_WEB_SITE "https://www.bunkus.org/videotools/mkvtoolnix/" diff --git a/src/common/version.cpp b/src/common/version.cpp index f337fd301..7d7c9822d 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -22,7 +22,7 @@ #include "common/strings/parsing.h" #include "common/version.h" -#define VERSIONNAME "Beyond The Pale" +#define VERSIONNAME "Prog Noir" version_number_t::version_number_t() { diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 0d25eecb4..d41f0c06c 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -7,8 +7,8 @@ mkvextract ICON "../../share/icons/windows/mkvextract.ico" #endif 1 VERSIONINFO - FILEVERSION 24, 0, 0, 0 - PRODUCTVERSION 24, 0, 0, 0 + FILEVERSION 25, 0, 0, 0 + PRODUCTVERSION 25, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "24.0.0" + VALUE "FileVersion", "25.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", "24.0.0" + VALUE "ProductVersion", "25.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 630855409..980eea069 100644 --- a/src/info/resources.rc +++ b/src/info/resources.rc @@ -7,8 +7,8 @@ mkvinfo ICON "../../share/icons/windows/mkvinfo.ico" #endif 1 VERSIONINFO - FILEVERSION 24, 0, 0, 0 - PRODUCTVERSION 24, 0, 0, 0 + FILEVERSION 25, 0, 0, 0 + PRODUCTVERSION 25, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "24.0.0" + VALUE "FileVersion", "25.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", "24.0.0" + VALUE "ProductVersion", "25.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 9a9f82d51..157da59a4 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -7,8 +7,8 @@ MATROSKAICON ICON "../../share/icons/windows/mkvmerge.ico" #endif 1 VERSIONINFO - FILEVERSION 24, 0, 0, 0 - PRODUCTVERSION 24, 0, 0, 0 + FILEVERSION 25, 0, 0, 0 + PRODUCTVERSION 25, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "24.0.0" + VALUE "FileVersion", "25.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", "24.0.0" + VALUE "ProductVersion", "25.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 9464e3124..fea360a87 100644 --- a/src/mkvtoolnix-gui/resources.rc +++ b/src/mkvtoolnix-gui/resources.rc @@ -7,8 +7,8 @@ mkvtoolnix_gui ICON "../../share/icons/windows/mkvtoolnix-gui.ico" #endif 1 VERSIONINFO - FILEVERSION 24, 0, 0, 0 - PRODUCTVERSION 24, 0, 0, 0 + FILEVERSION 25, 0, 0, 0 + PRODUCTVERSION 25, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "24.0.0" + VALUE "FileVersion", "25.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", "24.0.0" + VALUE "ProductVersion", "25.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 9e611a99b..40cd399ae 100644 --- a/src/propedit/resources.rc +++ b/src/propedit/resources.rc @@ -7,8 +7,8 @@ mkvpropedit ICON "../../share/icons/windows/mkvpropedit.ico" #endif 1 VERSIONINFO - FILEVERSION 24, 0, 0, 0 - PRODUCTVERSION 24, 0, 0, 0 + FILEVERSION 25, 0, 0, 0 + PRODUCTVERSION 25, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "24.0.0" + VALUE "FileVersion", "25.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", "24.0.0" + VALUE "ProductVersion", "25.0.0" END END BLOCK "VarFileInfo"