Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package pgplot5 fixes a FTBFS recently introduced by zlib1g-dev moving around zconf.h, again. unblock pgplot5/5.2.2-19.3 Andreas
diff -Nru pgplot5-5.2.2/debian/changelog pgplot5-5.2.2/debian/changelog --- pgplot5-5.2.2/debian/changelog 2016-01-07 13:47:52.000000000 +0100 +++ pgplot5-5.2.2/debian/changelog 2017-02-03 15:07:35.000000000 +0100 @@ -1,3 +1,12 @@ +pgplot5 (5.2.2-19.3) unstable; urgency=medium + + * Non-maintainer upload. + * Search zconf.h in non-multiarch and multiarch locations. (Closes: #853898) + * Drop obsolete override for lintian false-positive. + * Drop superfluous prerm and postinst script. + + -- Andreas Beckmann <a...@debian.org> Fri, 03 Feb 2017 15:07:35 +0100 + pgplot5 (5.2.2-19.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru pgplot5-5.2.2/debian/dirs pgplot5-5.2.2/debian/dirs --- pgplot5-5.2.2/debian/dirs 2007-04-21 20:24:55.000000000 +0200 +++ pgplot5-5.2.2/debian/dirs 2017-02-01 21:43:12.000000000 +0100 @@ -3,5 +3,3 @@ usr/bin usr/include usr/share/doc/pgplot5 -usr/share/lintian/overrides/ - diff -Nru pgplot5-5.2.2/debian/overrides pgplot5-5.2.2/debian/overrides --- pgplot5-5.2.2/debian/overrides 2007-04-21 20:20:49.000000000 +0200 +++ pgplot5-5.2.2/debian/overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# The name PGPLOT in the debian/copyright file causes lintian to assume that -# this package has a GPL license. -pgplot5 binary: copyright-should-refer-to-common-license-file-for-gpl - 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 2015-09-10 18:36:43.000000000 +0200 +++ pgplot5-5.2.2/debian/patches/linker-specific-changes 2017-02-01 21:31:05.000000000 +0100 @@ -75,7 +75,7 @@ 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/$(DEB_HOST_MULTIARCH)/zconf.h ++pndriv.o : /usr/include/png.h /usr/include/pngconf.h /usr/include/zlib.h $(or $(wildcard /usr/include/zconf.h),/usr/include/$(DEB_HOST_MULTIARCH)/zconf.h) x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h diff -Nru pgplot5-5.2.2/debian/postinst pgplot5-5.2.2/debian/postinst --- pgplot5-5.2.2/debian/postinst 2006-07-15 20:18:19.000000000 +0200 +++ pgplot5-5.2.2/debian/postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -# Automatically added by dh_installdocs -if [ "$1" = "configure" ]; then -# if [ -d /usr/doc -a ! -e /usr/doc/pgplot5 -a -d /usr/share/doc/pgplot5 ]; then -# ln -sf ../share/doc/pgplot5 /usr/doc/pgplot5 -# fi - ldconfig - fi -# End automatically added section -# Automatically added by dh_installmenu -# if test -x /usr/bin/update-menus ; then update-menus ; fi -# End automatically added section - - diff -Nru pgplot5-5.2.2/debian/prerm pgplot5-5.2.2/debian/prerm --- pgplot5-5.2.2/debian/prerm 2006-07-15 20:18:19.000000000 +0200 +++ pgplot5-5.2.2/debian/prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -# Automatically added by dh_installdocs -if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/pgplot5 ]; then - rm -f /usr/doc/pgplot5 -fi -# End automatically added section diff -Nru pgplot5-5.2.2/debian/rules pgplot5-5.2.2/debian/rules --- pgplot5-5.2.2/debian/rules 2011-11-19 07:30:49.000000000 +0100 +++ pgplot5-5.2.2/debian/rules 2017-02-01 21:43:27.000000000 +0100 @@ -89,7 +89,7 @@ install-stamp: build-stamp $(64-BIT_CLEAN_STAMP) dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(INSTALL_DATA) $(bdir)/libpgplot.a $(packagedir)/usr/lib/ $(INSTALL_DATA) $(bdir)/libcpgplot.a $(packagedir)/usr/lib/ @@ -112,8 +112,6 @@ $(INSTALL_DATA) $(bdir)/grexec.f $(packagedir)/usr/lib/$(npackage) $(INSTALL_DATA) $(bdir)/rgb.txt $(packagedir)/usr/lib/$(npackage) $(INSTALL_DATA) $(bdir)/grpckg1.inc $(packagedir)/usr/lib/$(npackage) -# Install the overrides file for lintian - cp -a debian/overrides $(packagedir)/usr/share/lintian/overrides/pgplot5 #dh_movefiles touch install-stamp
