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

48 files changed, 76 insertions, 22 deletions

diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 0ba6bad3174..baec6d9f570 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* cairo-PATCHES: rename from cairo-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2015-12-28  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import cairo-1.14.6.
diff --git a/Build/source/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am
index 0ba37595038..42c0ecefd00 100644
--- a/Build/source/libs/cairo/Makefile.am
+++ b/Build/source/libs/cairo/Makefile.am
@@ -1,7 +1,8 @@
 ## Proxy Makefile.am to build cairo for TeX Live.
 ##
-##   Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -13,7 +14,7 @@ EXTRA_DIST = $(CAIRO_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(CAIRO_TREE)-PATCHES
+EXTRA_DIST += cairo-PATCHES
 
 CAIRO_SRC = $(CAIRO_TREE)/src
 
diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in
index 3e367397dee..2bc53c82d15 100644
--- a/Build/source/libs/cairo/Makefile.in
+++ b/Build/source/libs/cairo/Makefile.in
@@ -914,7 +914,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES
+EXTRA_DIST = $(CAIRO_TREE) cairo-PATCHES
 CAIRO_SRC = $(CAIRO_TREE)/src
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/libs/cairo/cairo-src-PATCHES/ChangeLog b/Build/source/libs/cairo/cairo-PATCHES/ChangeLog
index d8fa743af03..d8fa743af03 100644
--- a/Build/source/libs/cairo/cairo-src-PATCHES/ChangeLog
+++ b/Build/source/libs/cairo/cairo-PATCHES/ChangeLog
diff --git a/Build/source/libs/cairo/cairo-src-PATCHES/TL-Changes b/Build/source/libs/cairo/cairo-PATCHES/TL-Changes
index 07117c82d20..07117c82d20 100644
--- a/Build/source/libs/cairo/cairo-src-PATCHES/TL-Changes
+++ b/Build/source/libs/cairo/cairo-PATCHES/TL-Changes
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 01ac67a7902..a82eaa7b0ee 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* freetype-PATCHES: rename from freetype-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2016-02-12  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import freetype-2.6.3.
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 16637fa9d53..0fb1de191bf 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -1,5 +1,6 @@
 ## Wrapper Makefile.am to build FreeType for TeX Live.
 ##
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
@@ -12,7 +13,7 @@ EXTRA_DIST = $(FREETYPE_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(FREETYPE_TREE)-PATCHES
+EXTRA_DIST += freetype-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index fc421cfe5f2..ccbae8b14cf 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -235,7 +235,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(FREETYPE_TREE) $(FREETYPE_TREE)-PATCHES
+EXTRA_DIST = $(FREETYPE_TREE) freetype-PATCHES
 NEVER_DIST = `find . $(NEVER_NAMES)`
 NEVER_NAMES = -name .svn
 NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
diff --git a/Build/source/libs/freetype2/freetype-src-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-PATCHES/ChangeLog
index c69be79d0a1..c69be79d0a1 100644
--- a/Build/source/libs/freetype2/freetype-src-PATCHES/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-PATCHES/ChangeLog
diff --git a/Build/source/libs/freetype2/freetype-src-PATCHES/TL-Changes b/Build/source/libs/freetype2/freetype-PATCHES/TL-Changes
index c595783b65a..c595783b65a 100644
--- a/Build/source/libs/freetype2/freetype-src-PATCHES/TL-Changes
+++ b/Build/source/libs/freetype2/freetype-PATCHES/TL-Changes
diff --git a/Build/source/libs/gmp/ChangeLog b/Build/source/libs/gmp/ChangeLog
index 94c6f2de5df..18252dcc023 100644
--- a/Build/source/libs/gmp/ChangeLog
+++ b/Build/source/libs/gmp/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* gmp-PATCHES: rename from gmp-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2015-12-28  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import gmp-6.1.0.
diff --git a/Build/source/libs/gmp/Makefile.am b/Build/source/libs/gmp/Makefile.am
index 34f862f6738..064939feb0f 100644
--- a/Build/source/libs/gmp/Makefile.am
+++ b/Build/source/libs/gmp/Makefile.am
@@ -1,7 +1,8 @@
 ## Proxy Makefile.am to build GNU MP for TeX Live.
 ##
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
+##   Copyright (C) 2014-2015 Peter Breitenlohner <tex-live@tug.org>
 ##   Copyright (C) 2014 Taco Hoekwater <taco@metatex.org>
-##   Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -13,7 +14,7 @@ EXTRA_DIST = $(GMP_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(GMP_TREE)-PATCHES
+EXTRA_DIST += gmp-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/libs/gmp/Makefile.in b/Build/source/libs/gmp/Makefile.in
index 56e33413b51..91dcf704bbd 100644
--- a/Build/source/libs/gmp/Makefile.in
+++ b/Build/source/libs/gmp/Makefile.in
@@ -721,7 +721,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(GMP_TREE) $(GMP_TREE)-PATCHES
+EXTRA_DIST = $(GMP_TREE) gmp-PATCHES
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/libs/gmp/gmp-src-PATCHES/ChangeLog b/Build/source/libs/gmp/gmp-PATCHES/ChangeLog
index 12e4e93b696..12e4e93b696 100644
--- a/Build/source/libs/gmp/gmp-src-PATCHES/ChangeLog
+++ b/Build/source/libs/gmp/gmp-PATCHES/ChangeLog
diff --git a/Build/source/libs/gmp/gmp-src-PATCHES/TL-Changes b/Build/source/libs/gmp/gmp-PATCHES/TL-Changes
index 5b403d1df85..5b403d1df85 100644
--- a/Build/source/libs/gmp/gmp-src-PATCHES/TL-Changes
+++ b/Build/source/libs/gmp/gmp-PATCHES/TL-Changes
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index 4a5098a3001..7b4f7aa594b 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* graphite2-PATCHES: rename from graphite2-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2016-01-20  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import graphite2-1.3.5.
diff --git a/Build/source/libs/graphite2/Makefile.am b/Build/source/libs/graphite2/Makefile.am
index 4f44d14b813..243ab035d96 100644
--- a/Build/source/libs/graphite2/Makefile.am
+++ b/Build/source/libs/graphite2/Makefile.am
@@ -1,5 +1,6 @@
 ## Proxy Makefile.am to build graphite2 for TeX Live.
 ##
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
@@ -12,7 +13,7 @@ EXTRA_DIST = $(GRAPHITE2_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(GRAPHITE2_TREE)-PATCHES
+EXTRA_DIST += graphite2-PATCHES
 
 GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src
 GRAPHITE2_INC = $(GRAPHITE2_TREE)/include
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index 4cef4adff54..1e1e9df7fb7 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -644,7 +644,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(GRAPHITE2_TREE) $(GRAPHITE2_TREE)-PATCHES
+EXTRA_DIST = $(GRAPHITE2_TREE) graphite2-PATCHES
 GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src
 GRAPHITE2_INC = $(GRAPHITE2_TREE)/include
 NEVER_DIST = `find . $(NEVER_NAMES)`
diff --git a/Build/source/libs/graphite2/graphite2-src-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-PATCHES/ChangeLog
index a50f2b72941..a50f2b72941 100644
--- a/Build/source/libs/graphite2/graphite2-src-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-PATCHES/ChangeLog
diff --git a/Build/source/libs/graphite2/graphite2-src-PATCHES/TL-Changes b/Build/source/libs/graphite2/graphite2-PATCHES/TL-Changes
index 56d22845393..56d22845393 100644
--- a/Build/source/libs/graphite2/graphite2-src-PATCHES/TL-Changes
+++ b/Build/source/libs/graphite2/graphite2-PATCHES/TL-Changes
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 54466c685b0..be0ba4ff36c 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* harfbuzz-PATCHES: rename from harfbuzz-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2016-01-12  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import harfbuzz-1.1.3.
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index 058368caa41..1d75c2f7554 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -1,5 +1,6 @@
 ## Proxy Makefile.am to build harfbuzz for TeX Live.
 ##
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
@@ -12,7 +13,7 @@ EXTRA_DIST = $(HARFBUZZ_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(HARFBUZZ_TREE)-PATCHES
+EXTRA_DIST += harfbuzz-PATCHES
 
 HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src
 
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 277f4593c1c..72d518b378a 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -627,7 +627,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(HARFBUZZ_TREE) $(HARFBUZZ_TREE)-PATCHES
+EXTRA_DIST = $(HARFBUZZ_TREE) harfbuzz-PATCHES
 HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
index c0434328266..c0434328266 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes
index 817d2eeed7b..817d2eeed7b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes
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  <karl@tug.org>
+
+	* libpng-PATCHES: rename from libpng-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2016-01-20  Karl Berry  <karl@tug.org>
 
 	* 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 <tex-live@tug.org>
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
+##   Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   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-src-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog
index 26311ea5079..26311ea5079 100644
--- a/Build/source/libs/libpng/libpng-src-PATCHES/ChangeLog
+++ b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog
diff --git a/Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes
index 208d332de49..208d332de49 100644
--- a/Build/source/libs/libpng/libpng-src-PATCHES/TL-Changes
+++ b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes
diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog
index 40bddee164f..d29f7df8eb9 100644
--- a/Build/source/libs/pixman/ChangeLog
+++ b/Build/source/libs/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* pixman-PATCHES: rename from pixman-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2016-02-04  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import pixman-0.34.0.
diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am
index 4efb7a49242..0a0bc589ae3 100644
--- a/Build/source/libs/pixman/Makefile.am
+++ b/Build/source/libs/pixman/Makefile.am
@@ -1,7 +1,8 @@
 ## Proxy Makefile.am to build pixman for TeX Live.
 ##
-##   Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -13,7 +14,7 @@ EXTRA_DIST = $(PIXMAN_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(PIXMAN_TREE)-PATCHES
+EXTRA_DIST += pixman-PATCHES
 
 PIXMAN_SRC = $(PIXMAN_TREE)/pixman
 
diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in
index b0a5a656416..beaf9b8ce76 100644
--- a/Build/source/libs/pixman/Makefile.in
+++ b/Build/source/libs/pixman/Makefile.in
@@ -584,7 +584,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES
+EXTRA_DIST = $(PIXMAN_TREE) pixman-PATCHES
 PIXMAN_SRC = $(PIXMAN_TREE)/pixman
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/libs/pixman/pixman-src-PATCHES/ChangeLog b/Build/source/libs/pixman/pixman-PATCHES/ChangeLog
index 39dcd76ca07..39dcd76ca07 100644
--- a/Build/source/libs/pixman/pixman-src-PATCHES/ChangeLog
+++ b/Build/source/libs/pixman/pixman-PATCHES/ChangeLog
diff --git a/Build/source/libs/pixman/pixman-src-PATCHES/TL-Changes b/Build/source/libs/pixman/pixman-PATCHES/TL-Changes
index 7df6c0ac66a..7df6c0ac66a 100644
--- a/Build/source/libs/pixman/pixman-src-PATCHES/TL-Changes
+++ b/Build/source/libs/pixman/pixman-PATCHES/TL-Changes
diff --git a/Build/source/libs/pixman/pixman-src-PATCHES/patch-01-hide-symbols b/Build/source/libs/pixman/pixman-PATCHES/patch-01-hide-symbols
index 62cc5f039f7..62cc5f039f7 100644
--- a/Build/source/libs/pixman/pixman-src-PATCHES/patch-01-hide-symbols
+++ b/Build/source/libs/pixman/pixman-PATCHES/patch-01-hide-symbols
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index bfee65c2a50..94b722c34d2 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* poppler-PATCHES: rename from poppler-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2016-01-14  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import poppler-0.40.0.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 08659d33dfe..0c3f0343e4b 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -1,5 +1,6 @@
 ## Proxy Makefile.am to build poppler for TeX Live.
 ##
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
@@ -12,7 +13,7 @@ EXTRA_DIST = $(POPPLER_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(POPPLER_TREE)-PATCHES
+EXTRA_DIST += poppler-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index c0172019f6f..980f969ddf1 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -427,7 +427,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(POPPLER_TREE) $(POPPLER_TREE)-PATCHES
+EXTRA_DIST = $(POPPLER_TREE) poppler-PATCHES
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/libs/poppler/poppler-src-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-PATCHES/ChangeLog
index 0682274abde..0682274abde 100644
--- a/Build/source/libs/poppler/poppler-src-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-PATCHES/ChangeLog
diff --git a/Build/source/libs/poppler/poppler-src-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-PATCHES/TL-Changes
index 990ae4297cb..990ae4297cb 100644
--- a/Build/source/libs/poppler/poppler-src-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-PATCHES/TL-Changes
diff --git a/Build/source/libs/poppler/poppler-src-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX
index c2ea5b60be6..c2ea5b60be6 100644
--- a/Build/source/libs/poppler/poppler-src-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX
diff --git a/Build/source/libs/poppler/poppler-src-PATCHES/patch-03-Object-functions b/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions
index d90fb2ac7be..d90fb2ac7be 100644
--- a/Build/source/libs/poppler/poppler-src-PATCHES/patch-03-Object-functions
+++ b/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions
diff --git a/Build/source/libs/potrace/ChangeLog b/Build/source/libs/potrace/ChangeLog
index a896d1709ea..cfb22aec393 100644
--- a/Build/source/libs/potrace/ChangeLog
+++ b/Build/source/libs/potrace/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15  Karl Berry  <karl@tug.org>
+
+	* potrace-PATCHES: rename from potrace-src-PATCHES.
+	* Makefile.am (EXTRA_DIST): likewise.
+
 2015-12-28  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import potrace-1.13.
diff --git a/Build/source/libs/potrace/Makefile.am b/Build/source/libs/potrace/Makefile.am
index 5a619b14e30..55765a0cf40 100644
--- a/Build/source/libs/potrace/Makefile.am
+++ b/Build/source/libs/potrace/Makefile.am
@@ -1,5 +1,6 @@
 ## Proxy Makefile.am to build potrace for TeX Live.
 ##
+##   Copyright (C) 2016 Karl Berry <tex-live@tug.org>
 ##   Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
@@ -12,7 +13,7 @@ EXTRA_DIST = $(POTRACE_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(POTRACE_TREE)-PATCHES
+EXTRA_DIST += potrace-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/libs/potrace/Makefile.in b/Build/source/libs/potrace/Makefile.in
index 7b161b86e32..76b021f6fd5 100644
--- a/Build/source/libs/potrace/Makefile.in
+++ b/Build/source/libs/potrace/Makefile.in
@@ -547,7 +547,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(POTRACE_TREE) $(POTRACE_TREE)-PATCHES
+EXTRA_DIST = $(POTRACE_TREE) potrace-PATCHES
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/libs/potrace/potrace-src-PATCHES/ChangeLog b/Build/source/libs/potrace/potrace-PATCHES/ChangeLog
index b006f21b545..b006f21b545 100644
--- a/Build/source/libs/potrace/potrace-src-PATCHES/ChangeLog
+++ b/Build/source/libs/potrace/potrace-PATCHES/ChangeLog
diff --git a/Build/source/libs/potrace/potrace-src-PATCHES/TL-Changes b/Build/source/libs/potrace/potrace-PATCHES/TL-Changes
index 5eeb6e10376..5eeb6e10376 100644
--- a/Build/source/libs/potrace/potrace-src-PATCHES/TL-Changes
+++ b/Build/source/libs/potrace/potrace-PATCHES/TL-Changes