[Pkg-opt-media-team] [SCM] dvdisaster packaging branch, master, updated. debian/0.72.3-1-14-g86278fb

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit 86278fbab4a142fb66b798e68365a5bb1590b164
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Mon Mar 19 11:08:59 2012 +0900

    release

diff --git a/debian/changelog b/debian/changelog
index 6dff6b8..2cfaecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdisaster (0.72.3-2) unstable; urgency=low
+
+  * debian/patches/libpng15: Build with libpng15. (Closes: #649555) 
+
+ -- TANIGUCHI Takaki <takaki at debian.org>  Mon, 19 Mar 2012 11:08:53 +0900
+
 dvdisaster (0.72.3-1) unstable; urgency=low
 
   [ Rogério Brito ]
diff --git a/debian/patches/libpng15 b/debian/patches/libpng15
new file mode 100644
index 0000000..a8c381b
--- /dev/null
+++ b/debian/patches/libpng15
@@ -0,0 +1,38 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ dvdisaster (0.72.3-1+libpng151) unstable; urgency=low
+ .
+   * Build with libpng15.
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- dvdisaster-0.72.3.orig/tools/pngio.h
++++ dvdisaster-0.72.3/tools/pngio.h
+@@ -21,6 +21,10 @@
+ #define PNGIO_H
+ 
+ #include <png.h>
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
++  #include <zlib.h>
++#endif
++
+ 
+ typedef struct
+ {  char *name;

-- 
dvdisaster packaging