diff --git a/ChangeLog b/ChangeLog index 5ab89e197..c89d9ed5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-03-24 Moritz Bunkus + + * Released v2.6.0. + 2009-03-22 Moritz Bunkus * mmg: new feature: Added a header editor for Matroska files. diff --git a/README b/README index dc9238e15..509ef459c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -MKVToolNix 2.5.3 +MKVToolNix 2.6.0 ================ With these tools one can get information about (mkvinfo) Matroska diff --git a/README.Windows.txt b/README.Windows.txt index 9bcfa66aa..c9f964561 100644 --- a/README.Windows.txt +++ b/README.Windows.txt @@ -1,4 +1,4 @@ -mkvtoolnix 2.5.3 and Windows +mkvtoolnix 2.6.0 and Windows ---------------------------- ---[ NOTE 1 ]--------------------------------------------------------- diff --git a/configure.in b/configure.in index 4b56801de..7e2208d0d 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.5.3" +VERSION="2.6.0" AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index f4a72133f..cc8cc55f5 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -2,7 +2,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 2.5.3 +Version: 2.6.0 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec index 7ac092ee6..0411f2c52 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.5.3 +Version: 2.6.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 aae98ed56..5fafd346e 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (2.6.0) intrepid; urgency=low + + * New version. + + -- Moritz Bunkus Tue, 24 Mar 2009 11:48:37 +0100 + mkvtoolnix (2.5.3) intrepid; urgency=low * New version. diff --git a/doc/base64tool.1 b/doc/base64tool.1 index 67c2a62bc..f8ab8388d 100644 --- a/doc/base64tool.1 +++ b/doc/base64tool.1 @@ -1,4 +1,4 @@ -.TH BASE64TOOL "1" "March 2009" "base64tool v2.5.3" "User Commands" +.TH BASE64TOOL "1" "March 2009" "base64tool v2.6.0" "User Commands" .SH NAME diff --git a/doc/mkvextract.1 b/doc/mkvextract.1 index d201059dc..1f21650a3 100644 --- a/doc/mkvextract.1 +++ b/doc/mkvextract.1 @@ -1,4 +1,4 @@ -.TH MKVEXTRACT "1" "March 2009" "mkvextract v2.5.3" "User Commands" +.TH MKVEXTRACT "1" "March 2009" "mkvextract v2.6.0" "User Commands" .SH NAME diff --git a/doc/mkvinfo.1 b/doc/mkvinfo.1 index 863851580..ab3b26cff 100644 --- a/doc/mkvinfo.1 +++ b/doc/mkvinfo.1 @@ -1,4 +1,4 @@ -.TH MKVINFO "1" "March 2009" "mkvinfo v2.5.3" "User Commands" +.TH MKVINFO "1" "March 2009" "mkvinfo v2.6.0" "User Commands" .SH NAME mkvinfo \- Print information about tracks in Matroska files .SH SYNOPSIS diff --git a/doc/mkvmerge.1 b/doc/mkvmerge.1 index 5337697a5..50bdfc186 100644 --- a/doc/mkvmerge.1 +++ b/doc/mkvmerge.1 @@ -1,4 +1,4 @@ -.TH MKVMERGE "1" "March 2009" "mkvmerge v2.5.3" "User Commands" +.TH MKVMERGE "1" "March 2009" "mkvmerge v2.6.0" "User Commands" .SH NAME diff --git a/doc/mmg.1 b/doc/mmg.1 index 36f205301..3c3eb7500 100644 --- a/doc/mmg.1 +++ b/doc/mmg.1 @@ -1,4 +1,4 @@ -.TH MMG "1" "March 2009" "mmg v2.5.3" "User Commands" +.TH MMG "1" "March 2009" "mmg v2.6.0" "User Commands" .SH NAME diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi index 6930fdac0..5ad9d40ea 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVtoolnix" -!define PRODUCT_VERSION "2.5.3" +!define PRODUCT_VERSION "2.6.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/common.h b/src/common/common.h index 8c61711b5..975e0fe5a 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -69,7 +69,7 @@ GetChildAs(EbmlMaster *m) { return GetChild(*m); } -#define VERSIONNAME "Boogie" +#define VERSIONNAME "Kelly watch the Stars" #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 918228e92..ed8d5864f 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 5, 3, 0 - PRODUCTVERSION 2, 5, 3, 0 + FILEVERSION 2, 6, 0, 0 + PRODUCTVERSION 2, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "2.5.3" + VALUE "FileVersion", "2.6.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.5.3" + VALUE "ProductVersion", "2.6.0" END END END diff --git a/src/info/resources.rc b/src/info/resources.rc index d6b3a6266..214687bfc 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, 5, 3, 0 - PRODUCTVERSION 2, 5, 3, 0 + FILEVERSION 2, 6, 0, 0 + PRODUCTVERSION 2, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "2.5.3" + VALUE "FileVersion", "2.6.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.5.3" + VALUE "ProductVersion", "2.6.0" END END END diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 935ad6813..b1a10bc43 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 2, 5, 3, 0 - PRODUCTVERSION 2, 5, 3, 0 + FILEVERSION 2, 6, 0, 0 + PRODUCTVERSION 2, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "2.5.3" + VALUE "FileVersion", "2.6.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.5.3" + VALUE "ProductVersion", "2.6.0" END END END diff --git a/src/mmg/mmg-resources.rc b/src/mmg/mmg-resources.rc index bc43db5d3..9a3526dbe 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, 5, 3, 0 - PRODUCTVERSION 2, 5, 3, 0 + FILEVERSION 2, 6, 0, 0 + PRODUCTVERSION 2, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mmg" - VALUE "FileVersion", "2.5.3" + VALUE "FileVersion", "2.6.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.5.3" + VALUE "ProductVersion", "2.6.0" END END END