diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 19f1ebbee..bc5336d41 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 31.0.0 for Windows +Building MKVToolNix 32.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index db5dcdb7e..8acedad11 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 32.0.0 "Astral Progressions" 2019-03-12 ## New features and enhancements diff --git a/README.md b/README.md index 2c5c0c619..5e28fedca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 31.0.0 +MKVToolNix 32.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index cd4a6e3dd..43ac4cace 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[31.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[32.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 2b69ddf8b..a04b842b5 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 b669bd273..c3490187e 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 2bfc35752..58afb6cf6 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 c0db3eafe..a210944b2 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 a365ae6ef..74d7d2a9c 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 cfa8f5528..0339548e5 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 8f7eb5fcd..b40e13970 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 2ccf0b23d..28f555a8f 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 e1ac0d671..e714dbbc6 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 42b92770f..61befda43 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 11c2c5065..b7fd561ca 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 1c1e0b2e2..7758666b7 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 "31.0.0" +msgid "32.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 0756c242e..fb1eb23aa 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 321c804b0..3f69d8094 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 "31.0.0" -msgstr "31.0.0" +msgid "32.0.0" +msgstr "32.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 abb53b9e2..62a4538f3 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: 31.0.0 +Version: 32.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -164,6 +164,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true %{_datadir}/mkvtoolnix %changelog -n mkvtoolnix +* Tue Mar 12 2019 Moritz Bunkus 32.0.0-1 +- New version + * Sat Feb 9 2019 Moritz Bunkus 31.0.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index e9593fc51..fd02fca28 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (32.0.0-0~bunkus01) xenial; urgency=low + + * New version. + + -- Moritz Bunkus Tue, 12 Mar 2019 21:28:50 +0100 + mkvtoolnix (31.0.0-0~bunkus01) xenial; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index 58b37c3fd..a2c5314c5 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "31.0.0" +!define PRODUCT_VERSION "32.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 1964cd782..3fcda355b 100644 --- a/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml +++ b/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml @@ -21,6 +21,7 @@ + diff --git a/src/common/version.cpp b/src/common/version.cpp index 9d74d4f2c..7a6b4603d 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 "Dolores In A Shoestand" +#define VERSIONNAME "Astral Progressions" version_number_t::version_number_t(const std::string &s) : valid{} diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 8f51d1013..f323da789 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 31, 0, 0, 0 - PRODUCTVERSION 31, 0, 0, 0 + FILEVERSION 32, 0, 0, 0 + PRODUCTVERSION 32, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "31.0.0" + VALUE "FileVersion", "32.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", "31.0.0" + VALUE "ProductVersion", "32.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index d849657e0..47ec8953d 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 31, 0, 0, 0 - PRODUCTVERSION 31, 0, 0, 0 + FILEVERSION 32, 0, 0, 0 + PRODUCTVERSION 32, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "31.0.0" + VALUE "FileVersion", "32.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", "31.0.0" + VALUE "ProductVersion", "32.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 1c92ccf52..ff225776c 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 31, 0, 0, 0 - PRODUCTVERSION 31, 0, 0, 0 + FILEVERSION 32, 0, 0, 0 + PRODUCTVERSION 32, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "31.0.0" + VALUE "FileVersion", "32.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", "31.0.0" + VALUE "ProductVersion", "32.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 671b4b8ac..829668b86 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 31, 0, 0, 0 - PRODUCTVERSION 31, 0, 0, 0 + FILEVERSION 32, 0, 0, 0 + PRODUCTVERSION 32, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "31.0.0" + VALUE "FileVersion", "32.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", "31.0.0" + VALUE "ProductVersion", "32.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index a731012c4..d7af62202 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 31, 0, 0, 0 - PRODUCTVERSION 31, 0, 0, 0 + FILEVERSION 32, 0, 0, 0 + PRODUCTVERSION 32, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "31.0.0" + VALUE "FileVersion", "32.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", "31.0.0" + VALUE "ProductVersion", "32.0.0" END END BLOCK "VarFileInfo"