--- libpng-1.2.8rel.orig/debian/control +++ libpng-1.2.8rel/debian/control @@ -0,0 +1,59 @@ +Source: libpng +Section: libs +Priority: optional +Maintainer: Josselin Mouette +Build-Depends: debhelper (>= 4.2), zlib1g-dev, cdbs, mawk +Standards-Version: 3.6.2 + +Package: libpng12-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: PNG library - runtime + libpng is a library implementing an interface for reading and writing + PNG (Portable Network Graphics) format files. + . + This package contains the runtime library files needed to run software + using libpng. + . + URL: http://www.libpng.org/pub/png/libpng.html + +Package: libpng12-dev +Section: libdevel +Architecture: any +Depends: libpng12-0 (= ${Source-Version}), zlib1g-dev +Conflicts: libpng2-dev, libpng-dev, libpng12-0-dev, libpng2 (<< 1.0.12-3) +Provides: libpng-dev, libpng12-0-dev, libpng3-dev +Replaces: libpng3-dev (<= 1.2.5), libpng12-0-dev +Description: PNG library - development + libpng is a library implementing an interface for reading and writing + PNG (Portable Network Graphics) format files. + . + This package contains the header and development files needed to build + programs and packages using libpng. + . + URL: http://www.libpng.org/pub/png/libpng.html + +Package: libpng3 +Section: oldlibs +Architecture: all +Depends: libpng12-0 (>= 1.2.5.0-2) +Description: PNG library - runtime + libpng is a library implementing an interface for reading and writing + PNG (Portable Network Graphics) format files. + . + This package is superseded by libpng12-0, and is provided only for + transitional purposes. + +Package: libpng12-0-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: zlib1g-udeb +Provides: libpng12-0 +Description: PNG library - minimal runtime library + libpng is a library implementing an interface for reading and writing + PNG (Portable Network Graphics) format files. + . + This package provides the minimal libpng12 runtime library needed for + the debian-installer. --- libpng-1.2.8rel.orig/debian/libpng12-0-udeb.dirs +++ libpng-1.2.8rel/debian/libpng12-0-udeb.dirs @@ -0,0 +1 @@ +/usr/lib --- libpng-1.2.8rel.orig/debian/libpng3.links +++ libpng-1.2.8rel/debian/libpng3.links @@ -0,0 +1,2 @@ +/usr/share/doc/libpng12-0 /usr/share/doc/libpng3 +/usr/lib/libpng12.so.0 /usr/lib/libpng.so.3 --- libpng-1.2.8rel.orig/debian/libpng12-0.shlibs +++ libpng-1.2.8rel/debian/libpng12-0.shlibs @@ -0,0 +1 @@ +libpng12 0 libpng12-0 (>= 1.2.8rel) --- libpng-1.2.8rel.orig/debian/rules +++ libpng-1.2.8rel/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +SONAME = libpng12.so.0 +UPACKAGE = libpng12-0-udeb + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk + +ifeq ($(DEB_BUILD_GNU_CPU),i486) + DEB_PATCHDIRS := debian/patches debian/x86_patches +endif +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEBCFLAGS:= -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBCFLAGS += -O0 +else + DEBCFLAGS += -O2 +endif + +DEB_MAKE_INVOKE := $(MAKE) DESTDIR=debian/tmp DEBCFLAGS="$(DEBCFLAGS)" -f scripts/makefile.elf prefix=/usr +DEB_MAKE_INSTALL_TARGET := install + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + DEB_MAKE_CHECK_TARGET := test +endif + +DEB_INSTALL_DOCS_libpng3 := --no-act +DEB_INSTALL_DOCS_libpng12-dev := --no-act +DEB_INSTALL_CHANGELOGS_libpng3 := --no-act +DEB_INSTALL_CHANGELOGS_libpng12-dev := --no-act + +binary-post-install/libpng12-dev:: + dh_installdocs -plibpng12-dev -Xcopyright + +clean:: + cat debian/copyright.in LICENSE > debian/copyright + +install/$(UPACKAGE):: + cp $(SONAME) $(CURDIR)/debian/$(UPACKAGE)/usr/lib/ --- libpng-1.2.8rel.orig/debian/changelog +++ libpng-1.2.8rel/debian/changelog @@ -0,0 +1,598 @@ +libpng (1.2.8rel-5) unstable; urgency=low + + * drop_pass_width.patch: don't export png_pass_width, it's absolutely + unnecessary. + * libpng12-0.shlibs: downgrade the shlibs accordingly + (closes: #331383). + + -- Josselin Mouette Mon, 3 Oct 2005 20:18:43 +0200 + +libpng (1.2.8rel-4) unstable; urgency=low + + * makefile.patch: + + Use PNG_PRIVATE to get the list of private symbols as well. It + sucks, but they've been there for too long (closes: #329886). + + Use mawk instead of awk (closes: #329812). + * control: build-depend on mawk. + * rules: + + Use -O2, not -O3. + + Actually run the tests. + + Make use of x86_patches/ on x86 architectures. + * x86_patches/mmxbuild.patch: build MMX routines in pnggccrd.c. + * x86_patches/pnggccrd-PIC.patch: patch from Christian Aichinger + to make the assembly routines PIC-compatible. + * libpng12-0.shlibs: bump the shlibs version. + + -- Josselin Mouette Sun, 25 Sep 2005 15:25:34 +0200 + +libpng (1.2.8rel-3) unstable; urgency=low + + * Upload to unstable. + * Rename the source package to libpng. + + -- Josselin Mouette Thu, 22 Sep 2005 18:24:37 +0200 + +libpng3 (1.2.8rel-2) experimental; urgency=low + + * makefile.patch: + + now patch makefile.elf, so that only public symbols are truly + exported. + + shorten the differences as much as possible. + * rules: use makefile.elf now. + * Move libpng3 to oldlibs. + * Entirely remove libpng3-dev, making libpng12-dev provide it + (closes: #322051). + * poynton.patch: correct Charles Poynton's address (closes: #289437). + * Don't run the test when cross-building (closes: #285427). + * setjmp_error.patch: don't stop when we are not using _BSD_SOURCE, as + in this case this is harmless (closes: #299343). + * libpng3.postinst: removed, the fix is in sarge. + * Standards-version is 3.6.2. + * legacy_symbols.patch: still export png_read_destroy and + png_write_destroy, which are deprecated but should nevertheless be + accessible. + + -- Josselin Mouette Tue, 13 Sep 2005 02:07:16 +0200 + +libpng3 (1.2.8rel-1) unstable; urgency=medium + + * New upstream release. + * read_transformations.patch: removed, included upstream. + * libpng12-0.shlibs: Update to version 1.2.8rel, new flags seem to have been + added. + + -- Josselin Mouette Sat, 4 Dec 2004 15:54:53 +0100 + +libpng3 (1.2.8beta5-2) unstable; urgency=medium + + * read_transformations.patch: fix segmentation fault with latex + (closes: #281789) and totem (closes: #278618). + + -- Josselin Mouette Thu, 25 Nov 2004 16:49:28 +0100 + +libpng3 (1.2.8beta5-1) unstable; urgency=medium + + * New upstream release. + + Correct segmentation violation in png_combine_row. + Closes: #278526, #278917, #278921, #279258, #281789, #282368. + + -- Josselin Mouette Wed, 24 Nov 2004 13:53:49 +0100 + +libpng3 (1.2.7-1) unstable; urgency=medium + + * New upstream release (closes: #278308). + * libpng12-0.shlibs: update shlibs to version 1.2.7. + * Remove all security fixed, they are included upstream. + + -- Josselin Mouette Tue, 26 Oct 2004 13:40:25 +0200 + +libpng3 (1.2.5.0-9) unstable; urgency=high + + * CAN-2004-0954.patch: removed, this is already fixed in + CAN-2004-0597_0598_0599.patch. + + -- Josselin Mouette Tue, 19 Oct 2004 10:52:28 +0200 + +libpng3 (1.2.5.0-8) unstable; urgency=high + + * Switch to CDBS. + + Ship modifications and security fixes in debian/patches. + + debian/rules: rewritten. + + debian/control: build-depend on cdbs. + + debian/libpng12-0.shlibs: new. + * setjmp_error.patch: port explanation of the error when including setjmp.h + from libpng10, thanks Matijs van Zuijlen + (closes: #273473). + * CAN-2004-0954.patch: fix buffer overflow vulnerability in + png_handle_tRNS(). + * CAN-2004-0955.patch: fix integer arithmetic overflow vulnerability in + png_read_png(). + + -- Josselin Mouette Thu, 14 Oct 2004 20:06:08 +0200 + +libpng3 (1.2.5.0-7) unstable; urgency=high + + * pngrtran.c: applied upstream patch 4 to fix incorrect calculation of + buffer offsets [CAN-2004-0768]. + * png.h, pngpread.c, pngrutil.c: patch from Chris Evans + to fix several vulnerabilities (closes: #263500): + + libpng fails to properly check length on PNG data [CAN-2004-0597]. + + libpng "png_handle_sBIT" does not perform proper checks to avoid stack + buffer overflow [CAN-2004-0597]. + + libpng "png_handle_iCCP" possible NULL-pointer crash + [CAN-2004-0598]. + + libpng "png_handle_sPLT" possible integer overflow + [CAN-2004-0599]. + + libpng "png_read_png" does not properly handle a PNG with excessive + height (integer overflow) [CAN-2004-0599]. + + libpng progressive reading integer overflow [CAN-2004-0599]. + + -- Josselin Mouette Thu, 5 Aug 2004 12:37:32 +0200 + +libpng3 (1.2.5.0-6) unstable; urgency=high + + * pngerror.c: applied patch by Steve Grubb to + fix unintended memory access that could result in a crash of the + application linking against libpng [CAN-2004-0421]. + + -- Josselin Mouette Tue, 20 Apr 2004 13:39:02 +0200 + +libpng3 (1.2.5.0-5) unstable; urgency=low + + * Use debhelper 4.2, which generates the udeb appropriately. + * Update control and rules appropriately. + * Don't use ${shlibs:Depends} for the udeb, rather write the + dependencies by hand. + * Standards-version is 3.6.1. + + -- Josselin Mouette Fri, 20 Feb 2004 19:23:05 +0100 + +libpng3 (1.2.5.0-4) unstable; urgency=low + + * scripts/makefile.linux: use versioned dependencies + (closes: #155891). + * debian/rules: bump dependency for dh_makeshlibs. + * add the libpng.a link in libpng12-dev. + * Rework scripts/makefile.linux to make it more consistent. + * Update stuff in debian/ accordingly. + * Updated README.Debian. + + -- Josselin Mouette Tue, 10 Jun 2003 18:14:32 +0200 + +libpng3 (1.2.5.0-3) unstable; urgency=low + + * Make libpng3{,-dev} depend on libpng12-{0,dev} >= 1.2.5.0-2 instead + of the strict source version. + * Move /usr/share/doc/libpng3{,-dev} into symlinks at postinst time + when directories already exist. + * debian/rules: install correctly doc-base stuff. + * debian/libpng12-dev.doc-base: updated URIs. + + -- Josselin Mouette Tue, 6 May 2003 19:44:59 +0200 + +libpng3 (1.2.5.0-2) unstable; urgency=low + + * scripts/{makefile.linux,libpng-config-body.in}: correct the + libpng12-config script. + * Install correctly pkg-config stuff (closes: #191081). + * Make libpng12-dev conflict explicitly with libpng12-0-dev. + * Update README.Debian. + + -- Josselin Mouette Mon, 28 Apr 2003 19:42:15 +0200 + +libpng3 (1.2.5.0-1) unstable; urgency=low + + * New maintainer. + * Use real upstream tarball from 1.2.5 release. + * Use dpkg-source's way instead of dpatch for patching. + * A bit of rework in debian/rules, use dh_install and debhelper 4. + * Standards-version is 3.5.9. + * The -dev package is now named libpng12-dev (stop using the + libpkg-guide way). + * libpng3 is now arch-independent. + * Improved descriptions a bit. + * Don't supply libpngpf.3, it is not useful to programmers. + + -- Josselin Mouette Wed, 16 Apr 2003 18:41:02 +0200 + +libpng3 (1.2.5-11) unstable; urgency=low + + * Add udeb (closes: #174842) + * Add missing section on source files. + + -- Junichi Uekawa Mon, 31 Mar 2003 00:28:06 +0900 + +libpng3 (1.2.5-10) unstable; urgency=low + + * Rebuild with d-shlibs with fixed "libgcc_s1-dev" handling (for gcc-3.2). + (closes: #178070), build-depend on d-shlibs 0.10 or greater. + + -- Junichi Uekawa Fri, 24 Jan 2003 12:23:35 +0900 + +libpng3 (1.2.5-9) unstable; urgency=low + + * Use dpatch for patch system -- divide Debian patch, and security fix patch. + * Standards-Version: 3.5.8 + * add manual page libpng-config.1 and libpng12-config.1 + + -- Junichi Uekawa Wed, 15 Jan 2003 17:55:17 +0900 + +libpng3 (1.2.5-8) unstable; urgency=low + + * Sorry folks, I made a mistake. + * Forward-port of patch from the Security Team, + really apply what was there. (closes: #172868,#172871) + + -- Junichi Uekawa Fri, 13 Dec 2002 16:12:01 +0900 + +libpng3 (1.2.5-7) unstable; urgency=high + + * Forward-port of patch from the Security Team + * Applied patch to pngrtran.c by Glenn Randers-Pehrson + to fix a buffer overrun. + + -- Junichi Uekawa Thu, 12 Dec 2002 20:36:28 +0900 + +libpng3 (1.2.5-6) unstable; urgency=low + + * Typo in scripts/makefile.linux. + Mistake. -lz and -lm weren't happening. + * Change LDFLAGS to not list -lz -lm, so that testsuite will catch such error. + * set prefix=/usr/ in scripts/makefile.linux, since it was set to usr/local. + + -- Junichi Uekawa Wed, 30 Oct 2002 20:54:54 +0900 + +libpng3 (1.2.5-5) unstable; urgency=low + + * scripts/makefile.linux: LIBADDFLAGS introduced, for shared library lib additional + flags, and use that for shared library. + - this should fix build failure (closes: #166704) + Thanks Daniel Schepler for reporting. + * updated copyright file to note that libpng3 in Debian is patched to + link with -lz -lm. + + -- Junichi Uekawa Mon, 28 Oct 2002 12:25:57 +0900 + +libpng3 (1.2.5-4) unstable; urgency=low + + * Trying to fix the problem that libpng3 seems to be not linked against libz. + LDFLAGS was defined but not being used. + Thanks Mike Furr for reporting (closes: #166489) + + -- Junichi Uekawa Sun, 27 Oct 2002 16:07:54 +0900 + +libpng3 (1.2.5-3) unstable; urgency=low + + * Fixed description, I mixed up the -devel and non-devel + packages. + * updated README.Debian. + + -- Junichi Uekawa Thu, 24 Oct 2002 18:56:34 +0900 + +libpng3 (1.2.5-2) unstable; urgency=low + + * careless mistake :( + * reinstall libpng.so symlink in libpng-12-0-dev package. + Otherwise other packages won't build ... + + -- Junichi Uekawa Wed, 23 Oct 2002 16:46:23 +0900 + +libpng3 (1.2.5-1) unstable; urgency=low + + * New upstream version (closes: #163425) + * re-patched makefile.linux to work with system zlib, + added workaround to set CFLAGS, and remove rpath settings from LDFLAGS + * Use debhelper. + * No longer create /usr/doc symlinks. + * Standards-Version: 3.5.7 + + -- Junichi Uekawa Tue, 22 Oct 2002 21:05:33 +0900 + +libpng3 (1.2.1-5) unstable; urgency=low + + * Not yet released. + * Change priority from standard to optional. + + -- Junichi Uekawa Sun, 15 Sep 2002 15:39:12 +0900 + +libpng3 (1.2.1-4) unstable; urgency=low + + * change -dev dependency of libc6-dev to libc-dev + + -- Junichi Uekawa Fri, 13 Sep 2002 18:40:53 +0900 + +libpng3 (1.2.1-3) unstable; urgency=low + + * Security fix backported from 1.2.4. Check bounds of variables. + (closes: #155403) + + -- Junichi Uekawa Wed, 7 Aug 2002 17:30:32 +0900 + +libpng3 (1.2.1-2) unstable; urgency=low + + * New maintainer (closes: #151343) + * apply buffer overflow patch for interlaced png files (closes: #150595) + * update description for libpng3-dev. + * change libpng-dev to libpng3-dev + + -- Junichi Uekawa Thu, 25 Jul 2002 16:28:24 +0900 + +libpng3 (1.2.1-1.1) unstable; urgency=low + + * NMU + * Provides: libpng2-dev has been changed to Provides: libpng3-dev + libpng2-dev can be put back in when some kind of sane transition has + finished. + (closes: #128384, #128871, #129268, #129269) + + -- Junichi Uekawa Tue, 12 Feb 2002 02:31:53 +0900 + +libpng3 (1.2.1-1) unstable; urgency=low + + * New upstream version; closes: #125679. + * New source package name: libpng3. + * Renamed libpng-dev to libpng-dev to avoid having to maintain several + development packages (the -dev is source compatible). + * Moved png.5 into the -dev package. + * Added a Replaces: libpng2 to libpng-dev so that we can steal the png.5 + manpage without fuss. + * Changed debian/shlibs for libpng3. + * Compress examples/pngtest.c. + + -- Philippe Troin Tue, 18 Dec 2001 20:01:04 -0800 + +libpng (1.0.12-3) unstable; urgency=low + + * Moved the png.5 manpage to the dev package to allow multiple libpng + packages installed at the same time. + + -- Philippe Troin Tue, 18 Dec 2001 23:58:25 -0800 + +libpng (1.0.12-2) unstable; urgency=low + + * Changed libpng2-dev's section to devel to resync with override file. + * Fixed upstream version detection in debian/rules; closes: #105931. + + -- Philippe Troin Sun, 29 Jul 2001 11:52:40 -0700 + +libpng (1.0.12-1) unstable; urgency=low + + * New upstream release; closes: #105354. + * Bumped dependency information in debian/shlibs to libpng >= 1.0.12 + since there were some non-backwards compatible changes to the API. + * Added support for DEB_BUILD_OPTIONS and get-orig-source to debian/rules. + * Added call to ldconfig on postrm's remove. + * Removed INSTALL file from /usr/share/doc/libpng2. + * Bumped standards version to 3.5.5.0. + + -- Philippe Troin Tue, 17 Jul 2001 23:32:36 -0700 + +libpng (1.0.11-1) unstable; urgency=low + + * New upstream release. + + -- Philippe Troin Wed, 2 May 2001 20:43:51 -0700 + +libpng (1.0.10-2) unstable; urgency=low + + * Force recompile because of bad sparc package. + * Libpng2's priority changed to standard to comply with the override file. + + -- Philippe Troin Tue, 24 Apr 2001 11:49:31 -0700 + +libpng (1.0.10-1) unstable; urgency=low + + * New upstream release. + * Changed shlib to depend on libpng2 (>= 2.0.10) because of + non-backwards compatible changes. + + -- Philippe Troin Sun, 22 Apr 2001 22:48:30 -0700 + +libpng (1.0.8-1) unstable; urgency=low + + * Changed the doc-base type from 'test' to 'text'; closes: #59877. + * New upstream relase 1.0.8; closes: #70464. + * Updated copyright notice. + * Removed Y2kINFO from the doc directory. + * Added pngtest.c in examples; closes: #65229. + * Updated to standards version 3.2.1.0. + * Added build-depends line in control file; closes: #69291. + + -- Philippe Troin Mon, 11 Sep 2000 23:19:12 -0700 + +libpng (1.0.5-1) frozen unstable; urgency=low + + * Maintainer upload (closes: #48244, #48246). + * Added some extra explanations for the setjmp.h mess (closes: #56759), + see pngconf.h for details. + + -- Philippe Troin Mon, 28 Feb 2000 13:53:22 -0800 + +libpng (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer release. + * New upstream release. (closes:Bug#48244). + * Remove versioned depend from shlibs (closes:Bug#48246). + + -- Joel Klecker Sat, 30 Oct 1999 08:12:53 -0700 + +libpng (1.0.3-1) unstable; urgency=low + + * New upstream version (1.0.3); Closes: #31870, #46333. + * Maintainer upload, closes NMU bugs; Closes: #28412, #31523, #31690. + * FHS compliant. + * New standard-version 3.0.1. + * Lintian clean. + * Removed temporary zlib1g line in control file (used to be a bug in + zlib1g). + * Moved the documentation file to the -dev package. + * Register documentation file to doc-base. + * Fontified man pages with addformat script; Closes #38680. + + -- Philippe Troin Mon, 4 Oct 1999 18:59:42 -0700 + +libpng (1.0.2b-0.1) frozen unstable; urgency=low + + * New upstream (bug-fix only) version. + (Should fix bugs #31690滼, since I can't reproduce them) + From the author: + "I have recently uploaded libpng-1.0.2b to + ftp://swrinde.nde.swri.edu/pub/png-group/src + I plan to release it as libpng-1.0.3 in a + few days, but would like to hear whether it + fixes the problems with GNOME. + It restores a few lines of code that were + inadvertently deleted from pngread.c, which + seems to be the cause of problems with adding + an alpha channel (which you fixed by downgrading + to libpng-1.0.1's pngread.c)." + [Glenn Randers-Pehrson ] + * Masquerade version number to 1.0.3 to make Imlib & Co. happy. + + -- Vincent Renardias Mon, 11 Jan 1999 06:27:55 +0100 + +libpng (1.0.2-1.1) frozen unstable; urgency=low + + * Fix Important bug #28412 + (using pngread.c from libpng-1.0.1 did the trick). + + -- Vincent Renardias Wed, 6 Jan 1999 19:00:15 +0100 + +libpng (1.0.2-1) unstable; urgency=low + + * Maintainer release (to change a bit). + * Pristine sources. + * Libpng2-dev includes example.c (fixes bug #10315). + * Changed control file to reflect difference with libpng0g (fixes #23795). + * Recompiled (should fix the zlib1g missing symbol, bug #24450). + * Added -D_REENTRANT also to static library. + * Added a dependency upon zlib1g >= 1.1.2 (otherwise we get a missing + symbol) (fixes bug #24450). + + -- Philippe Troin Tue, 22 Sep 1998 00:17:16 -0700 + +libpng (1.0.2-0.1) unstable; urgency=low + + * Non-maintainer release + * New upstream version + + -- Karl M. Hegbloom Tue, 4 Aug 1998 23:47:00 -0700 + +libpng (1.0.1-0.2) unstable; urgency=medium + + * debian/rules (binary-arch): don't call install with -s as an + argument when installing a shared library; it doesn't know to use + --strip-unneeded, and we call strip separately later anyway. + * scripts/makefile.lnx (CFLAGS): killed i386-isms. + * scripts/makefile.lnx: compiled shared libraries with -D_REENTRANT. + (The above fixes are from James Troup, who yet again, alerted me to + my screwups ;) + * debian/postinst: only call ldconfig if $1 = configure. + + -- Joel Klecker Wed, 17 Jun 1998 10:25:27 -0700 + +libpng (1.0.1-0.1) unstable; urgency=low + + * New upstream bug fix release. + * Include man pages. + + -- Joel Klecker Wed, 06 May 1998 08:51:49 -0700 + +libpng (1.0.0-0.1) unstable; urgency=low + + * Non-maintainer Release. + * New Upstream Release. + * Changed source package name to `libpng'. + * Added `-f makefile.lnx' to make invocations in debian/rules. + * Removed `ldconfig' call from postrm. + + -- Joel Klecker Tue, 4 Mar 1998 17:58:05 -0800 + +libpng0 (0.96-5) unstable; urgency=low + + * Removed executable permissions on shared libs (fixes bug #15478). + * Updated Standards-Version to 2.3.0.1. + + -- Philippe Troin Sun, 25 Jan 1998 13:19:51 -0800 + +libpng0 (0.96-4) unstable; urgency=low + + * Shared libraries are stripped with --strip-unneeded and static + libraries with --strip-debug (fixes bug #15669). + * Made the build strip non-i386 specific (patch by James Troup) (fixes + bug #13832). + * Removed the dependency between the libc5 and libc6 versions. + + -- Philippe Troin Sun, 18 Jan 1998 22:37:19 -0800 + +libpng0 (0.96-3) unstable; urgency=low + + * Libc6 compilation. + + -- Philippe Troin Tue, 23 Sep 1997 21:38:42 -0700 + +libpng0 (0.96-2) unstable; urgency=low + + * Fixed permissions in /usr/doc/libpng0 (fixes bug #10540). + + -- Philippe Troin Sun, 15 Jun 1997 13:18:38 -0700 + +libpng0 (0.96-1) unstable; urgency=low + + * New upstream sources. + + -- Philippe Troin Thu, 12 Jun 1997 23:32:29 -0700 + +libpng0 (0.95b-1) unstable; urgency=low + + * New maintainer. + * Upgraded to upstream version 0.95b. + * Make debian/rules version independent. + * Debian/rules clean now removes substvars. + * Bumped the shlibs version to 0.95 as some incompatibilities were + introduced between 0.89 and 0.90. + * Added the Section: and Priority: fields to the control file (fixes bug + #6370). + * Now /usr/doc/libpng0 contains various info and the debian change log + stuff (fixes bug #7925). + * Added -D_REENTRANT compilation flag. + + -- Philippe Troin Fri, 18 Apr 1997 14:44:09 -0700 + +libpng (0.89c-6) unstable; urgency=low + + * Moved shlibs file to correct location + + -- Michael Alan Dorman Sun, 15 Dec 1996 13:03:19 -0500 + +libpng (0.89c-5) unstable; urgency=low + + * Added shlibs file + + -- Michael Alan Dorman Sat, 23 Nov 1996 16:23:06 -0500 + +libpng (0.89c-4) unstable; urgency=low + + * Now stripping shared libraries (Bug#5134) + + -- Michael Alan Dorman Sat, 23 Nov 1996 12:05:06 -0500 + +libpng (0.89c-3) unstable; urgency=low + + * Corrected maintainers address + + -- Michael Alan Dorman Mon, 23 Sep 1996 12:52:03 -0400 + +libpng (0.89c-2) unstable; urgency=low + + * Accommodate the fact that dpkg-source doesn't properly preserve + permissions on scripts when extracting package. (Bug#4513) + + -- Michael Alan Dorman Mon, 23 Sep 1996 12:34:35 -0400 + +libpng (0.89c-1) unstable; urgency=low + + * New upstream version. + * Moved to new source packaging format. + + -- Michael Alan Dorman Thu, 12 Sep 1996 15:19:35 -0400 --- libpng-1.2.8rel.orig/debian/libpng12-config.1 +++ libpng-1.2.8rel/debian/libpng12-config.1 @@ -0,0 +1,58 @@ +.TH libpng12-config 1 "15 Jan 2003" "libpng" "Debian GNU/Linux" +.SH NAME +libpng12-config \- get information about installed libpng library +.SH SYNOPSIS +.B libpng12-config +[\fIOPTION\fR] ... +.SH DESCRIPTION +Provides information about libpng library. + +Known values for OPTION are: +.TP +\fB\-\-prefix\fR +print libpng prefix +.TP +\fB\-\-libdir\fR +print path to directory containing library +.TP +\fB\-\-libs\fR +print library linking information +.TP +\fB\-\-ccopts\fR +print compiler options +.TP +\fB\-\-cppflags\fR +print pre-processor flags +.TP +\fB\-\-cflags\fR +print preprocessor flags, I_opts, and compiler options +.TP +\fB\-\-I_opts\fR +print "-I" include options +.TP +\fB\-\-L_opts\fR +print linker "-L" flags for dynamic linking +.TP +\fB\-\-R_opts\fR +print dynamic linker "-R" or "-rpath" flags +.TP +\fB\-\-ldopts\fR +print linker options +.TP +\fB\-\-ldflags\fR +print linker flags (ldopts, L_opts, R_opts, and libs) +.TP +\fB\-\-static\fR +revise subsequent outputs for static linking +.TP +\fB\-\-help\fR +print this help and exit +.TP +\fB\-\-version\fR +print version information +.SH "AUTHOR" +This manpage has been written by Junichi Uekawa +for Debian GNU/Linux system, with the help of help2man, and +may be used by others. + + --- libpng-1.2.8rel.orig/debian/libpng12-dev.manpages +++ libpng-1.2.8rel/debian/libpng12-dev.manpages @@ -0,0 +1,3 @@ +libpng.3 +png.5 +debian/libpng12-config.1 --- libpng-1.2.8rel.orig/debian/copyright.in +++ libpng-1.2.8rel/debian/copyright.in @@ -0,0 +1,12 @@ +This is the pre-packaged Debian Linux version of the libpng graphics +library. It was packaged by Philippe Troin +from sources originally retrieved from ftp://swrinde.nde.swri.edu/pub/png/src/ + +The packaging itself is copyright (C) 2001 Philippe Troin +, copyright 2002 Junichi Uekawa , and +copyright 2003 Josselin Mouette . 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: + --- libpng-1.2.8rel.orig/debian/compat +++ libpng-1.2.8rel/debian/compat @@ -0,0 +1 @@ +4 --- libpng-1.2.8rel.orig/debian/README.Debian +++ libpng-1.2.8rel/debian/README.Debian @@ -0,0 +1,31 @@ +libpng for Debian +----------------- + +There have been changes in the way libpng is handled. Currently, there +are 2 versions of libpng in Debian at a time : libpng10 and libpng12, +formerly known as libpng2 and libpng3. + +* The libpng10-0 and libpng12-0 packages contain the runtime for apps + built with these new libraries. +* libpng2 and libpng3 contain compatibility symlinks to let apps built + with older versions work correctly. +* libpng10-dev and libpng12-dev are the corresponding development + packages. You should only use libpng10-dev to build packages using + gdk-imlib1. +* libpng2-dev and libpng3-dev provide compatibility symlinks to build + applications still build-depending on those. + +A package linking with libpng should use as build-depends : +* libpng-dev for small packages not depending on other libraries which + use or may use libpng. +* libpng10-dev for packages also linking with gdk-imlib1 or gnome 1. +* libpng12-dev for packages also linking with SDL, Gnome 2, Qt, or any + other library using libpng12. + +This version diverges from upstream in 3 ways : +1) the library is explicitly linked with -lm -lz +2) libpng.so.3 is just a compatibility symlink +3) symbols are versioned + + -- Junichi Uekawa , Mon Oct 28 2002 12:27:54 + -- Josselin Mouette , Tue Jun 10 2003 18:16:17 +0200 --- libpng-1.2.8rel.orig/debian/x86_patches/mmxbuild.patch +++ libpng-1.2.8rel/debian/x86_patches/mmxbuild.patch @@ -0,0 +1,20 @@ +--- scripts/makefile.elf.old 2005-09-25 11:54:00.000000000 +0200 ++++ scripts/makefile.elf 2005-09-25 11:54:30.000000000 +0200 +@@ -38,7 +38,7 @@ + + # for pgcc version 2.95.1, -O3 is buggy; don't use it. + +-CFLAGS=-Wall -D_REENTRANT \ ++CFLAGS=-Wall -D_REENTRANT -DPNG_USE_PNGGCCRD \ + $(ALIGN) $(DEBCFLAGS) # $(WARNMORE) -g -DPNG_DEBUG=5 + + LDFLAGS=-L. -lpng12 +@@ -70,7 +70,7 @@ + + OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ + pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ +- pngwtran.o pngmem.o pngerror.o pngpread.o ++ pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o + + OBJSDLL = $(OBJS:.o=.pic.o) + --- libpng-1.2.8rel.orig/debian/x86_patches/pnggccrd-PIC.patch +++ libpng-1.2.8rel/debian/x86_patches/pnggccrd-PIC.patch @@ -0,0 +1,149 @@ +--- libpng-1.2.8rel/pnggccrd.c 2004-12-03 01:14:25.000000000 +0100 ++++ libpng-1.2.8rel.fixed/pnggccrd.c 2005-09-25 15:00:07.000000000 +0200 +@@ -1737,6 +1737,7 @@ + int dummy_value_c; // fix 'forbidden register spilled' + int dummy_value_S; + int dummy_value_D; ++ int dummy_value_a; + + __asm__ __volatile__ ( + "subl $21, %%edi \n\t" +@@ -1744,7 +1745,7 @@ + + ".loop3_pass0: \n\t" + "movd (%%esi), %%mm0 \n\t" // x x x x x 2 1 0 +- "pand _const4, %%mm0 \n\t" // z z z z z 2 1 0 ++ "pand (%3), %%mm0 \n\t" // z z z z z 2 1 0 + "movq %%mm0, %%mm1 \n\t" // z z z z z 2 1 0 + "psllq $16, %%mm0 \n\t" // z z z 2 1 0 z z + "movq %%mm0, %%mm2 \n\t" // z z z 2 1 0 z z +@@ -1769,12 +1770,14 @@ + + : "=c" (dummy_value_c), // output regs (dummy) + "=S" (dummy_value_S), +- "=D" (dummy_value_D) ++ "=D" (dummy_value_D), ++ "=a" (dummy_value_a) ++ + + : "1" (sptr), // esi // input regs + "2" (dp), // edi + "0" (width), // ecx +- "rim" (_const4) // %1(?) (0x0000000000FFFFFFLL) ++ "3" (&_const4) // %1(?) (0x0000000000FFFFFFLL) + + #if 0 /* %mm0, ..., %mm4 not supported by gcc 2.7.2.3 or egcs 1.1 */ + : "%mm0", "%mm1", "%mm2" // clobber list +@@ -1787,6 +1790,7 @@ + int dummy_value_c; // fix 'forbidden register spilled' + int dummy_value_S; + int dummy_value_D; ++ int dummy_value_a; + + __asm__ __volatile__ ( + "subl $9, %%edi \n\t" +@@ -1794,7 +1798,7 @@ + + ".loop3_pass2: \n\t" + "movd (%%esi), %%mm0 \n\t" // x x x x x 2 1 0 +- "pand _const4, %%mm0 \n\t" // z z z z z 2 1 0 ++ "pand (%3), %%mm0 \n\t" // z z z z z 2 1 0 + "movq %%mm0, %%mm1 \n\t" // z z z z z 2 1 0 + "psllq $16, %%mm0 \n\t" // z z z 2 1 0 z z + "movq %%mm0, %%mm2 \n\t" // z z z 2 1 0 z z +@@ -1813,12 +1817,13 @@ + + : "=c" (dummy_value_c), // output regs (dummy) + "=S" (dummy_value_S), +- "=D" (dummy_value_D) ++ "=D" (dummy_value_D), ++ "=a" (dummy_value_a) + + : "1" (sptr), // esi // input regs + "2" (dp), // edi + "0" (width), // ecx +- "rim" (_const4) // (0x0000000000FFFFFFLL) ++ "3" (&_const4) // (0x0000000000FFFFFFLL) + + #if 0 /* %mm0, ..., %mm2 not supported by gcc 2.7.2.3 or egcs 1.1 */ + : "%mm0", "%mm1", "%mm2" // clobber list +@@ -1839,6 +1844,8 @@ + int dummy_value_c; // fix 'forbidden register spilled' + int dummy_value_S; + int dummy_value_D; ++ int dummy_value_a; ++ int dummy_value_d; + + __asm__ __volatile__ ( + "subl $3, %%esi \n\t" +@@ -1850,14 +1857,14 @@ + "movq %%mm0, %%mm1 \n\t" // x x 5 4 3 2 1 0 + "movq %%mm0, %%mm2 \n\t" // x x 5 4 3 2 1 0 + "psllq $24, %%mm0 \n\t" // 4 3 2 1 0 z z z +- "pand _const4, %%mm1 \n\t" // z z z z z 2 1 0 ++ "pand (%3), %%mm1 \n\t" // z z z z z 2 1 0 + "psrlq $24, %%mm2 \n\t" // z z z x x 5 4 3 + "por %%mm1, %%mm0 \n\t" // 4 3 2 1 0 2 1 0 + "movq %%mm2, %%mm3 \n\t" // z z z x x 5 4 3 + "psllq $8, %%mm2 \n\t" // z z x x 5 4 3 z + "movq %%mm0, (%%edi) \n\t" + "psrlq $16, %%mm3 \n\t" // z z z z z x x 5 +- "pand _const6, %%mm3 \n\t" // z z z z z z z 5 ++ "pand (%4), %%mm3 \n\t" // z z z z z z z 5 + "por %%mm3, %%mm2 \n\t" // z z x x 5 4 3 5 + "subl $6, %%esi \n\t" + "movd %%mm2, 8(%%edi) \n\t" +@@ -1868,13 +1875,15 @@ + + : "=c" (dummy_value_c), // output regs (dummy) + "=S" (dummy_value_S), +- "=D" (dummy_value_D) ++ "=D" (dummy_value_D), ++ "=a" (dummy_value_a), ++ "=d" (dummy_value_d) + + : "1" (sptr), // esi // input regs + "2" (dp), // edi + "0" (width_mmx), // ecx +- "rim" (_const4), // 0x0000000000FFFFFFLL +- "rim" (_const6) // 0x00000000000000FFLL ++ "3" (&_const4), // 0x0000000000FFFFFFLL ++ "4" (&_const6) // 0x00000000000000FFLL + + #if 0 /* %mm0, ..., %mm3 not supported by gcc 2.7.2.3 or egcs 1.1 */ + : "%mm0", "%mm1" // clobber list +@@ -5339,6 +5348,7 @@ + png_mmx_support(void) + { + #if defined(PNG_MMX_CODE_SUPPORTED) ++ int result; + __asm__ __volatile__ ( + "pushl %%ebx \n\t" // ebx gets clobbered by CPUID instruction + "pushl %%ecx \n\t" // so does ecx... +@@ -5380,7 +5390,6 @@ + "0: \n\t" // .NOT_SUPPORTED: target label for jump instructions + "movl $0, %%eax \n\t" // set return value to 0 + "1: \n\t" // .RETURN: target label for jump instructions +- "movl %%eax, _mmx_supported \n\t" // save in global static variable, too + "popl %%edx \n\t" // restore edx + "popl %%ecx \n\t" // restore ecx + "popl %%ebx \n\t" // restore ebx +@@ -5388,15 +5397,16 @@ + // "ret \n\t" // DONE: no MMX support + // (fall through to standard C "ret") + +- : // output list (none) ++ : "=a" (result) // output list + + : // any variables used on input (none) + +- : "%eax" // clobber list ++ // no clobber list + // , "%ebx", "%ecx", "%edx" // GRR: we handle these manually + // , "memory" // if write to a variable gcc thought was in a reg + // , "cc" // "condition codes" (flag bits) + ); ++ _mmx_supported = result; + #else + _mmx_supported = 0; + #endif /* PNG_MMX_CODE_SUPPORTED */ --- libpng-1.2.8rel.orig/debian/libpng12-dev.doc-base +++ libpng-1.2.8rel/debian/libpng12-dev.doc-base @@ -0,0 +1,25 @@ +Document: libpng12 +Title: A description on how to use and modify libpng (version 1.2.X) +Author: Glenn Randers-Pehrson +Abstract: This file describes how to use and modify the PNG reference library + (known as libpng) for your own use. There are five sections to this + file: introduction, structures, reading, writing, and modification and + configuration notes for various special platforms. In addition to this + file, example.c is a good starting point for using the library, as + it is heavily commented and should include everything most people + will need. We assume that libpng is already installed; see the + INSTALL file for instructions on how to install libpng. + . + Libpng was written as a companion to the PNG specification, as a way + of reducing the amount of time and effort it takes to support the PNG + file format in application programs. The PNG specification is available + as RFC 2083 and as a + W3C Recommendation . Some + additional chunks are described in the special-purpose public chunks + documents at . Other information + about PNG, and the latest version of libpng, can be found at the PNG home + page, . +Section: Apps/Programming + +Format: text +Files: /usr/share/doc/libpng12-0/libpng.txt.gz --- libpng-1.2.8rel.orig/debian/patches/legacy_symbols.patch +++ libpng-1.2.8rel/debian/patches/legacy_symbols.patch @@ -0,0 +1,22 @@ +--- png.h.old 2005-09-13 02:04:18.000000000 +0200 ++++ png.h 2005-09-13 02:06:04.000000000 +0200 +@@ -1678,7 +1678,8 @@ + png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); + + /* free all memory used by the read (old method - NOT DLL EXPORTED) */ +-extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr, ++/* Debian note: exporting as it is required by legacy applications */ ++extern PNG_EXPORT(void,png_read_destroy) PNGARG((png_structp png_ptr, png_infop info_ptr, + png_infop end_info_ptr)); + + /* free any memory associated with the png_struct and the png_info_structs */ +@@ -1686,7 +1687,8 @@ + PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); + + /* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */ +-extern void png_write_destroy PNGARG((png_structp png_ptr)); ++/* Debian note: exporting as it is required by legacy applications */ ++extern PNG_EXPORT(void,png_write_destroy) PNGARG((png_structp png_ptr)); + + /* set the libpng method of handling chunk CRC errors */ + extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr, --- libpng-1.2.8rel.orig/debian/patches/setjmp_error.patch +++ libpng-1.2.8rel/debian/patches/setjmp_error.patch @@ -0,0 +1,28 @@ +--- pngconf.h.orig 2005-09-13 00:24:26.000000000 +0200 ++++ pngconf.h 2005-09-13 00:56:00.000000000 +0200 +@@ -299,13 +299,18 @@ + # ifdef _BSD_SOURCE + # define PNG_SAVE_BSD_SOURCE + # undef _BSD_SOURCE +-# endif +-# ifdef _SETJMP_H +- /* If you encounter a compiler error here, see the explanation +- * near the end of INSTALL. +- */ +- __png.h__ already includes setjmp.h; +- __dont__ include it again.; ++# ifdef _SETJMP_H ++/* Explanation added by debian maintainer Philippe Troin . ++ There are two versions of setjmp, depending wether or not we compile for ++ BSD. They are incompatible and can cause crashes. The PNG people force ++ here a unique behavior for setjmp. It fou get the error below, ++ then include before . ++*/ ++/* Extra modification by Josselin Mouette : there is no ++ * need to fail if we are not using _BSD_SOURCE. ++ * */ ++# error png.h already includes setjmp.h with some additional fixup. ++# endif + # endif + # endif /* __linux__ */ + --- libpng-1.2.8rel.orig/debian/patches/makefile.patch +++ libpng-1.2.8rel/debian/patches/makefile.patch @@ -0,0 +1,144 @@ +--- scripts/makefile.elf.old 2005-09-25 13:05:56.000000000 +0200 ++++ scripts/makefile.elf 2005-09-25 13:22:35.000000000 +0200 +@@ -3,6 +3,12 @@ + # Copyright (C) 1996, 1997 Andreas Dilger + # For conditions of distribution and use, see copyright notice in png.h + ++# Modified for Debian by Junichi Uekawa and Josselin Mouette ++# Major modifications are: ++# * link libpng explicitly with libz and libm ++# * libpng.so.3 is a symlink rather than a different library ++# * versioned symbols ++ + LIBNAME = libpng12 + PNGMAJ = 0 + PNGMIN = 1.2.8 +@@ -31,11 +37,12 @@ + + # for pgcc version 2.95.1, -O3 is buggy; don't use it. + +-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ +- $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 ++CFLAGS=-Wall -D_REENTRANT \ ++ $(ALIGN) $(DEBCFLAGS) # $(WARNMORE) -g -DPNG_DEBUG=5 + +-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm +-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm ++LDFLAGS=-L. -lpng12 ++LDFLAGS_A=libpng.a -lz -lm ++LIBADDFLAGS=-lz -lm + + RANLIB=ranlib + #RANLIB=echo +@@ -81,8 +88,8 @@ + cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc + + libpng.syms: png.h pngconf.h +- $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS png.h |\ +- awk -F '[\t [\]();]' 'BEGIN{print "{global:"}\ ++ $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\ ++ mawk -F '[\t [\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG12_%s {global:\n",PNGMAJ)}\ + { for (i=1;i+2<=NF;++i)\ + if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ + print $$(i+1) ";";\ +@@ -97,9 +104,10 @@ + ( cat scripts/libpng-config-head.in; \ + echo prefix=\"$(prefix)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ +- echo L_opts=\"-L$(LIBPATH)\"; \ +- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ +- echo libs=\"-lpng12 -lz -lm\"; \ ++ echo L_opts=\"\"; \ ++ echo R_opts=\"\"; \ ++ echo libs=\"-lpng12\"; \ ++ echo all_libs=\"-lpng12 $(LIBADDFLAGS)\"; \ + cat scripts/libpng-config-body.in ) > libpng-config + chmod +x libpng-config + +@@ -110,17 +118,11 @@ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + + $(LIBNAME).so.$(PNGVER): $(OBJSDLL) libpng.syms +- $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ ++ $(CC) -shared $(LIBADDFLAGS) -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ + -Wl,-version-script,libpng.syms \ + -o $(LIBNAME).so.$(PNGVER) \ + $(OBJSDLL) + +-libpng.so.3.$(PNGMIN): $(OBJSDLL) libpng.syms +- $(CC) -shared -Wl,-soname,libpng.so.3 \ +- -Wl,-version-script,libpng.syms \ +- -o libpng.so.3.$(PNGMIN) \ +- $(OBJSDLL) +- + pngtest: pngtest.o $(LIBNAME).so + $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) + +@@ -131,14 +133,14 @@ + @echo "" + @echo " Running pngtest dynamically linked with $(LIBNAME).so:" + @echo "" +- ./pngtest ++ LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./pngtest + @echo "" + @echo " Running pngtest statically linked with libpng.a:" + @echo "" + ./pngtest-static + + install-headers: png.h pngconf.h +- -@if [ ! -d $(DI) ]; then mkdir $(DI); fi ++ -@if [ ! -d $(DI) ]; then mkdir -p $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + cp png.h pngconf.h $(DI)/$(LIBNAME) + chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h +@@ -147,27 +149,24 @@ + (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + + install-static: install-headers libpng.a +- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi ++ -@if [ ! -d $(DL) ]; then mkdir -p $(DL); fi + cp libpng.a $(DL)/$(LIBNAME).a + chmod 644 $(DL)/$(LIBNAME).a + -@/bin/rm -f $(DL)/libpng.a + (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + +-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ +- libpng.so.3.$(PNGMIN) +- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi ++install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ++ -@if [ ! -d $(DL) ]; then mkdir -p $(DL); fi + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@/bin/rm -f $(DL)/libpng.so + -@/bin/rm -f $(DL)/libpng.so.3 + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* + cp $(LIBNAME).so.$(PNGVER) $(DL) +- cp libpng.so.3.$(PNGMIN) $(DL) + chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) +- chmod 755 $(DL)/libpng.so.3.$(PNGMIN) + (cd $(DL); \ +- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ +- ln -sf libpng.so.3 libpng.so; \ ++ ln -sf $(LIBNAME).so.$(PNGMAJ) libpng.so.3; \ ++ ln -sf $(LIBNAME).so libpng.so; \ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi +@@ -178,7 +177,7 @@ + (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + + install-man: libpng.3 libpngpf.3 png.5 +- -@if [ ! -d $(DM) ]; then mkdir $(DM); fi ++ -@if [ ! -d $(DM) ]; then mkdir -p $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi + -@/bin/rm -f $(DM)/man3/libpng.3 + -@/bin/rm -f $(DM)/man3/libpngpf.3 +@@ -189,7 +188,7 @@ + cp png.5 $(DM)/man5 + + install-config: libpng-config +- -@if [ ! -d $(DB) ]; then mkdir $(DB); fi ++ -@if [ ! -d $(DB) ]; then mkdir -p $(DB); fi + -@/bin/rm -f $(DB)/libpng-config + -@/bin/rm -f $(DB)/$(LIBNAME)-config + cp libpng-config $(DB)/$(LIBNAME)-config --- libpng-1.2.8rel.orig/debian/patches/drop_pass_width.patch +++ libpng-1.2.8rel/debian/patches/drop_pass_width.patch @@ -0,0 +1,11 @@ +--- png.h.orig 2005-10-03 20:12:48.000000000 +0200 ++++ png.h 2005-10-03 20:15:57.000000000 +0200 +@@ -456,7 +456,7 @@ + PNG_EXPORT_VAR (const int FARDATA) png_pass_mask[7]; + PNG_EXPORT_VAR (const int FARDATA) png_pass_dsp_mask[7]; + #ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +-PNG_EXPORT_VAR (const int FARDATA) png_pass_width[7]; ++const int FARDATA png_pass_width[7]; + #endif + /* This isn't currently used. If you need it, see png.c for more details. + PNG_EXPORT_VAR (const int FARDATA) png_pass_height[7]; --- libpng-1.2.8rel.orig/debian/patches/poynton.patch +++ libpng-1.2.8rel/debian/patches/poynton.patch @@ -0,0 +1,14 @@ +--- libpng.txt.orig 2005-09-13 00:42:43.000000000 +0200 ++++ libpng.txt 2005-09-13 00:44:10.000000000 +0200 +@@ -922,8 +922,9 @@ + gray = (rw*red + gw*green + bw*blue)/65536; + + The default values approximate those recommended in the Charles +-Poynton's Color FAQ, +-Copyright (c) 1998-01-04 Charles Poynton ++Poynton's Color FAQ, ++ ++Copyright (c) 2002-12-16 Charles Poynton + + Y = 0.212671 * R + 0.715160 * G + 0.072169 * B + --- libpng-1.2.8rel.orig/debian/patches/correct_linking.patch +++ libpng-1.2.8rel/debian/patches/correct_linking.patch @@ -0,0 +1,19 @@ +--- libpng3-1.2.5.0.orig/scripts/libpng-config-body.in ++++ libpng3-1.2.5.0/scripts/libpng-config-body.in +@@ -83,6 +83,7 @@ + + --static) + R_opts="" ++ libs=${all_libs} + ;; + + *) +--- libpng3-1.2.5.0.orig/scripts/libpng.pc.in ++++ libpng3-1.2.5.0/scripts/libpng.pc.in +@@ -7,5 +7,5 @@ + Name: libpng12 + Description: Loads and saves PNG files + Version: 1.2.8 +-Libs: -L${libdir} -lpng12 -lz -lm ++Libs: -lpng12 + Cflags: -I${includedir}/libpng12 --- libpng-1.2.8rel.orig/debian/copyright +++ libpng-1.2.8rel/debian/copyright @@ -0,0 +1,121 @@ +This is the pre-packaged Debian Linux version of the libpng graphics +library. It was packaged by Philippe Troin +from sources originally retrieved from ftp://swrinde.nde.swri.edu/pub/png/src/ + +The packaging itself is copyright (C) 2001 Philippe Troin +, copyright 2002 Junichi Uekawa , and +copyright 2003 Josselin Mouette . 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: + + +This copy of the libpng notices is provided for your convenience. In case of +any discrepancy between this copy and the notices in the file png.h that is +included in the libpng distribution, the latter shall prevail. + +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + +If you modify libpng you may insert additional notices immediately following +this sentence. + +libpng version 1.2.6, December 3, 2004, is +Copyright (c) 2004 Glenn Randers-Pehrson, and is +distributed according to the same disclaimer and license as libpng-1.2.5 +with the following individual added to the list of Contributing Authors + + Cosmin Truta + +libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are +Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are +distributed according to the same disclaimer and license as libpng-1.0.6 +with the following individuals added to the list of Contributing Authors + + Simon-Pierre Cadieux + Eric S. Raymond + Gilles Vollant + +and with the following additions to the disclaimer: + + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. + +libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are +Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are +distributed according to the same disclaimer and license as libpng-0.96, +with the following individuals added to the list of Contributing Authors: + + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik + +libpng versions 0.89, June 1996, through 0.96, May 1997, are +Copyright (c) 1996, 1997 Andreas Dilger +Distributed according to the same disclaimer and license as libpng-0.88, +with the following individuals added to the list of Contributing Authors: + + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner + +libpng versions 0.5, May 1995, through 0.88, January 1996, are +Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + +For the purposes of this copyright and license, "Contributing Authors" +is defined as the following set of individuals: + + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing Authors +and Group 42, Inc. disclaim all warranties, expressed or implied, +including, without limitation, the warranties of merchantability and of +fitness for any purpose. The Contributing Authors and Group 42, Inc. +assume no liability for direct, indirect, incidental, special, exemplary, +or consequential damages, which may result from the use of the PNG +Reference Library, even if advised of the possibility of such damage. + +Permission is hereby granted to use, copy, modify, and distribute this +source code, or portions hereof, for any purpose, without fee, subject +to the following restrictions: + +1. The origin of this source code must not be misrepresented. + +2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + +3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + +The Contributing Authors and Group 42, Inc. specifically permit, without +fee, and encourage the use of this source code as a component to +supporting the PNG file format in commercial products. If you use this +source code in a product, acknowledgment is not required but would be +appreciated. + + +A "png_get_copyright" function is available, for convenient use in "about" +boxes and the like: + + printf("%s",png_get_copyright(NULL)); + +Also, the PNG logo (in PNG format, of course) is supplied in the +files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + +Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a +certification mark of the Open Source Initiative. + +Glenn Randers-Pehrson +glennrp at users.sourceforge.net +December 3, 2004 --- libpng-1.2.8rel.orig/debian/libpng12-0.install +++ libpng-1.2.8rel/debian/libpng12-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpng12.so.0* --- libpng-1.2.8rel.orig/debian/libpng12-dev.install +++ libpng-1.2.8rel/debian/libpng12-dev.install @@ -0,0 +1,6 @@ +example.c pngtest.c pngtest.png /usr/share/doc/libpng12-0/examples +libpng.txt /usr/share/doc/libpng12-0 +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/{libpng.a,libpng12.a,libpng.so,libpng12.so} +debian/tmp/usr/bin --- libpng-1.2.8rel.orig/debian/libpng12-0.docs +++ libpng-1.2.8rel/debian/libpng12-0.docs @@ -0,0 +1,4 @@ +README +TODO +ANNOUNCE +KNOWNBUG --- libpng-1.2.8rel.orig/debian/libpng12-dev.links +++ libpng-1.2.8rel/debian/libpng12-dev.links @@ -0,0 +1,2 @@ +/usr/share/doc/libpng12-0 /usr/share/doc/libpng12-dev +/usr/share/man/man1/libpng12-config.1.gz /usr/share/man/man1/libpng-config.1.gz