-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, attached a revised debdiff, where I should have fixed all the other
bugs around, and simplified a little more the packaging, even if the udeb packages needs a rebuild. cheers, Gianfranco On Thu, 28 Jan 2016 15:36:27 +0000 (UTC) Gianfranco Costamagna <[email protected]> wrote: > Package: libpng1.6 Version: 1.6.20-2 Severity: important > > > Dear maintainer, I have prepared a bunch of fixes for libpng1.6, > they should just modernize the packaging, while fixing > > some probably serious issues the package have (explaining the > important severity) during upgrade cycles > > (circular dependencies) > > > I won't probably upload it on experimental, but I would appreciate > if you could ack the changes > > you can see a build here > http://debomatic-amd64.debian.net/distribution#experimental/libpng1.6/ 1.6.20-3/buildlog > > or find a debdiff attached to this email > > summary of the changes: > > * Switch to dh-autoreconf * Remove libpng16-devtools circular > dependency, recommend it instead. * Fix duplicate description > lintian warning * Fix copyright lintian warnings * Remove > copyright.in file * Use new plain dh calls in rules file * Remove > some old lintian overrides. > > the package should behave exactly in the same way, I did a debdiff > to both changes files and they look the same (except for the > removed lintian overrides) > > also build logs seems to be almost identical. > > thanks, > > Gianfranco -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJWsIsQAAoJEPNPCXROn13ZBREP/34NaXyfNkGXKJXxI+CW8Jfi YxUcu9l+2dLpBPHT633qcNduH+JVdwrUXMUPpWeXj+F+DkQWE5qOGPq2+JeoNybq 2bZs9cX1v+9L9ymS04rAuYi0rPsWemnojZDJBE+vVPGGdYNI5Jr5OEKuF91783LF tmBQPJbyfBKPlW6akEDlSbKMfPfchOukI4pl3587mrsMwt3K0O0fnmAtsjEZiFa/ sc4aK/peK4SVuantQgsKEUy4oh1AzHtwb8jMn+uUH8vdTw04kaglDvIYRy2HMFEO e2lZ0KgrWy7FGoDVgild7pWi+WzpkPmWKJIbX4IJPnt8cplje0fXeRVQOLnU8hLD fH2njlAIJqmQaU9oSiUtPPPMsFWZ4znXu95BCCQrheqD70dzEZC9lZgs8wE9VMf4 qtTaDO7ScVVn/zbxlL/M13RwgiR3N0JirwSj0ZxlG5RdkpTWq665TUHFB3pWjJwX Mno3NU5Ey2DBCOjnoq9OL5lDDa1+cr73m91iw4eBNkBdrZHLng9SarAqob6Qrw0C usyYis745+1nMf8YmaK1+GYnVHVYbXKzoE8yKdJ9VYUcWnNovlaC7XN8xq0nAp+5 mUNRo3nS/snao8ftzM7nGSPyfTry1XY5WBNs9t/u8uneJmhgzDt5Y6U8GEjNoDF+ 6OPIdxEEJGcJTKZBG12n =vs9N -----END PGP SIGNATURE-----
diff -Nru libpng1.6-1.6.20/debian/changelog libpng1.6-1.6.20/debian/changelog --- libpng1.6-1.6.20/debian/changelog 2016-01-28 11:34:00.000000000 +0100 +++ libpng1.6-1.6.20/debian/changelog 2016-02-02 11:52:02.000000000 +0100 @@ -1,3 +1,25 @@ +libpng1.6 (1.6.20-4) experimental; urgency=medium + + * Simplify even more the packaging, probably fixing #813288 + * Fix symlinks, and two lintian errors: + - library-in-root-and-usr + - old-style-config-script-multiarch-path (multiarch: no for libpng16-devtools) + + -- Gianfranco Costamagna <[email protected]> Tue, 02 Feb 2016 11:01:27 +0100 + +libpng1.6 (1.6.20-3) experimental; urgency=medium + + * Team upload + * Switch to dh-autoreconf + * Remove libpng16-devtools circular dependency, recommend it instead. + * Fix duplicate description lintian warning + * Fix copyright lintian warnings + * Remove copyright.in file + * Use new plain dh calls in rules file + * Remove some old lintian overrides. + + -- Gianfranco Costamagna <[email protected]> Thu, 28 Jan 2016 15:52:19 +0100 + libpng1.6 (1.6.20-2) experimental; urgency=medium [ Tobias Frost ] diff -Nru libpng1.6-1.6.20/debian/clean libpng1.6-1.6.20/debian/clean --- libpng1.6-1.6.20/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ libpng1.6-1.6.20/debian/clean 2016-02-02 10:58:31.000000000 +0100 @@ -0,0 +1 @@ +pngtest-static diff -Nru libpng1.6-1.6.20/debian/control libpng1.6-1.6.20/debian/control --- libpng1.6-1.6.20/debian/control 2016-01-28 11:32:25.000000000 +0100 +++ libpng1.6-1.6.20/debian/control 2016-02-02 11:27:56.000000000 +0100 @@ -3,12 +3,11 @@ Priority: optional Maintainer: Anibal Monsalve Salazar <[email protected]> Uploaders: Nobuhiro Iwamatsu <[email protected]> -Build-Depends: debhelper (>= 9), zlib1g-dev, mawk, autotools-dev +Build-Depends: debhelper (>= 9), zlib1g-dev, mawk, dh-autoreconf Standards-Version: 3.9.6 Homepage: http://libpng.org/pub/png/libpng.html Package: libpng16-16 -Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: mzscheme (<= 1:209-5), pngcrush (<= 1.5.10-2), pngmeta (<= 1.11-3), qemacs (<= 0.3.1-5), povray-3.5 (<= 3.5.0c-10) @@ -24,11 +23,11 @@ Package: libpng16-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libpng16-16 (= ${binary:Version}), zlib1g-dev, libpng16-devtools (= ${binary:Version}) +Depends: ${misc:Depends}, libpng16-16 (= ${binary:Version}), zlib1g-dev Conflicts: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev Replaces: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev #Provides: libpng-dev -Recommends: libpng16-tools +Recommends: libpng16-tools, libpng16-devtools Multi-Arch: same Description: PNG library - development (version 1.6) libpng is a library implementing an interface for reading and writing @@ -40,12 +39,12 @@ Package: libpng16-devtools Section: libdevel Architecture: any -Multi-Arch: same +Multi-Arch: no Depends: ${shlibs:Depends}, ${misc:Depends}, libpng16-dev (= ${binary:Version}) Provides: libpng-devtools Conflicts: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev, libpng16-tools (<= 1.6.10-1) Replaces: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev -Description: PNG library - tools (version 1.6) +Description: PNG library - devtools (version 1.6) libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. . diff -Nru libpng1.6-1.6.20/debian/copyright libpng1.6-1.6.20/debian/copyright --- libpng1.6-1.6.20/debian/copyright 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/copyright 2016-02-02 10:58:31.000000000 +0100 @@ -2,6 +2,18 @@ Upstream-Name: libpng Source: http://www.libpng.org/pub/png/ +Files: * +Copyright: Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson +License: libpng + +Files: contrib/pngminus/* +Copyright: Willem van Schaik, 1999 +License: expat + +Files: contrib/tools/* +Copyright: 2013 John Cunningham Bowler +License: libpng + Files: pngwutil.c pngstruct.h pngwrite.c pnginfo.h pngrio.c png.h pngread.c pngwio.c pngrutil.c pngmem.c pngget.c pngtest.c pngrtran.c pngpriv.h pngset.c pngpread.c @@ -14,7 +26,7 @@ Files: contrib/gregbook/rpng-win.c contrib/gregbook/rpng2-x.c contrib/gregbook/rpng-x.c contrib/gregbook/readpng2.h contrib/gregbook/rpng2-win.c Copyright: 1998-2008 Greg Roelofs. All rights reserved -License: GPL-2+ or BSD-like with advertising clause +License: GPL-2+ or BSD-like-with-advertising-clause Files: contrib/gregbook/writepng.h contrib/gregbook/readppm.c contrib/gregbook/readpng.h contrib/gregbook/wpng.c @@ -22,7 +34,7 @@ contrib/gregbook/writepng.c contrib/visupng/resource.h contrib/visupng/cexcept.h Copyright: 2000-2008 Adam M. Costello and Cosmin Truta -License: GPL-2+ or BSD-like with advertising clause +License: GPL-2+ or BSD-like-with-advertising-clause Files: contrib/visupng/PngFile.c contrib/visupng/PngFile.h contrib/visupng/VisualPng.c @@ -54,22 +66,10 @@ Copyright: 2011-2013 John Cunningham Bowler License: libpng -Files: contrib/pngminus/* -Copyright: Willem van Schaik, 1999 -License: expat - -Files: contrib/tools/* -Copyright: 2013 John Cunningham Bowler -License: libpng - Files: contrib/tools/png-fix-itxt.c arm/arm_init.c arm/filter_neon_intrinsics.c Copyright: 2013 Glenn Randers-Pehrson License: libpng -Files: * -Copyright: Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson -License: libpng - Files: debian/* Copyright: copyright (C) 2001 Philippe Troin <[email protected]> copyright 2002 Junichi Uekawa <[email protected]> @@ -103,7 +103,7 @@ On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". -License: BSD-like with advertising clause +License: BSD-like-with-advertising-clause Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: diff -Nru libpng1.6-1.6.20/debian/copyright.in libpng1.6-1.6.20/debian/copyright.in --- libpng1.6-1.6.20/debian/copyright.in 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/copyright.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -This is the pre-packaged Debian Linux version of the libpng graphics -library. It was packaged by Philippe Troin <[email protected]> -from sources originally retrieved from ftp://swrinde.nde.swri.edu/pub/png/src/ - -The packaging itself is -copyright (C) 2001 Philippe Troin <[email protected]>, -copyright 2002 Junichi Uekawa <[email protected]>, -copyright 2003 Josselin Mouette <[email protected]> and -copyright 2006 Anibal Monsalve Salazar <[email protected]>. -It is licensed under the GNU General Public License. On -Debian systems, the GPL is in /usr/share/common-licenses/GPL. - -Here is the copyright and license for libpng: - diff -Nru libpng1.6-1.6.20/debian/libpng16-16.install libpng1.6-1.6.20/debian/libpng16-16.install --- libpng1.6-1.6.20/debian/libpng16-16.install 1970-01-01 01:00:00.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-16.install 2016-02-02 10:59:33.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libpng16.so.* diff -Nru libpng1.6-1.6.20/debian/libpng16-16.install.in libpng1.6-1.6.20/debian/libpng16-16.install.in --- libpng1.6-1.6.20/debian/libpng16-16.install.in 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-16.install.in 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libpng16.so.16* /lib/${DEB_HOST_MULTIARCH} diff -Nru libpng1.6-1.6.20/debian/libpng16-16.links.in libpng1.6-1.6.20/debian/libpng16-16.links.in --- libpng1.6-1.6.20/debian/libpng16-16.links.in 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-16.links.in 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/lib/${DEB_HOST_MULTIARCH}/libpng16.so.16 /usr/lib/${DEB_HOST_MULTIARCH}/libpng16.so.16 diff -Nru libpng1.6-1.6.20/debian/libpng16-16.lintian-overrides libpng1.6-1.6.20/debian/libpng16-16.lintian-overrides --- libpng1.6-1.6.20/debian/libpng16-16.lintian-overrides 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-16.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# This is lintian's problem. We need update lintian database. -# /usr/share/lintian/data/binaries/embedded-libs -libpng16-16: embedded-library lib/x86_64-linux-gnu/libpng16.so.16.19.0: libpng diff -Nru libpng1.6-1.6.20/debian/libpng16-16-udeb.install libpng1.6-1.6.20/debian/libpng16-16-udeb.install --- libpng1.6-1.6.20/debian/libpng16-16-udeb.install 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-16-udeb.install 2016-02-02 11:00:53.000000000 +0100 @@ -1 +1 @@ -usr/lib/*/libpng16.so.16* /lib +usr/lib/*/libpng16.so.* diff -Nru libpng1.6-1.6.20/debian/libpng16-16-udeb.lintian-overrides libpng1.6-1.6.20/debian/libpng16-16-udeb.lintian-overrides --- libpng1.6-1.6.20/debian/libpng16-16-udeb.lintian-overrides 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-16-udeb.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# This is lintian's problem. We need update lintian database. -# /usr/share/lintian/data/binaries/embedded-libs -libpng16-16-udeb udeb: embedded-library lib/libpng16.so.16.19.0: libpng diff -Nru libpng1.6-1.6.20/debian/libpng16-dev.dirs libpng1.6-1.6.20/debian/libpng16-dev.dirs --- libpng1.6-1.6.20/debian/libpng16-dev.dirs 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-dev.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/bin diff -Nru libpng1.6-1.6.20/debian/libpng16-dev.install libpng1.6-1.6.20/debian/libpng16-dev.install --- libpng1.6-1.6.20/debian/libpng16-dev.install 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-dev.install 2016-02-02 11:40:29.000000000 +0100 @@ -3,3 +3,4 @@ usr/lib/*/libpng.a usr/lib/*/libpng16.a usr/lib/*/libpng.so +usr/lib/*/libpng16.so diff -Nru libpng1.6-1.6.20/debian/libpng16-dev.links libpng1.6-1.6.20/debian/libpng16-dev.links --- libpng1.6-1.6.20/debian/libpng16-dev.links 1970-01-01 01:00:00.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-dev.links 2016-02-02 11:01:16.000000000 +0100 @@ -0,0 +1 @@ +/usr/include/libpng16 /usr/include/libpng diff -Nru libpng1.6-1.6.20/debian/libpng16-dev.links.in libpng1.6-1.6.20/debian/libpng16-dev.links.in --- libpng1.6-1.6.20/debian/libpng16-dev.links.in 2015-11-18 18:53:43.000000000 +0100 +++ libpng1.6-1.6.20/debian/libpng16-dev.links.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -/usr/include/libpng16 /usr/include/libpng -/lib/${DEB_HOST_MULTIARCH}/libpng16.so.16 /usr/lib/${DEB_HOST_MULTIARCH}/libpng16.so diff -Nru libpng1.6-1.6.20/debian/rules libpng1.6-1.6.20/debian/rules --- libpng1.6-1.6.20/debian/rules 2016-01-07 23:49:18.000000000 +0100 +++ libpng1.6-1.6.20/debian/rules 2016-02-02 10:58:56.000000000 +0100 @@ -4,55 +4,13 @@ # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) +%: + dh $@ --parallel --with autoreconf + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -CFLAGS = `dpkg-buildflags --get CFLAGS` -CFLAGS += -Wall -LDFLAGS = `dpkg-buildflags --get LDFLAGS` -LDFLAGS += "-Wl,-z,defs" -CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` - -config.status: configure - dh_testdir - cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess . - #./autogen.sh - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean pngtest-static - -install: build - dh_testdir - dh_testroot - dh_prep - set -e; for file in libpng16-16.install libpng16-16.links libpng16-dev.links ; \ - do \ - sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \ - debian/$${file}.in > debian/$$file; \ - done - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install +override_dh_auto_test: ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) gcc -Wall -g -O2 -c -o pngtest.o pngtest.c gcc -o pngtest -Wall -g -O2 pngtest.o -L.libs -lpng16 @@ -61,47 +19,11 @@ ./pngtest-static endif -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_link -i - dh_installchangelogs CHANGES -i - dh_installdocs -i - dh_install --sourcedir=debian/tmp -i - dh_installman -i - dh_strip -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_link -a - dh_installchangelogs -a CHANGES - dh_installdocs -a +override_dh_installchangelogs: + dh_installchangelogs CHANGES + +override_dh_installexamples: dh_installexamples -plibpng16-dev example.c pngtest.c pngtest.png - dh_install --sourcedir=debian/tmp -a - dh_installman -a - dh_lintian -plibpng16-16 -a - # This does not work.... - # dh_lintian -plibpng16-16-udeb -a - install -d debian/libpng16-16-udeb/usr/share/lintian/overrides - install -p -m644 debian/libpng16-16-udeb.lintian-overrides \ - debian/libpng16-16-udeb/usr/share/lintian/overrides/libpng16-16-udeb - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_makeshlibs --add-udeb=libpng16-16-udeb -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_makeshlibs: + dh_makeshlibs --add-udeb=libpng16-16-udeb -a
