[SCM] whitedune/master: Give patches a description and names

Sat Jan 9 20:58:30 UTC 2016

The following commit has been merged in the master branch:
commit a19a53e9be8b2fd5896778a4b2045a7c2fb82447
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jan 9 21:50:58 2016 +0100

    Give patches a description and names

diff --git a/debian/patches/debian-changes-0.30.10-1 b/debian/patches/debian-changes-0.30.10-1
deleted file mode 100644
index 95753f8..0000000
--- a/debian/patches/debian-changes-0.30.10-1
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Upstream changes introduced in version 0.30.10-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- whitedune (0.30.10-1) unstable; urgency=low
- .
-   * New upstream version
-   * debian/control:
-     - Comaintenance set to pkg-multimedia team
-     - recommends fonts (Close:#563925)
-     - updated standards and fix lintian warning (src)
-   * configure.ac: undepends on libxp (Closes: #623652)
-   * ignore generated files
- .
- The person named in the Author field signed this changelog entry.
-Author: Philippe Coval <rzr at gna.org>
-Bug-Debian: http://bugs.debian.org/623652
-
----
-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>
-
---- whitedune-0.30.10.orig/configure.in
-+++ whitedune-0.30.10/configure.in
-@@ -910,7 +910,10 @@ AC_CHECK_LIB(X11, XCreateWindow)
- AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
- AC_CHECK_LIB(Xt, XtCreateWidget)
- AC_CHECK_LIB(Xext, XShmQueryVersion)
--AC_HAVE_LIBRARY(Xp)
-+
-+dnl http://bugs.debian.org/623652
-+dnl AC_HAVE_LIBRARY(Xp)
-+
- AC_CHECK_LIB(Xm, XmCreateMainWindow , , MOTIF_ERROR=1)
- if test "X_$MOTIF_ERROR" = "X_1" ; then
- [ 
diff --git a/debian/patches/debian-changes-0.30.10-1.1 b/debian/patches/debian-changes-0.30.10-1.1
deleted file mode 100644
index 9655910..0000000
--- a/debian/patches/debian-changes-0.30.10-1.1
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Upstream changes introduced in version 0.30.10-1.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- whitedune (0.30.10-1.1) unstable; urgency=low
- .
-   * Non-maintainer upload.
-   * libpng 15 transition.
- .
- The person named in the Author field signed this changelog entry.
-Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.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>
-
---- whitedune-0.30.10.orig/src/pngLoad.c
-+++ whitedune-0.30.10/src/pngLoad.c
-@@ -139,7 +139,11 @@ static int pngreadstr( FILE *fp,
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier.
-     */
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+  if (setjmp(png_jmpbuf((png_ptr))))
-+#else
-   if (setjmp(png_ptr->jmpbuf))
-+#endif
-     {
-       /* If we get here, we had a problem reading the file */
-       return 0;
diff --git a/debian/patches/libxp-configure.patch b/debian/patches/libxp-configure.patch
new file mode 100644
index 0000000..e09aacc
--- /dev/null
+++ b/debian/patches/libxp-configure.patch
@@ -0,0 +1,18 @@
+Description: Do not depend on libxp
+Author: Philippe Coval <rzr at gna.org>
+Bug-Debian: http://bugs.debian.org/623652
+
+--- whitedune-0.30.10.orig/configure.in
++++ whitedune-0.30.10/configure.in
+@@ -910,7 +910,10 @@ AC_CHECK_LIB(X11, XCreateWindow)
+ AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
+ AC_CHECK_LIB(Xt, XtCreateWidget)
+ AC_CHECK_LIB(Xext, XShmQueryVersion)
+-AC_HAVE_LIBRARY(Xp)
++
++dnl http://bugs.debian.org/623652
++dnl AC_HAVE_LIBRARY(Xp)
++
+ AC_CHECK_LIB(Xm, XmCreateMainWindow , , MOTIF_ERROR=1)
+ if test "X_$MOTIF_ERROR" = "X_1" ; then
+ [ 
diff --git a/debian/patches/png1.5.patch b/debian/patches/png1.5.patch
new file mode 100644
index 0000000..0af1994
--- /dev/null
+++ b/debian/patches/png1.5.patch
@@ -0,0 +1,17 @@
+Description: Fix for libpng 15 transition
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+
+--- whitedune-0.30.10.orig/src/pngLoad.c
++++ whitedune-0.30.10/src/pngLoad.c
+@@ -139,7 +139,11 @@ static int pngreadstr( FILE *fp,
+     * the normal method of doing things with libpng).  REQUIRED unless you
+     * set up your own error handlers in the png_create_read_struct() earlier.
+     */
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if (setjmp(png_jmpbuf((png_ptr))))
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+     {
+       /* If we get here, we had a problem reading the file */
+       return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 481478c..76b5394 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian-changes-0.30.10-1
-debian-changes-0.30.10-1.1
+libxp-configure.patch
+png1.5.patch

-- 
whitedune packaging

