bump version number, set release code name

2024-12-23 19:31:44 +00:00 · 2018-07-12 19:56:19 +02:00 · 2018-07-12 19:56:19 +02:00 · e58bf47f73
commit e58bf47f73
parent c2dcb6fe16
27 changed files with 63 additions and 54 deletions
--- a/Building.for.Windows.md
+++ b/Building.for.Windows.md
@ -1,4 +1,4 @@
-Building MKVToolNix 24.0.0 for Windows
+Building MKVToolNix 25.0.0 for Windows
 =====================================

 There is currently only one supported way to build MKVToolNix for
--- a/NEWS.md
+++ b/NEWS.md
@ -1,4 +1,4 @@
-# Version ?
+# Version 25.0.0 "Prog Noir" 2018-07-12

 ## New features and enhancements

--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-MKVToolNix 24.0.0
+MKVToolNix 25.0.0
 =================

 # Table of contents
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT([MKVToolNix],[24.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix])
+AC_INIT([MKVToolNix],[25.0.0],[https://gitlab.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix])
 AC_PREREQ(2.50)

 AC_CONFIG_HEADERS(config.h:config.h.in)
--- a/doc/man/mkvextract.xml
+++ b/doc/man/mkvextract.xml
@ -3,8 +3,8 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
 <!ENTITY product "mkvextract">
-<!ENTITY version "24.0.0">
-<!ENTITY date "2018-06-10">
+<!ENTITY version "25.0.0">
+<!ENTITY date "2018-07-12">

 <!ENTITY mkvmerge "<citerefentry><refentrytitle>mkvmerge</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY mkvinfo "<citerefentry><refentrytitle>mkvinfo</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
--- a/doc/man/mkvinfo.xml
+++ b/doc/man/mkvinfo.xml
@ -3,8 +3,8 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
 <!ENTITY product "mkvinfo">
-<!ENTITY version "24.0.0">
-<!ENTITY date "2018-06-10">
+<!ENTITY version "25.0.0">
+<!ENTITY date "2018-07-12">

 <!ENTITY mkvmerge "<citerefentry><refentrytitle>mkvmerge</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY mkvinfo "<citerefentry><refentrytitle>mkvinfo</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
--- a/doc/man/mkvmerge.xml
+++ b/doc/man/mkvmerge.xml
@ -3,8 +3,8 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
 <!ENTITY product "mkvmerge">
-<!ENTITY version "24.0.0">
-<!ENTITY date "2018-06-10">
+<!ENTITY version "25.0.0">
+<!ENTITY date "2018-07-12">

 <!ENTITY mkvmerge "<citerefentry><refentrytitle>mkvmerge</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY mkvinfo "<citerefentry><refentrytitle>mkvinfo</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
--- a/doc/man/mkvpropedit.xml
+++ b/doc/man/mkvpropedit.xml
@ -3,8 +3,8 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
 <!ENTITY product "mkvpropedit">
-<!ENTITY version "24.0.0">
-<!ENTITY date "2018-06-10">
+<!ENTITY version "25.0.0">
+<!ENTITY date "2018-07-12">

 <!ENTITY mkvmerge "<citerefentry><refentrytitle>mkvmerge</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY mkvinfo "<citerefentry><refentrytitle>mkvinfo</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
--- a/doc/man/mkvtoolnix-gui.xml
+++ b/doc/man/mkvtoolnix-gui.xml
@ -3,8 +3,8 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
 <!ENTITY product "mkvtoolnix-gui">
-<!ENTITY version "24.0.0">
-<!ENTITY date "2018-06-10">
+<!ENTITY version "25.0.0">
+<!ENTITY date "2018-07-12">

 <!ENTITY mkvmerge "<citerefentry><refentrytitle>mkvmerge</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY mkvinfo "<citerefentry><refentrytitle>mkvinfo</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
+msgid "25.0.0"
 msgstr ""

 #. type: Content of the date entity
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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 "24.0.0"
-msgstr "24.0.0"
+msgid "25.0.0"
+msgstr "25.0.0"

 #. type: Content of the date entity
 #: doc/man/mkvextract.xml:7
--- 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: 24.0.0
+Version: 25.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
+* Thu Jul 12 2018 Moritz Bunkus <moritz@bunkus.org> 25.0.0-1
+- New version
+
 * Sun Jun 10 2018 Moritz Bunkus <moritz@bunkus.org> 24.0.0-1
 - New version

--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@ -1,3 +1,9 @@
+mkvtoolnix (25.0.0-0~bunkus01) bionic; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Thu, 12 Jul 2018 19:55:51 +0200
+
 mkvtoolnix (24.0.0-0~bunkus01) bionic; urgency=low

  * New version.
--- a/packaging/windows/installer/mkvtoolnix.nsi
+++ b/packaging/windows/installer/mkvtoolnix.nsi
@ -1,5 +1,5 @@
 !define PRODUCT_NAME "MKVToolNix"
-!define PRODUCT_VERSION "24.0.0"
+!define PRODUCT_VERSION "25.0.0"
 !define PRODUCT_VERSION_BUILD ""
 !define PRODUCT_PUBLISHER "Moritz Bunkus"
 !define PRODUCT_WEB_SITE "https://www.bunkus.org/videotools/mkvtoolnix/"
--- 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 "Beyond The Pale"
+#define VERSIONNAME "Prog Noir"

 version_number_t::version_number_t()
 {
--- 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 24, 0, 0, 0
- PRODUCTVERSION 24, 0, 0, 0
+ FILEVERSION 25, 0, 0, 0
+ PRODUCTVERSION 25, 0, 0, 0
 FILEFLAGSMASK 0x3f
 FILEOS 0x4
 BEGIN
@ -18,12 +18,12 @@ BEGIN
    BEGIN
      VALUE "CompanyName", "Moritz Bunkus"
      VALUE "FileDescription", "mkvextract"
-      VALUE "FileVersion", "24.0.0"
+      VALUE "FileVersion", "25.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", "24.0.0"
+      VALUE "ProductVersion", "25.0.0"
    END
  END
  BLOCK "VarFileInfo"
--- 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 24, 0, 0, 0
- PRODUCTVERSION 24, 0, 0, 0
+ FILEVERSION 25, 0, 0, 0
+ PRODUCTVERSION 25, 0, 0, 0
 FILEFLAGSMASK 0x3f
 FILEOS 0x4
 BEGIN
@ -18,12 +18,12 @@ BEGIN
    BEGIN
      VALUE "CompanyName", "Moritz Bunkus"
      VALUE "FileDescription", "mkvinfo"
-      VALUE "FileVersion", "24.0.0"
+      VALUE "FileVersion", "25.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", "24.0.0"
+      VALUE "ProductVersion", "25.0.0"
    END
  END
  BLOCK "VarFileInfo"
--- 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 24, 0, 0, 0
- PRODUCTVERSION 24, 0, 0, 0
+ FILEVERSION 25, 0, 0, 0
+ PRODUCTVERSION 25, 0, 0, 0
 FILEFLAGSMASK 0x3f
 FILEOS 0x4
 BEGIN
@ -18,12 +18,12 @@ BEGIN
    BEGIN
      VALUE "CompanyName", "Moritz Bunkus"
      VALUE "FileDescription", "mkvmerge"
-      VALUE "FileVersion", "24.0.0"
+      VALUE "FileVersion", "25.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", "24.0.0"
+      VALUE "ProductVersion", "25.0.0"
    END
  END
  BLOCK "VarFileInfo"
--- 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 24, 0, 0, 0
- PRODUCTVERSION 24, 0, 0, 0
+ FILEVERSION 25, 0, 0, 0
+ PRODUCTVERSION 25, 0, 0, 0
 FILEFLAGSMASK 0x3f
 FILEOS 0x4
 BEGIN
@ -18,12 +18,12 @@ BEGIN
    BEGIN
      VALUE "CompanyName", "Moritz Bunkus"
      VALUE "FileDescription", "mkvtoolnix-gui"
-      VALUE "FileVersion", "24.0.0"
+      VALUE "FileVersion", "25.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", "24.0.0"
+      VALUE "ProductVersion", "25.0.0"
    END
  END
  BLOCK "VarFileInfo"
--- 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 24, 0, 0, 0
- PRODUCTVERSION 24, 0, 0, 0
+ FILEVERSION 25, 0, 0, 0
+ PRODUCTVERSION 25, 0, 0, 0
 FILEFLAGSMASK 0x3f
 FILEOS 0x4
 BEGIN
@ -18,12 +18,12 @@ BEGIN
    BEGIN
      VALUE "CompanyName", "Moritz Bunkus"
      VALUE "FileDescription", "mkvpropedit"
-      VALUE "FileVersion", "24.0.0"
+      VALUE "FileVersion", "25.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", "24.0.0"
+      VALUE "ProductVersion", "25.0.0"
    END
  END
  BLOCK "VarFileInfo"