Package: release.debian.org Severity: normal Tags: jessie User: [email protected] Usertags: pu
Hi, pgplot5 FTBFS in jessie due to a hardcoded non-multiarch path to zconf.h. This is a backport of the 5.2.2-19.1 NMU to sid excluding the spurious addition of some .f files in debian/. Andreas
diff -Nru pgplot5-5.2.2/debian/changelog pgplot5-5.2.2/debian/changelog --- pgplot5-5.2.2/debian/changelog 2012-03-05 05:48:13.000000000 +0100 +++ pgplot5-5.2.2/debian/changelog 2016-03-19 16:11:09.000000000 +0100 @@ -1,3 +1,11 @@ +pgplot5 (5.2.2-19+deb8u1) jessie; urgency=medium + + * Non-maintainer upload. + * Use multiarch path to zconf.h (Closes: #784783) + (thanks to Edmund Grimley Evans and Vincent McIntyre) + + -- Andreas Beckmann <[email protected]> Sat, 19 Mar 2016 16:09:24 +0100 + pgplot5 (5.2.2-19) unstable; urgency=low * Change Suggests to libpng-dev instead of libpng12-dev. diff -Nru pgplot5-5.2.2/debian/patches/linker-specific-changes pgplot5-5.2.2/debian/patches/linker-specific-changes --- pgplot5-5.2.2/debian/patches/linker-specific-changes 2011-11-19 06:45:51.000000000 +0100 +++ pgplot5-5.2.2/debian/patches/linker-specific-changes 2015-09-10 18:36:43.000000000 +0200 @@ -5,9 +5,11 @@ Last-Update: 2011-11-18 ---- a/makemake -+++ b/makemake -@@ -658,6 +658,8 @@ +Index: pgplot5-5.2.2/makemake +=================================================================== +--- pgplot5-5.2.2.orig/makemake ++++ pgplot5-5.2.2/makemake +@@ -658,6 +658,8 @@ CPGPLOT_LIB=$CPGPLOT_LIB # SHARED_LIB=$SHARED_LIB SHARED_LD=$SHARED_LD @@ -16,7 +18,7 @@ # # The libraries that the shared PGPLOT library depends upon. # This is for systems that allow one to specify what libraries -@@ -667,6 +669,7 @@ +@@ -667,6 +669,7 @@ SHARED_LD=$SHARED_LD # libraries when they link their executables. # SHARED_LIB_LIBS=$SHARED_LIB_LIBS @@ -24,7 +26,7 @@ # # Ranlib command if required # -@@ -806,7 +809,8 @@ +@@ -806,7 +809,8 @@ grexec.o: grexec.f # libraries. #----------------------------------------------------------------------- @@ -34,7 +36,7 @@ libpgplot.a : $(PG_ROUTINES) $(PG_NON_STANDARD) $(GR_ROUTINES) \ $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES) -@@ -816,6 +820,16 @@ +@@ -816,6 +820,16 @@ libpgplot.a : $(PG_ROUTINES) $(PG_NON_ST $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(RANLIB) libpgplot.a @@ -51,7 +53,7 @@ EOD # Emit the shared library dependency if requested. -@@ -824,7 +838,7 @@ +@@ -824,7 +838,7 @@ if test -n "$SHARED_LIB" -a -n "$SHARED_ cat >> makefile << \EOD $(SHARED_LIB): $(PG_ROUTINES) $(PG_NON_STANDARD) \ $(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES) @@ -60,16 +62,24 @@ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS) EOD -@@ -1025,7 +1039,7 @@ +@@ -1019,13 +1033,15 @@ EOD + + cat >> makefile << \EOD + ++DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ++ + # Miscellaneous include files required by drivers + + griv00.o : $(DRVDIR)/gadef.h $(DRVDIR)/gmdef.h $(DRVDIR)/gphdef.h grivas.o : $(DRVDIR)/gadef.h grtv00.o : $(DRVDIR)/imdef.h pgxwin.o : $(DRVDIR)/pgxwin.h -pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h -+pndriv.o : /usr/include/png.h /usr/include/pngconf.h /usr/include/zlib.h /usr/include/zconf.h ++pndriv.o : /usr/include/png.h /usr/include/pngconf.h /usr/include/zlib.h /usr/include/$(DEB_HOST_MULTIARCH)/zconf.h x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h -@@ -1039,6 +1053,8 @@ +@@ -1039,6 +1055,8 @@ cpg: libcpgplot.a cpgplot.h cpgdemo @echo 'will be needed.' @echo ' ' @@ -78,7 +88,7 @@ pgbind: $(SRC)/cpg/pgbind.c $(CCOMPL) $(CFLAGC) $(SRC)/cpg/pgbind.c -o pgbind -@@ -1050,6 +1066,13 @@ +@@ -1050,6 +1068,13 @@ libcpgplot.a cpgplot.h: $(PG_SOURCE) pgb $(RANLIB) libcpgplot.a rm -f cpg*.o
