From 4af143877155448dadfe2ac57e4b290a75b9ad49 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Feb 2016 21:39:16 +0000 Subject: use convention pkg-PATCHES/ instead of pkg-src-PATCHES/, for better completion git-svn-id: svn://tug.org/texlive/trunk@39725 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/libpng/ChangeLog | 5 +++++ Build/source/libs/libpng/Makefile.am | 5 +++-- Build/source/libs/libpng/Makefile.in | 2 +- Build/source/libs/libpng/libpng-PATCHES/ChangeLog | 14 ++++++++++++++ Build/source/libs/libpng/libpng-PATCHES/TL-Changes | 18 ++++++++++++++++++ Build/source/libs/libpng/libpng-src-PATCHES/ChangeLog | 14 -------------- Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes | 18 ------------------ 7 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 Build/source/libs/libpng/libpng-PATCHES/ChangeLog create mode 100644 Build/source/libs/libpng/libpng-PATCHES/TL-Changes delete mode 100644 Build/source/libs/libpng/libpng-src-PATCHES/ChangeLog delete mode 100644 Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes (limited to 'Build/source/libs/libpng') diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index a2d86e82d61..5c34fa6d895 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,8 @@ +2016-02-15 Karl Berry + + * libpng-PATCHES: rename from libpng-src-PATCHES. + * Makefile.am (EXTRA_DIST): likewise. + 2016-01-20 Karl Berry * Makefile.am (AM_CPPFLAGS): add LIBPNG_USER_CPPFLAGS for Mojca. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 805a6977de1..3141c432de1 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -1,6 +1,7 @@ ## Proxy Makefile.am to build libpng for TeX Live. ## -## Copyright (C) 2009-2016 Peter Breitenlohner +## Copyright (C) 2016 Karl Berry +## Copyright (C) 2009-2015 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -12,7 +13,7 @@ EXTRA_DIST = $(LIBPNG_TREE) ## Changes applied to the original source tree ## -EXTRA_DIST += $(LIBPNG_TREE)-PATCHES +EXTRA_DIST += libpng-PATCHES # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 7d66dedf22c..e780b5bd01f 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -561,7 +561,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES +EXTRA_DIST = $(LIBPNG_TREE) libpng-PATCHES NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/libs/libpng/libpng-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog new file mode 100644 index 00000000000..26311ea5079 --- /dev/null +++ b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog @@ -0,0 +1,14 @@ +2009-08-13 Martin Schröder + + * patch-01-static: Remove; has been integrated into libpng-1.2.39. + +2009-07-17 Peter Breitenlohner + + * patch-01-static: Adjust for libpng-1.2.38. + +2009-06-19 Peter Breitenlohner + + Create patch-01-static: + * libpng-1.2.37/png.c (png_64bit_product): declare as static to + avoid compiler warning. + diff --git a/Build/source/libs/libpng/libpng-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes new file mode 100644 index 00000000000..208d332de49 --- /dev/null +++ b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes @@ -0,0 +1,18 @@ +Changes applied to the libpng-1.6.21/ tree as obtained from: + http://www.libpng.org/ libpng-1.6.21.tar.xz + +Copied: + scripts/pnglibconf.h.prebuilt -> pnglibconf.h + +Removed: + Makefile.in + aclocal.m4 + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + test-driver diff --git a/Build/source/libs/libpng/libpng-src-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-src-PATCHES/ChangeLog deleted file mode 100644 index 26311ea5079..00000000000 --- a/Build/source/libs/libpng/libpng-src-PATCHES/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -2009-08-13 Martin Schröder - - * patch-01-static: Remove; has been integrated into libpng-1.2.39. - -2009-07-17 Peter Breitenlohner - - * patch-01-static: Adjust for libpng-1.2.38. - -2009-06-19 Peter Breitenlohner - - Create patch-01-static: - * libpng-1.2.37/png.c (png_64bit_product): declare as static to - avoid compiler warning. - diff --git a/Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes deleted file mode 100644 index 208d332de49..00000000000 --- a/Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes +++ /dev/null @@ -1,18 +0,0 @@ -Changes applied to the libpng-1.6.21/ tree as obtained from: - http://www.libpng.org/ libpng-1.6.21.tar.xz - -Copied: - scripts/pnglibconf.h.prebuilt -> pnglibconf.h - -Removed: - Makefile.in - aclocal.m4 - compile - config.guess - config.sub - configure - depcomp - install-sh - ltmain.sh - missing - test-driver -- cgit v1.2.3