summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler')
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/Makefile.am3
-rw-r--r--Build/source/libs/poppler/Makefile.in2
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-src-PATCHES/ChangeLog)0
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-src-PATCHES/TL-Changes)0
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-src-PATCHES/patch-02-LLONG_MAX)0
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions (renamed from Build/source/libs/poppler/poppler-src-PATCHES/patch-03-Object-functions)0
7 files changed, 8 insertions, 2 deletions
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