diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 17dac161c..9b85e50b7 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 33.1.0 for Windows +Building MKVToolNix 34.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index a3ea18f06..9504cb371 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 34.0.0 "Sight and Seen" 2019-05-18 ## Bug fixes diff --git a/README.md b/README.md index 6ac545518..5469c72cd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 33.1.0 +MKVToolNix 34.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index 1f4daa644..733893828 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[33.1.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[34.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 e4caa7c98..e7b65de17 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 a02024ecb..f95dae09c 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 89f9ff2d6..892ef2309 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 0a2688054..91f316efd 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 8d3f4cd51..5d10ad70d 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 5122a69ef..327dc4549 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 63cec1c8e..2b0a93205 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 610ad4dff..e03f8bbca 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 21d9d07c1..c6029c993 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 1675e1c9f..46ebd35e3 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 c472f6ad9..4c136d046 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 90ac29ac8..a952c21fb 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 "33.1.0" +msgid "34.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 a351e1b56..d68967e99 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 3ea12605a..f111ef8e9 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 "33.1.0" -msgstr "33.1.0" +msgid "34.0.0" +msgstr "34.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 82831c1e5..1100fcec5 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: 33.1.0 +Version: 34.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 +* Sat May 18 2019 Moritz Bunkus 34.0.0-1 +- New version + * Sun Apr 14 2019 Moritz Bunkus 33.1.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 193bc9ee0..a192abe1c 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (34.0.0-0~bunkus01) xenial; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 18 May 2019 13:18:51 +0200 + mkvtoolnix (33.1.0-0~bunkus01) xenial; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index b834f543c..c766bb55a 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "33.1.0" +!define PRODUCT_VERSION "34.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 18c9962d6..74d28336c 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 e84dcabf6..3f88d610f 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 "Primrose" +#define VERSIONNAME "Sight and Seen" version_number_t::version_number_t(const std::string &s) : valid{} diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 7923fb6e9..d87daa89b 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 33, 1, 0, 0 - PRODUCTVERSION 33, 1, 0, 0 + FILEVERSION 34, 0, 0, 0 + PRODUCTVERSION 34, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "33.1.0" + VALUE "FileVersion", "34.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", "33.1.0" + VALUE "ProductVersion", "34.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 02b3560fe..1c59c72af 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 33, 1, 0, 0 - PRODUCTVERSION 33, 1, 0, 0 + FILEVERSION 34, 0, 0, 0 + PRODUCTVERSION 34, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "33.1.0" + VALUE "FileVersion", "34.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", "33.1.0" + VALUE "ProductVersion", "34.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 36bd1fa5b..9ee55568f 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 33, 1, 0, 0 - PRODUCTVERSION 33, 1, 0, 0 + FILEVERSION 34, 0, 0, 0 + PRODUCTVERSION 34, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "33.1.0" + VALUE "FileVersion", "34.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", "33.1.0" + VALUE "ProductVersion", "34.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 7f995a507..b98dc7bb8 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 33, 1, 0, 0 - PRODUCTVERSION 33, 1, 0, 0 + FILEVERSION 34, 0, 0, 0 + PRODUCTVERSION 34, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "33.1.0" + VALUE "FileVersion", "34.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", "33.1.0" + VALUE "ProductVersion", "34.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 3aba4d090..b4dd92af5 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 33, 1, 0, 0 - PRODUCTVERSION 33, 1, 0, 0 + FILEVERSION 34, 0, 0, 0 + PRODUCTVERSION 34, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "33.1.0" + VALUE "FileVersion", "34.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", "33.1.0" + VALUE "ProductVersion", "34.0.0" END END BLOCK "VarFileInfo"