summaryrefslogtreecommitdiff
path: root/Build/source/libs/cairo
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-15 21:39:16 +0000
committerKarl Berry <karl@freefriends.org>2016-02-15 21:39:16 +0000
commit4af143877155448dadfe2ac57e4b290a75b9ad49 (patch)
treedfb58f42700e617639421dc7781524abf6d827b4 /Build/source/libs/cairo
parentac696bf78edd670ee0edf00a710abb41e9c3dcb3 (diff)
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
Diffstat (limited to 'Build/source/libs/cairo')
-rw-r--r--Build/source/libs/cairo/ChangeLog5
-rw-r--r--Build/source/libs/cairo/Makefile.am5
-rw-r--r--Build/source/libs/cairo/Makefile.in2
-rw-r--r--Build/source/libs/cairo/cairo-PATCHES/ChangeLog (renamed from Build/source/libs/cairo/cairo-src-PATCHES/ChangeLog)0
-rw-r--r--Build/source/libs/cairo/cairo-PATCHES/TL-Changes (renamed from Build/source/libs/cairo/cairo-src-PATCHES/TL-Changes)0
5 files changed, 9 insertions, 3 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