diff --git a/NEWS.md b/NEWS.md index c8544e736..c72cc45e6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 10.0.0 "To Drown In You" 2017-03-25 ## New features and enhancements diff --git a/README.Windows.md b/README.Windows.md index 4a3de40d8..23106dc7b 100644 --- a/README.Windows.md +++ b/README.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 9.9.0 for Windows +Building MKVToolNix 10.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/README.md b/README.md index 4284f3964..7836aeb56 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 9.9.0 +MKVToolNix 10.0.0 ================ # Table of contents diff --git a/configure.ac b/configure.ac index 34439449e..155c2c432 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[9.9.0],[https://github.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[10.0.0],[https://github.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) AC_PREREQ(2.50) AC_CONFIG_HEADERS(config.h:config.h.in) diff --git a/debian-upstream/changelog b/debian-upstream/changelog index 94c5d87bb..5cc409d71 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (10.0.0-0~bunkus01) yakkety; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 25 Mar 2017 13:41:28 +0100 + mkvtoolnix (9.9.0-0~bunkus01) yakkety; urgency=low * New version. diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index b3f3373a1..ef3a68fde 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 4f7ae66c6..a5e46d60c 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 1315ca0e8..9c46712ab 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 4d366a3da..43abfbaaf 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 6afb3d50d..2f8f62a89 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 b6f663102..39c001732 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 4dedfb1d3..7069ee632 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 b26516038..fcf213581 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 0c69e13d2..080ef19af 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 884c87bf9..463fc5896 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 c75afdbf5..c7936ab12 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 6e75f28d5..0c9d36746 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 "9.9.0" +msgid "10.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 39aad84af..03e0a0047 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.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 b79657fd4..ad47f9bf1 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 "9.9.0" -msgstr "9.9.0" +msgid "10.0.0" +msgstr "10.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/installer/mkvtoolnix.nsi b/installer/mkvtoolnix.nsi index 9bf5eb951..b97ca82ca 100644 --- a/installer/mkvtoolnix.nsi +++ b/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "9.9.0" +!define PRODUCT_VERSION "10.0.0" !define PRODUCT_VERSION_BUILD "" !define PRODUCT_PUBLISHER "Moritz Bunkus" !define PRODUCT_WEB_SITE "https://www.bunkus.org/videotools/mkvtoolnix/" diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec index e0d3955a7..f32afe925 100644 --- a/mkvtoolnix.spec +++ b/mkvtoolnix.spec @@ -4,7 +4,7 @@ Name: mkvtoolnix URL: https://mkvtoolnix.download/ -Version: 9.9.0 +Version: 10.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -126,6 +126,9 @@ strip ${RPM_BUILD_ROOT}/usr/bin/* %{_datadir}/man/zh_CN %changelog -n mkvtoolnix +* Sat Mar 25 2017 Moritz Bunkus 10.0.0-1 +- New version + * Sun Feb 19 2017 Moritz Bunkus 9.9.0-1 - New version diff --git a/src/common/version.cpp b/src/common/version.cpp index ae819717e..210dfa559 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -18,7 +18,7 @@ #include "common/strings/parsing.h" #include "common/version.h" -#define VERSIONNAME "Pick Up" +#define VERSIONNAME "To Drown In You" version_number_t::version_number_t() : valid(false) diff --git a/src/extract/resources.rc b/src/extract/resources.rc index c79b4c443..567e6e0a8 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 9, 9, 0, 0 - PRODUCTVERSION 9, 9, 0, 0 + FILEVERSION 10, 0, 0, 0 + PRODUCTVERSION 10, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "9.9.0" + VALUE "FileVersion", "10.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", "9.9.0" + VALUE "ProductVersion", "10.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 9a3b013f8..492240919 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 9, 9, 0, 0 - PRODUCTVERSION 9, 9, 0, 0 + FILEVERSION 10, 0, 0, 0 + PRODUCTVERSION 10, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "9.9.0" + VALUE "FileVersion", "10.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", "9.9.0" + VALUE "ProductVersion", "10.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 725c359a7..24c5f2028 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 9, 9, 0, 0 - PRODUCTVERSION 9, 9, 0, 0 + FILEVERSION 10, 0, 0, 0 + PRODUCTVERSION 10, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "9.9.0" + VALUE "FileVersion", "10.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", "9.9.0" + VALUE "ProductVersion", "10.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 41cfdb76e..6f3dd9d69 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 9, 9, 0, 0 - PRODUCTVERSION 9, 9, 0, 0 + FILEVERSION 10, 0, 0, 0 + PRODUCTVERSION 10, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "9.9.0" + VALUE "FileVersion", "10.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", "9.9.0" + VALUE "ProductVersion", "10.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 77c7f4af1..98b64a016 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 9, 9, 0, 0 - PRODUCTVERSION 9, 9, 0, 0 + FILEVERSION 10, 0, 0, 0 + PRODUCTVERSION 10, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "9.9.0" + VALUE "FileVersion", "10.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", "9.9.0" + VALUE "ProductVersion", "10.0.0" END END BLOCK "VarFileInfo"