Package: mkvtoolnix Followup-For: Bug #503261 Given the upstream tarball from http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-2.4.0.tar.bz2 , the following steps will result in a buildable Debian package of 2.4.0:
* Extract the tarball * Remove the upstream debian directory * Copy the debian directory from 2.0.2 * Apply the attached patch. * (Optional) If you want to upload as the maintainer, remove the NMU entry from debian/changelog and change the trailer line. * Make a sourceful upload. - Josh Triplett
diff -Naur mkvtoolnix-2.0.2/debian/changelog mkvtoolnix-2.4.0/debian/changelog --- mkvtoolnix-2.0.2/debian/changelog 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/changelog 2008-10-23 22:48:16.000000000 -0700 @@ -1,3 +1,16 @@ +mkvtoolnix (2.4.0-0.1) unstable; urgency=low + + [ Josh Triplett ] + * Non-maintainer upload. + * New upstream version 2.4.0 + * Handles newer revisions of Theora. (Closes: #458024) + * Requires libboost-dev and libboost-regex-dev; add them to Build-Depends. + * Incorporates patches/20-honor-strip and patches/30-mplayer-options; + patches removed. + * Incorporates part of patches/40-gcc-4.3; patch updated. + + -- Josh Triplett <[EMAIL PROTECTED]> Thu, 23 Oct 2008 22:36:58 -0700 + mkvtoolnix (2.0.2-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Naur mkvtoolnix-2.0.2/debian/control mkvtoolnix-2.4.0/debian/control --- mkvtoolnix-2.0.2/debian/control 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/control 2008-10-23 23:20:35.000000000 -0700 @@ -2,7 +2,7 @@ Section: graphics Priority: optional Maintainer: Clément Stenac <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo2-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev, libpcre3-dev +Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo2-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev, libpcre3-dev, libboost-dev, libboost-regex-dev Standards-Version: 3.7.3 Homepage: http://www.bunkus.org/videotools/mkvtoolnix/ @@ -17,7 +17,6 @@ - mkvmerge is a tool to create Matroska files from other formats - mkvinfo allows to get information about the tracks in a Matroska file - mkvextract can extract tracks from Matroska files to other formats - - base64tool can encode and decode base64 . This package only provides command-line tools. For graphical tools, you should install the mkvtoolnix-gui package. diff -Naur mkvtoolnix-2.0.2/debian/mkvtoolnix.install mkvtoolnix-2.4.0/debian/mkvtoolnix.install --- mkvtoolnix-2.0.2/debian/mkvtoolnix.install 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/mkvtoolnix.install 2008-10-23 23:20:48.000000000 -0700 @@ -1,4 +1,3 @@ debian/tmp/bin/mkvmerge /usr/bin debian/tmp/bin/mkvinfo /usr/bin debian/tmp/bin/mkvextract /usr/bin -debian/tmp/bin/base64tool /usr/bin diff -Naur mkvtoolnix-2.0.2/debian/mkvtoolnix.manpages mkvtoolnix-2.4.0/debian/mkvtoolnix.manpages --- mkvtoolnix-2.0.2/debian/mkvtoolnix.manpages 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/mkvtoolnix.manpages 2008-10-23 23:21:07.000000000 -0700 @@ -1,4 +1,3 @@ -doc/base64tool.1 doc/mkvextract.1 doc/mkvinfo.1 doc/mkvmerge.1 diff -Naur mkvtoolnix-2.0.2/debian/patches/20-honor-strip mkvtoolnix-2.4.0/debian/patches/20-honor-strip --- mkvtoolnix-2.0.2/debian/patches/20-honor-strip 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/patches/20-honor-strip 1969-12-31 16:00:00.000000000 -0800 @@ -1,172 +0,0 @@ -Index: mkvtoolnix-2.0.0/Makefile.in -=================================================================== ---- mkvtoolnix-2.0.0.orig/Makefile.in 2007-01-28 11:44:13.000000000 +0100 -+++ mkvtoolnix-2.0.0/Makefile.in 2007-01-28 11:45:08.000000000 +0100 -@@ -55,6 +55,7 @@ - PROFILING_CFLAGS = @PROFILING_CFLAGS@ - PROFILING_LIBS = @PROFILING_LIBS@ - RANLIB = @RANLIB@ -+STRIP = @STRIP@ - UIC = @UIC@ - - # Variable stuff as set by configure -Index: mkvtoolnix-2.0.0/configure -=================================================================== ---- mkvtoolnix-2.0.0.orig/configure 2007-01-28 11:45:37.000000000 +0100 -+++ mkvtoolnix-2.0.0/configure 2007-01-28 11:46:31.000000000 +0100 -@@ -668,6 +668,7 @@ - INSTALL_SCRIPT - INSTALL_DATA - RANLIB -+STRIP - AR - LD - GREP -@@ -3631,6 +3632,102 @@ - fi - - if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_STRIP="strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to [EMAIL PROTECTED]" >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to [EMAIL PROTECTED]" >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 -@@ -10532,6 +10629,7 @@ - INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim - INSTALL_DATA!$INSTALL_DATA$ac_delim - RANLIB!$RANLIB$ac_delim -+STRIP!$STRIP$ac_delim - AR!$AR$ac_delim - LD!$LD$ac_delim - GREP!$GREP$ac_delim -@@ -10573,7 +10671,6 @@ - WXWIDGETS_LIBS!$WXWIDGETS_LIBS$ac_delim - USE_WXWIDGETS!$USE_WXWIDGETS$ac_delim - MOC!$MOC$ac_delim --UIC!$UIC$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -10615,6 +10712,7 @@ - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+UIC!$UIC$ac_delim - QT_CFLAGS!$QT_CFLAGS$ac_delim - QT_LIBS!$QT_LIBS$ac_delim - USE_QT!$USE_QT$ac_delim -@@ -10626,7 +10724,7 @@ - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -Index: mkvtoolnix-2.0.0/configure.in -=================================================================== ---- mkvtoolnix-2.0.0.orig/configure.in 2007-01-28 11:44:13.000000000 +0100 -+++ mkvtoolnix-2.0.0/configure.in 2007-01-28 11:46:22.000000000 +0100 -@@ -19,6 +19,7 @@ - AC_PROG_MAKE_SET - AC_PROG_INSTALL - AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) - AC_CHECK_TOOL(AR, ar, :) - AC_CHECK_TOOL(LD, ld, :) - diff -Naur mkvtoolnix-2.0.2/debian/patches/30-mplayer-options mkvtoolnix-2.4.0/debian/patches/30-mplayer-options --- mkvtoolnix-2.0.2/debian/patches/30-mplayer-options 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/patches/30-mplayer-options 1969-12-31 16:00:00.000000000 -0800 @@ -1,19 +0,0 @@ -Index: mkvtoolnix-2.0.0/README -=================================================================== ---- mkvtoolnix-2.0.0.orig/README 2007-01-28 11:49:08.000000000 +0100 -+++ mkvtoolnix-2.0.0/README 2007-01-28 11:50:13.000000000 +0100 -@@ -140,12 +140,12 @@ - - mencoder -oac copy -ovc lavc \ - -lavcopts vcodec=mpeg4:vbitrate=1000:vhq:vqmin=2:vpass=1 \ -- -vop scale=....,crop=..... \ -+ -vf scale=....,crop=..... \ - -o /dev/null dvd://1 - - mencoder -oac copy -ovc lavc \ - -lavcopts vcodec=mpeg4:vbitrate=1000:vhq:vqmin=2:vpass=2 \ -- -vop scale=....,crop=..... \ -+ -vf scale=....,crop=..... \ - -o movie.avi dvd://1 - - f) Merge: diff -Naur mkvtoolnix-2.0.2/debian/patches/40-gcc-4.3 mkvtoolnix-2.4.0/debian/patches/40-gcc-4.3 --- mkvtoolnix-2.0.2/debian/patches/40-gcc-4.3 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/patches/40-gcc-4.3 2008-10-23 22:16:43.000000000 -0700 @@ -1,25 +1,3 @@ -diff -urNad mkvtoolnix-2.0.2.orig/src/common/common.h mkvtoolnix-2.0.2/src/common/common.h ---- mkvtoolnix-2.0.2.orig/src/common/common.h 2008-04-10 02:24:53.000000000 +0100 -+++ mkvtoolnix-2.0.2/src/common/common.h 2008-04-10 02:25:03.000000000 +0100 -@@ -21,6 +21,7 @@ - #include <stdarg.h> - - #include <string> -+#include <cstring> - #include <vector> - - #include "config.h" -diff -urNad mkvtoolnix-2.0.2.orig/src/common/common_memory.h mkvtoolnix-2.0.2/src/common/common_memory.h ---- mkvtoolnix-2.0.2.orig/src/common/common_memory.h 2008-04-10 02:24:53.000000000 +0100 -+++ mkvtoolnix-2.0.2/src/common/common_memory.h 2008-04-10 02:27:19.000000000 +0100 -@@ -19,6 +19,7 @@ - #include "os.h" - - #include <cassert> -+#include <cstdlib> - - #include <deque> - #include <vector> diff -urNad mkvtoolnix-2.0.2.orig/src/common/random.h mkvtoolnix-2.0.2/src/common/random.h --- mkvtoolnix-2.0.2.orig/src/common/random.h 2008-04-10 02:24:53.000000000 +0100 +++ mkvtoolnix-2.0.2/src/common/random.h 2008-04-10 02:26:42.000000000 +0100 diff -Naur mkvtoolnix-2.0.2/debian/patches/series mkvtoolnix-2.4.0/debian/patches/series --- mkvtoolnix-2.0.2/debian/patches/series 2008-10-23 22:04:30.000000000 -0700 +++ mkvtoolnix-2.4.0/debian/patches/series 2008-10-23 22:15:28.000000000 -0700 @@ -1,4 +1,2 @@ 10-manpage-error -20-honor-strip -30-mplayer-options 40-gcc-4.3
