Bug#812478: libtheora: diff for NMU version 1.1.1+dfsg.1-7.1

[Tobias Frost]

Package: libtheora
Version: 1.1.1+dfsg.1-7
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for libtheora (versioned as 1.1.1+dfsg.1-7.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru libtheora-1.1.1+dfsg.1/debian/changelog libtheora-1.1.1+dfsg.1/debian/changelog
--- libtheora-1.1.1+dfsg.1/debian/changelog	2015-09-22 13:59:49.000000000 +0200
+++ libtheora-1.1.1+dfsg.1/debian/changelog	2016-01-24 10:44:23.000000000 +0100
@@ -1,3 +1,11 @@
+libtheora (1.1.1+dfsg.1-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libpng16 (Closes: #809949)
+  * Drop python from B-D for easier cross building (Closes: #794591)
+
+ -- Tobias Frost <tobi at debian.org>  Sat, 23 Jan 2016 18:44:30 +0100
+
 libtheora (1.1.1+dfsg.1-7) unstable; urgency=low
 
   [ Martin Steghöfer ]
diff -Nru libtheora-1.1.1+dfsg.1/debian/control libtheora-1.1.1+dfsg.1/debian/control
--- libtheora-1.1.1+dfsg.1/debian/control	2015-09-22 13:59:49.000000000 +0200
+++ libtheora-1.1.1+dfsg.1/debian/control	2016-01-23 18:51:11.000000000 +0100
@@ -6,7 +6,7 @@
  Petter Reinholdtsen <pere at debian.org>
  , Martin Steghöfer <martin at steghoefer.eu>
 Build-Depends: debhelper (>> 9), dh-autoreconf, devscripts,
- doxygen, libogg-dev, libsdl1.2-dev, libvorbis-dev, python,
+ doxygen, libogg-dev, libsdl1.2-dev, libvorbis-dev,
  libtool, automake, quilt, dpkg (>= 1.14.8), libpng-dev, pkg-config
 Build-Depends-Indep: transfig, texlive-latex-base, texlive-latex-extra,
  texlive-latex-recommended, texlive-fonts-recommended, ghostscript
diff -Nru libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch
--- libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch	1970-01-01 01:00:00.000000000 +0100
+++ libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch	2016-01-23 18:47:51.000000000 +0100
@@ -0,0 +1,14 @@
+--- a/examples/png2theora.c
++++ b/examples/png2theora.c
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }
diff -Nru libtheora-1.1.1+dfsg.1/debian/patches/series libtheora-1.1.1+dfsg.1/debian/patches/series
--- libtheora-1.1.1+dfsg.1/debian/patches/series	2015-09-22 13:59:49.000000000 +0200
+++ libtheora-1.1.1+dfsg.1/debian/patches/series	2016-01-23 18:45:53.000000000 +0100
@@ -3,3 +3,4 @@
 0003-Build-on-hurd-i386-and-kfreebsd.patch
 0004-player-example-needs-lm-for-rint.patch
 0005-latex.patch
+libpng16.patch