From 12e69dad4070bfcd3b456dba064e757328e32aec Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 12 Dec 2009 15:18:56 +0100 Subject: [PATCH] Added the release message, bumped the version number, set the release code name. --- ChangeLog | 2 ++ README | 2 +- README.Windows.txt | 2 +- configure.in | 2 +- contrib/fedora-core.spec | 2 +- contrib/opensuse-10.spec | 2 +- debian-upstream/changelog | 6 ++++++ doc/man/mkvextract.1 | 6 +++--- doc/man/mkvextract.xml | 4 ++-- doc/man/mkvinfo.1 | 6 +++--- doc/man/mkvinfo.xml | 4 ++-- doc/man/mkvmerge.1 | 6 +++--- doc/man/mkvmerge.xml | 4 ++-- doc/man/mkvpropedit.1 | 6 +++--- doc/man/mkvpropedit.xml | 4 ++-- doc/man/mmg.1 | 6 +++--- doc/man/mmg.xml | 4 ++-- installer/mkvtoolnix-unicode.nsi | 2 +- src/common/version.cpp | 2 +- src/extract/resources.rc | 8 ++++---- src/info/resources.rc | 8 ++++---- src/merge/resources.rc | 8 ++++---- src/mmg/mmg-resources.rc | 8 ++++---- 23 files changed, 56 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15c919f75..f05a0d488 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-12-12 Moritz Bunkus + * Released v3.0.0. + * mmg: enhancement: Added support for showing the muxing progress for both normal muxes and the job manager in Windows 7's taskbar. diff --git a/README b/README index 72fdd5548..fdab103a8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -MKVToolNix 2.9.9 +MKVToolNix 3.0.0 ================ With these tools one can get information about (mkvinfo) Matroska diff --git a/README.Windows.txt b/README.Windows.txt index ca3d520ef..a67ac1bbe 100644 --- a/README.Windows.txt +++ b/README.Windows.txt @@ -1,4 +1,4 @@ -mkvtoolnix 2.9.9 and Windows +mkvtoolnix 3.0.0 and Windows ---------------------------- ---[ NOTE 1 ]--------------------------------------------------------- diff --git a/configure.in b/configure.in index 4616426ed..c267b28e9 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.50) AC_CONFIG_HEADERS(config.h:config.h.in) PACKAGE="mkvtoolnix" -VERSION="2.9.9" +VERSION="3.0.0" AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index b5cdbc9d2..1eb834006 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -2,7 +2,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 2.9.9 +Version: 3.0.0 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec index 7e5c0c02e..800e0b622 100644 --- a/contrib/opensuse-10.spec +++ b/contrib/opensuse-10.spec @@ -8,7 +8,7 @@ BuildRequires: expat flac flac-devel gcc-c++ gtk2 gtk2-devel libogg libogg-devel Name: mkvtoolnix URL: http://www.bunkus.org/videotools/mkvtoolnix/ -Version: 2.9.9 +Version: 3.0.0 Release: 1 Summary: tools to create, alter and inspect Matroska files License: GPL diff --git a/debian-upstream/changelog b/debian-upstream/changelog index faa901595..cb4e70519 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (3.0.0) karmic; urgency=low + + * New version. + + -- Moritz Bunkus Sat, 12 Dec 2009 15:07:05 +0100 + mkvtoolnix (2.9.9) karmic; urgency=low * New version. diff --git a/doc/man/mkvextract.1 b/doc/man/mkvextract.1 index ee392847d..410dd841b 100644 --- a/doc/man/mkvextract.1 +++ b/doc/man/mkvextract.1 @@ -1,11 +1,11 @@ .\" Title: mkvextract .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.73.2 -.\" Date: November 2009 +.\" Date: December 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.9 +.\" Source: MkvToolNix 3.0.0 .\" -.TH "MKVEXTRACT" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "User Commands" +.TH "MKVEXTRACT" "1" "December 2009" "MkvToolNix 3\&.0\&.0" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index 0330b3cc7..57ea6cd09 100644 --- a/doc/man/mkvextract.xml +++ b/doc/man/mkvextract.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvinfo.1 b/doc/man/mkvinfo.1 index 753750d4b..b2411df37 100644 --- a/doc/man/mkvinfo.1 +++ b/doc/man/mkvinfo.1 @@ -1,11 +1,11 @@ .\" Title: mkvinfo .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.73.2 -.\" Date: November 2009 +.\" Date: December 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.9 +.\" Source: MkvToolNix 3.0.0 .\" -.TH "MKVINFO" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "User Commands" +.TH "MKVINFO" "1" "December 2009" "MkvToolNix 3\&.0\&.0" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/doc/man/mkvinfo.xml b/doc/man/mkvinfo.xml index 643098693..3ac033825 100644 --- a/doc/man/mkvinfo.xml +++ b/doc/man/mkvinfo.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvmerge.1 b/doc/man/mkvmerge.1 index 52baa62cd..0cffe4ee1 100644 --- a/doc/man/mkvmerge.1 +++ b/doc/man/mkvmerge.1 @@ -1,11 +1,11 @@ .\" Title: mkvmerge .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.73.2 -.\" Date: November 2009 +.\" Date: December 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.9 +.\" Source: MkvToolNix 3.0.0 .\" -.TH "MKVMERGE" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "User Commands" +.TH "MKVMERGE" "1" "December 2009" "MkvToolNix 3\&.0\&.0" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml index b38f352e1..3bc0cf47b 100644 --- a/doc/man/mkvmerge.xml +++ b/doc/man/mkvmerge.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvpropedit.1 b/doc/man/mkvpropedit.1 index 865461bf5..c4d99922d 100644 --- a/doc/man/mkvpropedit.1 +++ b/doc/man/mkvpropedit.1 @@ -1,11 +1,11 @@ .\" Title: mkvpropedit .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.73.2 -.\" Date: November 2009 +.\" Date: December 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.9 +.\" Source: MkvToolNix 3.0.0 .\" -.TH "MKVPROPEDIT" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "User Commands" +.TH "MKVPROPEDIT" "1" "December 2009" "MkvToolNix 3\&.0\&.0" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/doc/man/mkvpropedit.xml b/doc/man/mkvpropedit.xml index 63de73584..656a5c0c6 100644 --- a/doc/man/mkvpropedit.xml +++ b/doc/man/mkvpropedit.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mmg.1 b/doc/man/mmg.1 index 9d9bcd53a..2fb956dc9 100644 --- a/doc/man/mmg.1 +++ b/doc/man/mmg.1 @@ -1,11 +1,11 @@ .\" Title: mmg .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.73.2 -.\" Date: November 2009 +.\" Date: December 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.9 +.\" Source: MkvToolNix 3.0.0 .\" -.TH "MMG" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "User Commands" +.TH "MMG" "1" "December 2009" "MkvToolNix 3\&.0\&.0" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/doc/man/mmg.xml b/doc/man/mmg.xml index ec70878d0..73dd326e9 100644 --- a/doc/man/mmg.xml +++ b/doc/man/mmg.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi index a7b8680fd..a2b9b5bd9 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVtoolnix" -!define PRODUCT_VERSION "2.9.9" +!define PRODUCT_VERSION "3.0.0" !define PRODUCT_VERSION_BUILD "" # Intentionally left empty for releases !define PRODUCT_PUBLISHER "Moritz Bunkus" !define PRODUCT_WEB_SITE "http://www.bunkus.org/videotools/mkvtoolnix/" diff --git a/src/common/version.cpp b/src/common/version.cpp index ba2271af1..f5234a586 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -18,7 +18,7 @@ #include "common/common.h" #include "common/version.h" -#define VERSIONNAME "Tutu" +#define VERSIONNAME "Hang up your Hang-Ups" std::string get_version_info(const std::string &program, diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 0bb8f5197..429558f9e 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 9, 9, 0 - PRODUCTVERSION 2, 9, 9, 0 + FILEVERSION 3, 0, 0, 0 + PRODUCTVERSION 3, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "2.9.9" + VALUE "FileVersion", "3.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", "2.9.9" + VALUE "ProductVersion", "3.0.0" END END END diff --git a/src/info/resources.rc b/src/info/resources.rc index a29d7d061..489ae66ec 100644 --- a/src/info/resources.rc +++ b/src/info/resources.rc @@ -3,8 +3,8 @@ MATROSKAICON ICON "../mmg/matroskalogo_big.ico" #include "wx/msw/wx.rc" 1 VERSIONINFO - FILEVERSION 2, 9, 9, 0 - PRODUCTVERSION 2, 9, 9, 0 + FILEVERSION 3, 0, 0, 0 + PRODUCTVERSION 3, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "2.9.9" + VALUE "FileVersion", "3.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", "2.9.9" + VALUE "ProductVersion", "3.0.0" END END END diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 51dbf7fea..9cccbcb5a 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 9, 9, 0 - PRODUCTVERSION 2, 9, 9, 0 + FILEVERSION 3, 0, 0, 0 + PRODUCTVERSION 3, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "2.9.9" + VALUE "FileVersion", "3.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", "2.9.9" + VALUE "ProductVersion", "3.0.0" END END END diff --git a/src/mmg/mmg-resources.rc b/src/mmg/mmg-resources.rc index c13023025..c49ca32c7 100644 --- a/src/mmg/mmg-resources.rc +++ b/src/mmg/mmg-resources.rc @@ -3,8 +3,8 @@ MATROSKAICON ICON matroskalogo_big.ico #include "wx/msw/wx.rc" 1 VERSIONINFO - FILEVERSION 2, 9, 9, 0 - PRODUCTVERSION 2, 9, 9, 0 + FILEVERSION 3, 0, 0, 0 + PRODUCTVERSION 3, 0, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mmg" - VALUE "FileVersion", "2.9.9" + VALUE "FileVersion", "3.0.0" VALUE "InternalName", "mmg" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mmg" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "2.9.9" + VALUE "ProductVersion", "3.0.0" END END END