diff --git a/NEWS.md b/NEWS.md index c7d4e19b0..d442d1831 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version ? +# Version 12.0.0 "Trust / Lust" 2017-05-20 ## New features and enhancements diff --git a/README.Windows.md b/README.Windows.md index 6134b09f2..a173ad702 100644 --- a/README.Windows.md +++ b/README.Windows.md @@ -1,4 +1,4 @@ -Building MKVToolNix 11.0.0 for Windows +Building MKVToolNix 12.0.0 for Windows ===================================== There is currently only one supported way to build MKVToolNix for diff --git a/README.md b/README.md index c4f648fa8..e4a94824b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MKVToolNix 11.0.0 +MKVToolNix 12.0.0 ================ # Table of contents diff --git a/configure.ac b/configure.ac index 1e580fbe1..92910bc33 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MKVToolNix],[11.0.0],[https://github.com/mbunkus/mkvtoolnix/issues/],[mkvtoolnix]) +AC_INIT([MKVToolNix],[12.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 c748b44ad..87e881b12 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (12.0.0-0~bunkus01) zesty; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 20 May 2017 19:19:10 +0200 + mkvtoolnix (11.0.0-0~bunkus01) zesty; urgency=low * New version. diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index 346ee2d6a..21c9f4f5a 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 400248075..d937ba5c5 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 abadf3c04..d08e6cb28 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 b8eebb867..1c16e7a38 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 cd61f088d..15b224e9d 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 4e02922ae..626dfbed2 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 0081dea29..0b3f2171b 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 624b90611..73e8c46df 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 955de568d..dd9370e37 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 dea26ac31..c97c208a5 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 2f42eb2be..bf868aee0 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 25e59ff71..dceb292bc 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 "11.0.0" +msgid "12.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 0b6411205..804045249 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.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 f2568c671..00ab461c5 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 "11.0.0" -msgstr "11.0.0" +msgid "12.0.0" +msgstr "12.0.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec index 98da5728a..5a1400af3 100644 --- a/mkvtoolnix.spec +++ b/mkvtoolnix.spec @@ -4,7 +4,7 @@ Name: mkvtoolnix URL: https://mkvtoolnix.download/ -Version: 11.0.0 +Version: 12.0.0 Release: 1 Summary: Tools to create, alter and inspect Matroska files Source: %{name}-%{version}.tar.xz @@ -157,6 +157,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true %{_datadir}/mkvtoolnix %changelog -n mkvtoolnix +* Sat May 20 2017 Moritz Bunkus 12.0.0-1 +- New version + * Sat Apr 22 2017 Moritz Bunkus 11.0.0-1 - New version diff --git a/src/common/version.cpp b/src/common/version.cpp index 159669a6c..265baf801 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 "Alive" +#define VERSIONNAME "Trust / Lust" version_number_t::version_number_t() { diff --git a/src/extract/resources.rc b/src/extract/resources.rc index af87b61c8..8a4455601 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 11, 0, 0, 0 - PRODUCTVERSION 11, 0, 0, 0 + FILEVERSION 12, 0, 0, 0 + PRODUCTVERSION 12, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "11.0.0" + VALUE "FileVersion", "12.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", "11.0.0" + VALUE "ProductVersion", "12.0.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 5c9ea8270..d23597e89 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 11, 0, 0, 0 - PRODUCTVERSION 11, 0, 0, 0 + FILEVERSION 12, 0, 0, 0 + PRODUCTVERSION 12, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "11.0.0" + VALUE "FileVersion", "12.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", "11.0.0" + VALUE "ProductVersion", "12.0.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 8b2baffa5..824a0a134 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 11, 0, 0, 0 - PRODUCTVERSION 11, 0, 0, 0 + FILEVERSION 12, 0, 0, 0 + PRODUCTVERSION 12, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "11.0.0" + VALUE "FileVersion", "12.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", "11.0.0" + VALUE "ProductVersion", "12.0.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index da3540a80..40368fdf8 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 11, 0, 0, 0 - PRODUCTVERSION 11, 0, 0, 0 + FILEVERSION 12, 0, 0, 0 + PRODUCTVERSION 12, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "11.0.0" + VALUE "FileVersion", "12.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", "11.0.0" + VALUE "ProductVersion", "12.0.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index a64a8952e..677bfdf71 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 11, 0, 0, 0 - PRODUCTVERSION 11, 0, 0, 0 + FILEVERSION 12, 0, 0, 0 + PRODUCTVERSION 12, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "11.0.0" + VALUE "FileVersion", "12.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", "11.0.0" + VALUE "ProductVersion", "12.0.0" END END BLOCK "VarFileInfo"