diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 9b85e50b7..6f5610e81 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 34.0.0 for Windows +Building MKVToolNix 35.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index d1604fb48..359914c99 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 35.0.0 "All The Love In The World" 2019-06-22 ## New features and enhancements diff --git a/README.md b/README.md index e86cedc54..d42d358ac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 34.0.0 +MKVToolNix 35.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index 733893828..359958f0d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[34.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[35.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 e7b65de17..5ca7de2ed 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 f95dae09c..a0bde9c30 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 51fb797d1..dfe687409 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 91f316efd..4aaf40fe8 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 5d10ad70d..16ab3155e 100644 --- a/doc/man/mkvtoolnix-gui.xml +++ b/doc/man/mkvtoolnix-gui.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/packaging/centos-fedora-opensuse/mkvtoolnix.spec b/packaging/centos-fedora-opensuse/mkvtoolnix.spec index 1100fcec5..32b7e2165 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: 34.0.0 +Version: 35.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 Jun 22 2019 Moritz Bunkus 35.0.0-1 +- New version + * Sat May 18 2019 Moritz Bunkus 34.0.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index a192abe1c..dc05873a8 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (35.0.0-0~bunkus01) xenial; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 22 Jun 2019 11:05:58 +0200 + mkvtoolnix (34.0.0-0~bunkus01) xenial; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index c766bb55a..a93d35e72 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "34.0.0" +!define PRODUCT_VERSION "35.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 1ac499b64..69243caa1 100644 --- a/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml +++ b/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml @@ -31,6 +31,7 @@ mkvtoolnix + diff --git a/src/common/version.cpp b/src/common/version.cpp index 3f88d610f..6672f67b9 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 "Sight and Seen" +#define VERSIONNAME "All The Love In The World" version_number_t::version_number_t(const std::string &s) : valid{} diff --git a/src/extract/resources.rc b/src/extract/resources.rc index d87daa89b..8a9986796 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 34, 0, 0, 0 - PRODUCTVERSION 34, 0, 0, 0 + FILEVERSION 35, 0, 0, 0 + PRODUCTVERSION 35, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "34.0.0" + VALUE "FileVersion", "35.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", "34.0.0" + VALUE "ProductVersion", "35.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 1c59c72af..106c8e76c 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 34, 0, 0, 0 - PRODUCTVERSION 34, 0, 0, 0 + FILEVERSION 35, 0, 0, 0 + PRODUCTVERSION 35, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "34.0.0" + VALUE "FileVersion", "35.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", "34.0.0" + VALUE "ProductVersion", "35.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 9ee55568f..a8d94d095 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 34, 0, 0, 0 - PRODUCTVERSION 34, 0, 0, 0 + FILEVERSION 35, 0, 0, 0 + PRODUCTVERSION 35, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "34.0.0" + VALUE "FileVersion", "35.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", "34.0.0" + VALUE "ProductVersion", "35.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index b98dc7bb8..232c20df6 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 34, 0, 0, 0 - PRODUCTVERSION 34, 0, 0, 0 + FILEVERSION 35, 0, 0, 0 + PRODUCTVERSION 35, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "34.0.0" + VALUE "FileVersion", "35.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", "34.0.0" + VALUE "ProductVersion", "35.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index b4dd92af5..b619cd68b 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 34, 0, 0, 0 - PRODUCTVERSION 34, 0, 0, 0 + FILEVERSION 35, 0, 0, 0 + PRODUCTVERSION 35, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -16,12 +16,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "34.0.0" + VALUE "FileVersion", "35.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", "34.0.0" + VALUE "ProductVersion", "35.0.0" END END BLOCK "VarFileInfo"