diff --git a/ChangeLog b/ChangeLog index 341bb6dd6..c91a8f034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-11-25 Moritz Bunkus + + * Released v2.9.9. + 2009-11-11 Moritz Bunkus * mmg: bug fix: The warning that no FPS has been entered for diff --git a/README b/README index a8a66f66f..72fdd5548 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -MKVToolNix 2.9.8 +MKVToolNix 2.9.9 ================ With these tools one can get information about (mkvinfo) Matroska diff --git a/README.Windows.txt b/README.Windows.txt index 442b713c8..ca3d520ef 100644 --- a/README.Windows.txt +++ b/README.Windows.txt @@ -1,4 +1,4 @@ -mkvtoolnix 2.9.8 and Windows +mkvtoolnix 2.9.9 and Windows ---------------------------- ---[ NOTE 1 ]--------------------------------------------------------- diff --git a/configure.in b/configure.in index 7958e9d46..526eb533b 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.8" +VERSION="2.9.9" AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index bc99a7a1f..b5cdbc9d2 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -2,7 +2,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 2.9.8 +Version: 2.9.9 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec index 16d3bf5ef..7e5c0c02e 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.8 +Version: 2.9.9 Release: 1 Summary: tools to create, alter and inspect Matroska files License: GPL diff --git a/debian-upstream/changelog b/debian-upstream/changelog index d8ed299fd..faa901595 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (2.9.9) karmic; urgency=low + + * New version. + + -- Moritz Bunkus Wed, 25 Nov 2009 20:39:41 +0100 + mkvtoolnix (2.9.8) karmic; urgency=low * New version. diff --git a/doc/man/mkvextract.1 b/doc/man/mkvextract.1 index 13c20355e..ee392847d 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: August 2009 +.\" Date: November 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.8 +.\" Source: MkvToolNix 2.9.9 .\" -.TH "MKVEXTRACT" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "User Commands" +.TH "MKVEXTRACT" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "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 97b1661e4..0330b3cc7 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 526c8b9bc..753750d4b 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: August 2009 +.\" Date: November 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.8 +.\" Source: MkvToolNix 2.9.9 .\" -.TH "MKVINFO" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "User Commands" +.TH "MKVINFO" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "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 adec3cad0..643098693 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 1bcbf8a88..52baa62cd 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: August 2009 +.\" Date: November 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.8 +.\" Source: MkvToolNix 2.9.9 .\" -.TH "MKVMERGE" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "User Commands" +.TH "MKVMERGE" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "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 87d179896..b38f352e1 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 96c087aed..865461bf5 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: August 2009 +.\" Date: November 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.8 +.\" Source: MkvToolNix 2.9.9 .\" -.TH "MKVPROPEDIT" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "User Commands" +.TH "MKVPROPEDIT" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "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 cc793fbad..63de73584 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 53a251180..9d9bcd53a 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: Au2.9. 2009 +.\" Date: November 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.8 +.\" Source: MkvToolNix 2.9.9 .\" -.TH "MMG" "1" "Au2\&.9\&. 2009" "MkvToolNix 2\&.9\&.8" "User Commands" +.TH "MMG" "1" "November 2009" "MkvToolNix 2\&.9\&.9" "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 f68e60dca..ec70878d0 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 7063e5cf3..a7b8680fd 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVtoolnix" -!define PRODUCT_VERSION "2.9.8" +!define PRODUCT_VERSION "2.9.9" !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/common.h b/src/common/common.h index 0593e2ade..e4447690e 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -50,7 +50,7 @@ namespace libebml { using namespace libebml; -#define VERSIONNAME "C'est le bon" +#define VERSIONNAME "Tutu" #define VERSIONINFO "mkvmerge v" VERSION " ('" VERSIONNAME "')" #define BUGMSG Y("This should not have happened. Please contact the author " \ "Moritz Bunkus with this error/warning " \ diff --git a/src/extract/resources.rc b/src/extract/resources.rc index c674582cd..0bb8f5197 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 9, 8, 0 - PRODUCTVERSION 2, 9, 8, 0 + FILEVERSION 2, 9, 9, 0 + PRODUCTVERSION 2, 9, 9, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "2.9.8" + VALUE "FileVersion", "2.9.9" 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.8" + VALUE "ProductVersion", "2.9.9" END END END diff --git a/src/info/resources.rc b/src/info/resources.rc index 9e19659b8..a29d7d061 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, 8, 0 - PRODUCTVERSION 2, 9, 8, 0 + FILEVERSION 2, 9, 9, 0 + PRODUCTVERSION 2, 9, 9, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "2.9.8" + VALUE "FileVersion", "2.9.9" 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.8" + VALUE "ProductVersion", "2.9.9" END END END diff --git a/src/merge/resources.rc b/src/merge/resources.rc index f6c5da899..51dbf7fea 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 9, 8, 0 - PRODUCTVERSION 2, 9, 8, 0 + FILEVERSION 2, 9, 9, 0 + PRODUCTVERSION 2, 9, 9, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "2.9.8" + VALUE "FileVersion", "2.9.9" 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.8" + VALUE "ProductVersion", "2.9.9" END END END diff --git a/src/mmg/mmg-resources.rc b/src/mmg/mmg-resources.rc index 2877d065c..c13023025 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, 8, 0 - PRODUCTVERSION 2, 9, 8, 0 + FILEVERSION 2, 9, 9, 0 + PRODUCTVERSION 2, 9, 9, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mmg" - VALUE "FileVersion", "2.9.8" + VALUE "FileVersion", "2.9.9" 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.8" + VALUE "ProductVersion", "2.9.9" END END END