diff --git a/ChangeLog b/ChangeLog index 11ece0d76..e8c53e9fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-08-13 Moritz Bunkus + * Released v2.9.8. + * mmg: bug fix: The inputs for timecode files and the language are deactivated if the user has selected a track that will be appended to another track. Fix for bug 432. diff --git a/README b/README index 9e75be892..a8a66f66f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -MKVToolNix 2.9.7 +MKVToolNix 2.9.8 ================ With these tools one can get information about (mkvinfo) Matroska diff --git a/README.Windows.txt b/README.Windows.txt index 858c06f4d..442b713c8 100644 --- a/README.Windows.txt +++ b/README.Windows.txt @@ -1,4 +1,4 @@ -mkvtoolnix 2.9.7 and Windows +mkvtoolnix 2.9.8 and Windows ---------------------------- ---[ NOTE 1 ]--------------------------------------------------------- diff --git a/configure.in b/configure.in index 86c23b4a4..87f6af312 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.7" +VERSION="2.9.8" AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index afb08a534..bc99a7a1f 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -2,7 +2,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 2.9.7 +Version: 2.9.8 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec index 31ee88fc7..eb8692f1b 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.7 +Version: 2.9.8 Release: 1 Summary: tools to create, alter and inspect Matroska files License: GPL diff --git a/debian-upstream/changelog b/debian-upstream/changelog index 8c552fac7..d8ed299fd 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (2.9.8) karmic; urgency=low + + * New version. + + -- Moritz Bunkus Thu, 13 Aug 2009 12:29:43 +0200 + mkvtoolnix (2.9.7) intrepid; urgency=low * New version. diff --git a/doc/man/mkvextract.1 b/doc/man/mkvextract.1 index 2981dadaa..1a42df947 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: July 2009 +.\" Date: August 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.7 +.\" Source: MkvToolNix 2.9.8 .\" -.TH "MKVEXTRACT" "1" "July 2009" "MkvToolNix 2\&.9\&.7" "User Commands" +.TH "MKVEXTRACT" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "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 bb294bf8a..8944d566f 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 5755811cb..9eea43dfb 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: July 2009 +.\" Date: August 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.7 +.\" Source: MkvToolNix 2.9.8 .\" -.TH "MKVINFO" "1" "July 2009" "MkvToolNix 2\&.9\&.7" "User Commands" +.TH "MKVINFO" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "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 37751f016..c4c170a83 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 60148cb90..769dd77be 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: July 2009 +.\" Date: August 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.7 +.\" Source: MkvToolNix 2.9.8 .\" -.TH "MKVMERGE" "1" "July 2009" "MkvToolNix 2\&.9\&.7" "User Commands" +.TH "MKVMERGE" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "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 c255715c5..bdac2e52c 100644 --- a/doc/man/mkvmerge.xml +++ b/doc/man/mkvmerge.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mmg.1 b/doc/man/mmg.1 index 3c21b0f7a..cb10ddc67 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: July 2009 +.\" Date: August 2009 .\" Manual: User Commands -.\" Source: MkvToolNix 2.9.7 +.\" Source: MkvToolNix 2.9.8 .\" -.TH "MMG" "1" "July 2009" "MkvToolNix 2\&.9\&.7" "User Commands" +.TH "MMG" "1" "August 2009" "MkvToolNix 2\&.9\&.8" "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 973ee1cb0..66b4c0e1e 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 961e46369..3ff51f558 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVtoolnix" -!define PRODUCT_VERSION "2.9.7" +!define PRODUCT_VERSION "2.9.8" !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 5d6c78fbd..3517d6bb0 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -49,7 +49,7 @@ namespace libebml { using namespace libebml; -#define VERSIONNAME "Tenderness" +#define VERSIONNAME "C'est le bon" #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 b508813c3..c674582cd 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 9, 7, 0 - PRODUCTVERSION 2, 9, 7, 0 + FILEVERSION 2, 9, 8, 0 + PRODUCTVERSION 2, 9, 8, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "2.9.7" + VALUE "FileVersion", "2.9.8" 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.7" + VALUE "ProductVersion", "2.9.8" END END END diff --git a/src/info/resources.rc b/src/info/resources.rc index 89e88c60f..9e19659b8 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, 7, 0 - PRODUCTVERSION 2, 9, 7, 0 + FILEVERSION 2, 9, 8, 0 + PRODUCTVERSION 2, 9, 8, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "2.9.7" + VALUE "FileVersion", "2.9.8" 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.7" + VALUE "ProductVersion", "2.9.8" END END END diff --git a/src/merge/resources.rc b/src/merge/resources.rc index bd2a14f92..f6c5da899 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 9, 7, 0 - PRODUCTVERSION 2, 9, 7, 0 + FILEVERSION 2, 9, 8, 0 + PRODUCTVERSION 2, 9, 8, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "2.9.7" + VALUE "FileVersion", "2.9.8" 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.7" + VALUE "ProductVersion", "2.9.8" END END END diff --git a/src/mmg/mmg-resources.rc b/src/mmg/mmg-resources.rc index 4a09011e2..2877d065c 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, 7, 0 - PRODUCTVERSION 2, 9, 7, 0 + FILEVERSION 2, 9, 8, 0 + PRODUCTVERSION 2, 9, 8, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mmg" - VALUE "FileVersion", "2.9.7" + VALUE "FileVersion", "2.9.8" 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.7" + VALUE "ProductVersion", "2.9.8" END END END