Control: found -1 1.2.54-3 On Wed, 2016-02-17 12:52:28 +0100, Andreas Henriksson wrote: > Hello Petter Reinholdtsen. > > On Wed, Feb 17, 2016 at 09:28:12AM +0100, Petter Reinholdtsen wrote: >> Hi. This "fix" broke linking with -lpng12 on amd64, making the build of >> libkate fail. Note how the libpng12.so now is dangling: > > Sorry for not catching this issue and thanks for the clearly > pointing out the issue. > >> >> % ls -lh /usr/lib/x86_64-linux-gnu/libpng* >> lrwxrwxrwx 1 root root 10 Feb 16 13:33 /usr/lib/x86_64-linux-gnu/libpng.a >> -> libpng12.a >> lrwxrwxrwx 1 root root 11 Feb 16 13:33 /usr/lib/x86_64-linux-gnu/libpng.so >> -> libpng12.so >> -rw-r--r-- 1 root root 238K Feb 16 13:33 /usr/lib/x86_64-linux-gnu/libpng12.a >> lrwxrwxrwx 1 root root 13 Feb 16 13:33 >> /usr/lib/x86_64-linux-gnu/libpng12.so -> libpng12.so.0 >> % >> >> Please find a way to fix it or revert the change. I'll file a new RC bug >> about the issue. > > The attached patch should fix the problem (atleast libkate builds for > me using the resulting libpng12-{0,dev}). > > I'll volunteer to NMU this if Anibal is busy. Just say so if you want > me to go ahead without delay. > > Regards, > Andreas Henriksson
Thank you Andreas. I'll try your patch this coming weekend and upload it as 1.2.54-4. > diff -Nru libpng-1.2.54/debian/changelog libpng-1.2.54/debian/changelog > --- libpng-1.2.54/debian/changelog 2016-02-16 14:24:50.000000000 +0100 > +++ libpng-1.2.54/debian/changelog 2016-02-17 11:42:36.000000000 +0100 > @@ -1,3 +1,12 @@ > +libpng (1.2.54-2.1) UNRELEASED; urgency=medium > + > + * Non-maintainer upload. > + * libpng12-dev: point libpng{,12}.so to library in /lib/.. > + - ... without using any intermediate link as that was dropped in > + previous revision/upload. > + > + -- Andreas Henriksson <andr...@fatal.se> Wed, 17 Feb 2016 11:41:18 +0100 > + > libpng (1.2.54-2) unstable; urgency=medium > > [ Marco d'Itri ] > diff -Nru libpng-1.2.54/debian/libpng12-dev.install > libpng-1.2.54/debian/libpng12-dev.install > --- libpng-1.2.54/debian/libpng12-dev.install 2015-11-18 18:20:30.000000000 > +0100 > +++ libpng-1.2.54/debian/libpng12-dev.install 2016-02-17 11:40:08.000000000 > +0100 > @@ -2,5 +2,4 @@ > usr/lib/*/pkgconfig > usr/lib/*/libpng.a > usr/lib/*/libpng12.a > -usr/lib/*/libpng.so > usr/bin > diff -Nru libpng-1.2.54/debian/libpng12-dev.links.in > libpng-1.2.54/debian/libpng12-dev.links.in > --- libpng-1.2.54/debian/libpng12-dev.links.in 2015-11-18 > 18:20:30.000000000 +0100 > +++ libpng-1.2.54/debian/libpng12-dev.links.in 2016-02-17 > 12:47:54.000000000 +0100 > @@ -1,3 +1,4 @@ > /usr/share/man/man1/libpng12-config.1.gz > /usr/share/man/man1/libpng-config.1.gz > /usr/include/libpng12 /usr/include/libpng > -/usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 > /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so > +/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 > /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so > +/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 > /usr/lib/${DEB_HOST_MULTIARCH}/libpng.so
signature.asc
Description: Digital signature