r70 - in unstable/mkvtoolnix/debian: . patches

[zorglub at alioth.debian.org]

Author: zorglub
Date: 2006-08-17 06:06:25 +0000 (Thu, 17 Aug 2006)
New Revision: 70

Added:
   unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff
Modified:
   unstable/mkvtoolnix/debian/changelog
   unstable/mkvtoolnix/debian/control
   unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
   unstable/mkvtoolnix/debian/patches/series
Log:
* Add patch to fix crash in WAV handling
* New upload


Modified: unstable/mkvtoolnix/debian/changelog
===================================================================
--- unstable/mkvtoolnix/debian/changelog	2006-08-17 05:42:45 UTC (rev 69)
+++ unstable/mkvtoolnix/debian/changelog	2006-08-17 06:06:25 UTC (rev 70)
@@ -1,8 +1,9 @@
-mkvtoolnix (1.7.0-2) UNRELEASED; urgency=low
+mkvtoolnix (1.7.0-2) unstable; urgency=high
 
+  * Fix WAV handling crash (Closes:#370144)
   * Switch to Quilt for patch management
 
- -- Clément Stenac <zorglub at debian.org>  Sat, 29 Apr 2006 12:28:27 +0200
+ -- Clément Stenac <zorglub at debian.org>  Thu, 17 Aug 2006 08:18:27 +0200
 
 mkvtoolnix (1.7.0-1) unstable; urgency=low
 

Modified: unstable/mkvtoolnix/debian/control
===================================================================
--- unstable/mkvtoolnix/debian/control	2006-08-17 05:42:45 UTC (rev 69)
+++ unstable/mkvtoolnix/debian/control	2006-08-17 06:06:25 UTC (rev 70)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Clément Stenac <zorglub at debian.org>
 Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev|libwxgtk2.4-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: mkvtoolnix
 Architecture: any

Modified: unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-manpage-error.diff	2006-08-17 05:42:45 UTC (rev 69)
+++ unstable/mkvtoolnix/debian/patches/10-manpage-error.diff	2006-08-17 06:06:25 UTC (rev 70)
@@ -1,15 +1,21 @@
---- mkvtoolnix.orig/Makefile.in	(revision 3065)
-+++ mkvtoolnix/Makefile.in	(working copy)
-@@ -246,8 +246,10 @@ clean:
- 		*/*.exe */*/*.exe */*/*.dll */*/*.dll.a doc/*.hhk
- 
- distclean dist-clean: clean
--	rm -f configure config.h config.h.in config.log config.cache \
--		Makefile */Makefile */*/Makefile
-+	rm -f config.h config.log config.cache Makefile */Makefile */*/Makefile
-+
-+maintainer-clean: distclean
-+	rm -f configure config.h.in
- 
- depend:
- 	@echo Calculating dependecies:
+#! /bin/sh -e
+## 
+## DP: Patch for a formatting problem in the manpage
+
+
+. debian/patches/00template
+
+ at DPATCH@
+--- mkvtoolnix-1.5.5.orig/doc/mkvmerge.1
++++ mkvtoolnix-1.5.5/doc/mkvmerge.1
+@@ -213,8 +213,8 @@
+ MIME type of the following attachment. Applies to the next
+ \fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command.
+ A list of officially recognized MIME types can be found e.g. at
+-.UR ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types
+-<ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types>
++.UR ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types
++<ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types>
+ The MIME type is mandatory for an attachment.
+ .TP
+ \fB\-\-attach\-file\fR <\fIfile name\fR>

Added: unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff	2006-08-17 05:42:45 UTC (rev 69)
+++ unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff	2006-08-17 06:06:25 UTC (rev 70)
@@ -0,0 +1,14 @@
+--- mkvtoolnix-1.7.0-orig/src/output/p_pcm.cpp	2005-10-09 04:30:24.000000000 -0500
++++ mkvtoolnix-1.7.0/src/output/p_pcm.cpp	2006-08-13 19:36:15.000000000 -0500
+@@ -51,7 +51,10 @@
+   set_track_default_duration((int64_t)(1000000000.0 * ti.async.linear *
+                                        packet_size / samples_per_sec));
+ 
+-  packet_size *= channels * bits_per_sample / 8;
++  /* It could happen that (channels * bits_per_sample < 8).  Because of this,
++     we mustn't divide by 8 in the same line, or the result would be hosed. */
++  packet_size *= channels * bits_per_sample;
++  packet_size /= 8;
+ }
+ 
+ pcm_packetizer_c::~pcm_packetizer_c() {

Modified: unstable/mkvtoolnix/debian/patches/series
===================================================================
--- unstable/mkvtoolnix/debian/patches/series	2006-08-17 05:42:45 UTC (rev 69)
+++ unstable/mkvtoolnix/debian/patches/series	2006-08-17 06:06:25 UTC (rev 70)
@@ -1 +1,2 @@
 10-manpage-error.diff
+20-malloc-crash-fix.diff