From 91482380e2fb76e6c9f4f8fd37af113e20bb5c59 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 10 Jun 2018 11:39:12 +0200 Subject: [PATCH] bump version number, set release code name --- Building.for.Windows.md | 2 +- NEWS.md | 2 +- README.md | 2 +- configure.ac | 2 +- debian-upstream/changelog | 6 ++++++ doc/man/mkvextract.xml | 4 ++-- doc/man/mkvinfo.xml | 4 ++-- doc/man/mkvmerge.xml | 4 ++-- doc/man/mkvpropedit.xml | 4 ++-- doc/man/mkvtoolnix-gui.xml | 4 ++-- doc/man/po4a/po/ca.po | 4 ++-- doc/man/po4a/po/de.po | 4 ++-- doc/man/po4a/po/es.po | 4 ++-- doc/man/po4a/po/ja.po | 4 ++-- doc/man/po4a/po/ko.po | 4 ++-- doc/man/po4a/po/nl.po | 4 ++-- doc/man/po4a/po/pl.po | 2 +- doc/man/po4a/po/uk.po | 4 ++-- doc/man/po4a/po/zh_CN.po | 4 ++-- installer/mkvtoolnix.nsi | 2 +- mkvtoolnix.spec | 5 ++++- src/common/version.cpp | 2 +- src/extract/resources.rc | 8 ++++---- src/info/resources.rc | 8 ++++---- src/merge/resources.rc | 8 ++++---- src/mkvtoolnix-gui/resources.rc | 8 ++++---- src/propedit/resources.rc | 8 ++++---- tools/appimage/build.sh | 2 +- 28 files changed, 64 insertions(+), 55 deletions(-) diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 189023fe7..7b7fc2576 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 23.0.0 for Windows +Building MKVToolNix 24.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index 1d3618be1..3a5ec9223 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 24.0.0 "Beyond The Pale" 2018-06-10 ## New features and enhancements diff --git a/README.md b/README.md index e48e1689d..207ff47d6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 23.0.0 +MKVToolNix 24.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index 2d5252db7..a2f611769 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[23.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[24.0.0],[https://gitlab.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 3cad5ba1c..2cd29a924 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (24.0.0-0~bunkus01) bionic; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 10 Jun 2018 11:32:58 +0200 + mkvtoolnix (23.0.0-0~bunkus01) bionic; urgency=low * New version. diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index f11df352f..2124516e3 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 a12c9af9f..a080fec25 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 2b190f57c..ff9a97520 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 d1859729b..ec269e33c 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 0a006af23..e717d854d 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 222abc46e..2d5390154 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 160236f18..71123cd35 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 d33c5688e..22a184012 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 188866b39..947f22e02 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 fa0801a7f..5562aa3f2 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 be4d5ced8..11a336f37 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 6a85b572f..e942fa071 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 "23.0.0" +msgid "24.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 6d51187f8..0c89ca8c5 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.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 70971b59a..06d65accf 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 "23.0.0" -msgstr "23.0.0" +msgid "24.0.0" +msgstr "24.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/installer/mkvtoolnix.nsi b/installer/mkvtoolnix.nsi index 0b496d1cc..021f8e084 100644 --- a/installer/mkvtoolnix.nsi +++ b/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "23.0.0" +!define PRODUCT_VERSION "24.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 96e94a06a..cc78cc9d9 100644 --- a/mkvtoolnix.spec +++ b/mkvtoolnix.spec @@ -4,7 +4,7 @@ Name: mkvtoolnix URL: https://mkvtoolnix.download/ -Version: 23.0.0 +Version: 24.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 +* Sun Jun 10 2018 Moritz Bunkus 24.0.0-1 +- New version + * Wed May 2 2018 Moritz Bunkus 23.0.0-1 - New version diff --git a/src/common/version.cpp b/src/common/version.cpp index dcd33388e..2fc96cb2e 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 "The Bride Said No" +#define VERSIONNAME "Beyond The Pale" version_number_t::version_number_t() { diff --git a/src/extract/resources.rc b/src/extract/resources.rc index fe812b696..0d25eecb4 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 23, 0, 0, 0 - PRODUCTVERSION 23, 0, 0, 0 + FILEVERSION 24, 0, 0, 0 + PRODUCTVERSION 24, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "23.0.0" + VALUE "FileVersion", "24.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", "23.0.0" + VALUE "ProductVersion", "24.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 5254c6b67..630855409 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 23, 0, 0, 0 - PRODUCTVERSION 23, 0, 0, 0 + FILEVERSION 24, 0, 0, 0 + PRODUCTVERSION 24, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "23.0.0" + VALUE "FileVersion", "24.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", "23.0.0" + VALUE "ProductVersion", "24.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 634319d8f..9a9f82d51 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 23, 0, 0, 0 - PRODUCTVERSION 23, 0, 0, 0 + FILEVERSION 24, 0, 0, 0 + PRODUCTVERSION 24, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "23.0.0" + VALUE "FileVersion", "24.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", "23.0.0" + VALUE "ProductVersion", "24.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index c3e1ed3c6..9464e3124 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 23, 0, 0, 0 - PRODUCTVERSION 23, 0, 0, 0 + FILEVERSION 24, 0, 0, 0 + PRODUCTVERSION 24, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "23.0.0" + VALUE "FileVersion", "24.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", "23.0.0" + VALUE "ProductVersion", "24.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index e7ad8f897..9e611a99b 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 23, 0, 0, 0 - PRODUCTVERSION 23, 0, 0, 0 + FILEVERSION 24, 0, 0, 0 + PRODUCTVERSION 24, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "23.0.0" + VALUE "FileVersion", "24.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", "23.0.0" + VALUE "ProductVersion", "24.0.0" END END BLOCK "VarFileInfo" diff --git a/tools/appimage/build.sh b/tools/appimage/build.sh index a2a3394cf..cb06aa4ce 100755 --- a/tools/appimage/build.sh +++ b/tools/appimage/build.sh @@ -33,7 +33,7 @@ JOBS=4 CXX="g++" #VERSION="git" -VERSION="23.0.0" +VERSION="24.0.0" mtxdir="mkvtoolnix-$VERSION" mtxurl="https://mkvtoolnix.download/sources/${mtxdir}.tar.xz"