Hi, The attached file is the diff for my mkvtoolnix 2.0.2-1.1 NMU. The changelog entry contains:
mkvtoolnix (2.0.2-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Add '40-gcc-4.3' patch to fix GCC 4.3 FTBFS (Closes: #474818)
* debian/control:
- Bump Standards-Version to 3.7.3.
- Use Homepage: field for upstream URL.
- Relax Recommends: mkvtoolnix-gui to Suggests: (Closes: #452786)
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -Nru mkvtoolnix-2.0.2/debian/changelog mkvtoolnix-2.0.2/debian/changelog --- mkvtoolnix-2.0.2/debian/changelog 2008-04-12 01:26:48.000000000 +0100 +++ mkvtoolnix-2.0.2/debian/changelog 2008-04-12 01:26:48.000000000 +0100 @@ -1,3 +1,14 @@ +mkvtoolnix (2.0.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add '40-gcc-4.3' patch to fix GCC 4.3 FTBFS (Closes: #474818) + * debian/control: + - Bump Standards-Version to 3.7.3. + - Use Homepage: field for upstream URL. + - Relax Recommends: mkvtoolnix-gui to Suggests: (Closes: #452786) + + -- Chris Lamb <[EMAIL PROTECTED]> Sat, 12 Apr 2008 01:19:08 +0100 + mkvtoolnix (2.0.2-1) unstable; urgency=low * New upstream bugfix version diff -Nru /tmp/6RBy1BfGu3/mkvtoolnix-2.0.2/debian/control /tmp/cRr1bBgQ4N/mkvtoolnix-2.0.2/debian/control --- mkvtoolnix-2.0.2/debian/control 2008-04-12 01:26:48.000000000 +0100 +++ mkvtoolnix-2.0.2/debian/control 2008-04-12 01:26:48.000000000 +0100 @@ -3,12 +3,13 @@ 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 -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 +Homepage: http://www.bunkus.org/videotools/mkvtoolnix/ Package: mkvtoolnix Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: mkvtoolnix-gui +Suggests: mkvtoolnix-gui Description: Set of command-line tools to work with Matroska files Matroska is a new multimedia container format, based on EBML (Extensible Binary Meta Language), which is a kind of binary XML. @@ -20,8 +21,6 @@ . This package only provides command-line tools. For graphical tools, you should install the mkvtoolnix-gui package. - . - Upstream homepage : http://www.bunkus.org/videotools/mkvtoolnix/ Package: mkvtoolnix-gui Architecture: any @@ -35,5 +34,3 @@ . This package also contains a graphical version of the mkvinfo tool, which allows to get information about a Matroska file. - . - Upstream homepage : http://www.bunkus.org/videotools/mkvtoolnix/ diff -Nru /tmp/6RBy1BfGu3/mkvtoolnix-2.0.2/debian/patches/40-gcc-4.3 /tmp/cRr1bBgQ4N/mkvtoolnix-2.0.2/debian/patches/40-gcc-4.3 --- mkvtoolnix-2.0.2/debian/patches/40-gcc-4.3 1970-01-01 01:00:00.000000000 +0100 +++ mkvtoolnix-2.0.2/debian/patches/40-gcc-4.3 2008-04-12 01:26:48.000000000 +0100 @@ -0,0 +1,45 @@ +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 +@@ -18,6 +18,8 @@ + + #include "os.h" + ++#include <memory> /* auto_ptr */ ++ + #include "mm_io.h" + #include "smart_pointers.h" + +diff -urNad mkvtoolnix-2.0.2.orig/src/common/xml_element_writer.h mkvtoolnix-2.0.2/src/common/xml_element_writer.h +--- mkvtoolnix-2.0.2.orig/src/common/xml_element_writer.h 2008-04-10 02:24:53.000000000 +0100 ++++ mkvtoolnix-2.0.2/src/common/xml_element_writer.h 2008-04-10 02:26:09.000000000 +0100 +@@ -19,6 +19,7 @@ + #include "os.h" + + #include <expat.h> ++#include <memory> /* auto_ptr */ + + #include "mm_io.h" + #include "xml_element_parser.h" diff -Nru /tmp/6RBy1BfGu3/mkvtoolnix-2.0.2/debian/patches/series /tmp/cRr1bBgQ4N/mkvtoolnix-2.0.2/debian/patches/series --- mkvtoolnix-2.0.2/debian/patches/series 2008-04-12 01:26:48.000000000 +0100 +++ mkvtoolnix-2.0.2/debian/patches/series 2008-04-12 01:26:48.000000000 +0100 @@ -1,3 +1,4 @@ 10-manpage-error 20-honor-strip 30-mplayer-options +40-gcc-4.3
signature.asc
Description: PGP signature
