From 6259dfce9d140368156c5fe8bb577c7589265dd5 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 12 Feb 2018 16:08:41 +0100
Subject: EPUB export: pick up XMP metadata from 'metadata.xmp'

This used to be <filename>.xmp, but that's inconsistent with how cover
image is not <filename>.jpg but cover.jpg (or .png, etc).

Also it was redundant, since these files are in the media directory, for
which the default is the <filename> directory.

Change-Id: Iadfebf2f9c336f443537759b1e58409a93e1c51d
Reviewed-on: https://gerrit.libreoffice.org/49604
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
---
 .../data/writer/epubexport/meta-xmp/meta-xmp.xmp   | 28 ----------------------
 .../data/writer/epubexport/meta-xmp/metadata.xmp   | 28 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
 create mode 100644 writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp

(limited to 'writerperfect/qa/unit')

diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
deleted file mode 100644
index aa578159cb89..000000000000
--- a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/">
-  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
-      <dc:identifier>deadbeef-e394-4cd6-9b83-7172794612e5</dc:identifier>
-      <dc:title>
-        <rdf:Alt>
-          <rdf:li>unknown title from xmp</rdf:li>
-        </rdf:Alt>
-      </dc:title>
-      <dc:creator>
-        <rdf:Seq>
-          <rdf:li>unknown author from xmp</rdf:li>
-        </rdf:Seq>
-      </dc:creator>
-      <dc:language>
-        <rdf:Bag>
-          <rdf:li>nl</rdf:li>
-        </rdf:Bag>
-      </dc:language>
-      <dc:date>
-        <rdf:Seq>
-          <rdf:li>2016-11-20T17:16:07Z</rdf:li>
-        </rdf:Seq>
-      </dc:date>
-    </rdf:Description>
-  </rdf:RDF>
-</x:xmpmeta>
diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp
new file mode 100644
index 000000000000..aa578159cb89
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+      <dc:identifier>deadbeef-e394-4cd6-9b83-7172794612e5</dc:identifier>
+      <dc:title>
+        <rdf:Alt>
+          <rdf:li>unknown title from xmp</rdf:li>
+        </rdf:Alt>
+      </dc:title>
+      <dc:creator>
+        <rdf:Seq>
+          <rdf:li>unknown author from xmp</rdf:li>
+        </rdf:Seq>
+      </dc:creator>
+      <dc:language>
+        <rdf:Bag>
+          <rdf:li>nl</rdf:li>
+        </rdf:Bag>
+      </dc:language>
+      <dc:date>
+        <rdf:Seq>
+          <rdf:li>2016-11-20T17:16:07Z</rdf:li>
+        </rdf:Seq>
+      </dc:date>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>
-- 
cgit