From 69c74e34157c9c9e6e04e4a87811707c90d164ed Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 26 Aug 2018 12:54:00 +0200 Subject: [PATCH] bump version number, set release code name --- Building.for.Windows.md | 2 +- NEWS.md | 2 +- README.md | 2 +- configure.ac | 2 +- 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 ++-- packaging/centos-fedora-opensuse/mkvtoolnix.spec | 5 ++++- packaging/debian/changelog | 6 ++++++ packaging/windows/installer/mkvtoolnix.nsi | 2 +- share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml | 1 + 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 ++++---- 28 files changed, 64 insertions(+), 54 deletions(-) diff --git a/Building.for.Windows.md b/Building.for.Windows.md index 56ad65a1b..ceb4042d1 100644 --- a/Building.for.Windows.md +++ b/Building.for.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 25.0.0 for Windows +Building MKVToolNix 26.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/NEWS.md b/NEWS.md index e1e248c50..990bf7d3f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 26.0.0 "In The Game" 2018-08-26 ## New features and enhancements diff --git a/README.md b/README.md index 14956c9ad..8dfa1429a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 25.0.0 +MKVToolNix 26.0.0 ================= # Table of contents diff --git a/configure.ac b/configure.ac index c53b5d4d4..660d6c133 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[25.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[26.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 0e7a5febd..c906d62be 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 0821702b2..c887e7ae7 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 574469ab6..afc81433d 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 8b5bc4e16..117878c56 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 726d0aa55..ecb5a89cc 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 a50ceec46..4275ba2dd 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 42de79abf..4dc511bcf 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 4c087edef..579ef7496 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 021aa9972..01aa170e0 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 8c0bd4a08..bea871237 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 b5212688f..ee39c6ac6 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 4fa8baf2c..ab54dae4b 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 "25.0.0" +msgid "26.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 e3122c3ae..ca3d8a6e0 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 d4f5f4e7d..f10d770d5 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 "25.0.0" -msgstr "25.0.0" +msgid "26.0.0" +msgstr "26.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 b2f0e1c74..47bf55ac5 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: 25.0.0 +Version: 26.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -159,6 +159,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true %{_datadir}/mkvtoolnix %changelog -n mkvtoolnix +* Sun Aug 26 2018 Moritz Bunkus 26.0.0-1 +- New version + * Thu Jul 12 2018 Moritz Bunkus 25.0.0-1 - New version diff --git a/packaging/debian/changelog b/packaging/debian/changelog index e44f16ea6..f62013937 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (26.0.0-0~bunkus01) bionic; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 26 Aug 2018 12:53:12 +0200 + mkvtoolnix (25.0.0-0~bunkus01) bionic; urgency=low * New version. diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index b3f846032..d625bd6b5 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "25.0.0" +!define PRODUCT_VERSION "26.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 a9f2f1037..d3049c4e3 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 7d7c9822d..074909cda 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 "Prog Noir" +#define VERSIONNAME "In The Game" version_number_t::version_number_t() { diff --git a/src/extract/resources.rc b/src/extract/resources.rc index d41f0c06c..f072ca036 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 25, 0, 0, 0 - PRODUCTVERSION 25, 0, 0, 0 + FILEVERSION 26, 0, 0, 0 + PRODUCTVERSION 26, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "25.0.0" + VALUE "FileVersion", "26.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", "25.0.0" + VALUE "ProductVersion", "26.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 980eea069..d00061f8b 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 25, 0, 0, 0 - PRODUCTVERSION 25, 0, 0, 0 + FILEVERSION 26, 0, 0, 0 + PRODUCTVERSION 26, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "25.0.0" + VALUE "FileVersion", "26.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", "25.0.0" + VALUE "ProductVersion", "26.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 157da59a4..e5782d273 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 25, 0, 0, 0 - PRODUCTVERSION 25, 0, 0, 0 + FILEVERSION 26, 0, 0, 0 + PRODUCTVERSION 26, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "25.0.0" + VALUE "FileVersion", "26.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", "25.0.0" + VALUE "ProductVersion", "26.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index fea360a87..148a29efe 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 25, 0, 0, 0 - PRODUCTVERSION 25, 0, 0, 0 + FILEVERSION 26, 0, 0, 0 + PRODUCTVERSION 26, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "25.0.0" + VALUE "FileVersion", "26.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", "25.0.0" + VALUE "ProductVersion", "26.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 40cd399ae..ad2c50f25 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 25, 0, 0, 0 - PRODUCTVERSION 25, 0, 0, 0 + FILEVERSION 26, 0, 0, 0 + PRODUCTVERSION 26, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "25.0.0" + VALUE "FileVersion", "26.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", "25.0.0" + VALUE "ProductVersion", "26.0.0" END END BLOCK "VarFileInfo"