Package: xstarfish Version: 1.1-11 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for xstarfish (versioned as 1.1-11.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. diff -Nru xstarfish-1.1/debian/changelog xstarfish-1.1/debian/changelog --- xstarfish-1.1/debian/changelog 2010-08-12 21:48:02.000000000 +0200 +++ xstarfish-1.1/debian/changelog 2016-01-06 10:55:22.000000000 +0100 @@ -1,3 +1,13 @@ +xstarfish (1.1-11.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix build failure with ld --as-needed. LP: #832847, using patch from doko + (Closes: #641274) + * Apply patch for libpng transistion, patch from Nobuhiro(Closes: #635704) + * Also, change B-D to libpng-dev (Closes: #662570) + + -- Tobias Frost <[email protected]> Wed, 06 Jan 2016 10:55:22 +0100 + xstarfish (1.1-11) unstable; urgency=low * New maintainer (Closes: #486776) diff -Nru xstarfish-1.1/debian/control xstarfish-1.1/debian/control --- xstarfish-1.1/debian/control 2010-08-12 06:18:41.000000000 +0200 +++ xstarfish-1.1/debian/control 2016-01-06 10:48:40.000000000 +0100 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Simon Fondrie-Teitler <[email protected]> -Build-Depends: debhelper (>=5), libpng12-dev, libx11-dev, xbitmaps +Build-Depends: debhelper (>=5), libpng-dev, libx11-dev, xbitmaps Standards-Version: 3.9.1 Package: xstarfish @@ -15,4 +15,4 @@ XStarfish generates colourful, tiled images for your background using random numbers fed through mathematical functions. It does not use source image files, so it can generate its images nearly forever without running out of - material. + material. diff -Nru xstarfish-1.1/debian/patches/debian-changes-1.1-11.1 xstarfish-1.1/debian/patches/debian-changes-1.1-11.1 --- xstarfish-1.1/debian/patches/debian-changes-1.1-11.1 1970-01-01 01:00:00.000000000 +0100 +++ xstarfish-1.1/debian/patches/debian-changes-1.1-11.1 2016-01-06 10:42:30.000000000 +0100 @@ -0,0 +1,40 @@ +Description: Upstream changes introduced in version 1.1-11.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: + . + xstarfish (1.1-11.1) unstable; urgency=low + . + * Non-maintainer upload. + * libpng transition. + . + The person named in the Author field signed this changelog entry. +Author: Nobuhiro Iwamatsu <[email protected]> + +--- +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> + +--- xstarfish-1.1.orig/unix/makepng.c ++++ xstarfish-1.1/unix/makepng.c +@@ -79,7 +79,11 @@ void MakePNGFile(StarfishRef tex, const + if(theInfoPtr) + { + /* set up the png error handling. */ ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((theWritePtr)))) ++#else + if (setjmp(theWritePtr->jmpbuf)) ++#endif + { + png_destroy_write_struct(&theWritePtr, &theInfoPtr); + fclose(theFile); diff -Nru xstarfish-1.1/debian/patches/debian-changes-1.1-11ubuntu1 xstarfish-1.1/debian/patches/debian-changes-1.1-11ubuntu1 --- xstarfish-1.1/debian/patches/debian-changes-1.1-11ubuntu1 1970-01-01 01:00:00.000000000 +0100 +++ xstarfish-1.1/debian/patches/debian-changes-1.1-11ubuntu1 2016-01-06 10:43:46.000000000 +0100 @@ -0,0 +1,47 @@ +Description: Upstream changes introduced in version 1.1-11ubuntu1 + 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: + . + xstarfish (1.1-11ubuntu1) oneiric; urgency=low + . + * Fix build failure with ld --as-needed. LP: #832847. + . + The person named in the Author field signed this changelog entry. +Author: Matthias Klose <[email protected]> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/832847 + +--- +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> + +--- xstarfish-1.1.orig/Makefile ++++ xstarfish-1.1/Makefile +@@ -2,14 +2,16 @@ + # seems to work fairly well on a P3-300 too + CC = cc -O3 -funroll-all-loops -I ./portable -I ./portable/pixels/ \ + -I ./portable/generators/ -I ./unix/ -g -D__USE_EXTERN_INLINES +-LDFLAGS = -L/usr/X11R6/lib -lm -lX11 -lpng ++LDFLAGS = -L/usr/X11R6/lib ++LIBS = -lm -lX11 -lpng + VPATH = ./portable/:./portable/pixels/:./portable/generators/:./unix/ + OBJECTS = starfish-engine.o generators.o genutils.o\ + bufferxform.o greymap.o pixmap.o starfish-rasterlib.o \ + coswave-gen.o spinflake-gen.o rangefrac-gen.o \ + bubble-gen.o flatwave-gen.o setdesktop.o makepng.o + +-starfish: $(OBJECTS) ++starfish: $(OBJECTS) unix/starfish.o ++ $(CC) -o starfish $(LDFLAGS) $(OBJECTS) unix/starfish.o $(LIBS) + + starfish-engine.o: starfish-engine.c starfish-engine.h generators.h \ + starfish-rasterlib.h diff -Nru xstarfish-1.1/debian/patches/series xstarfish-1.1/debian/patches/series --- xstarfish-1.1/debian/patches/series 2010-08-12 23:26:30.000000000 +0200 +++ xstarfish-1.1/debian/patches/series 2016-01-06 10:43:46.000000000 +0100 @@ -1 +1,3 @@ previous-maintainer-changes +debian-changes-1.1-11ubuntu1 +debian-changes-1.1-11.1
