[libtheora] 01/04: Acknowledge 1.1.1+dfsg.1-7.1 NMU.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository libtheora.

commit 86387a4fee15b0cdb5ffaa88de1ad23c4de28b31
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Feb 7 10:32:46 2016 +0000

    Acknowledge 1.1.1+dfsg.1-7.1 NMU.
    
    Closes: #812478
---
 debian/changelog              |  8 ++++++++
 debian/patches/libpng16.patch | 16 ++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e10acc..149b272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libtheora (1.1.1+dfsg.1-7.1) unstable; 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 --git a/debian/patches/libpng16.patch b/debian/patches/libpng16.patch
new file mode 100644
index 0000000..a856747
--- /dev/null
+++ b/debian/patches/libpng16.patch
@@ -0,0 +1,16 @@
+Index: libtheora/examples/png2theora.c
+===================================================================
+--- libtheora.orig/examples/png2theora.c	2016-02-07 10:37:24.586795794 +0000
++++ libtheora/examples/png2theora.c	2016-02-07 10:38:11.983361108 +0000
+@@ -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 --git a/debian/patches/series b/debian/patches/series
index 8022134..7e8de28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/libtheora.git