summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-04-28 11:14:20 +0200
committerJohn MacFarlane <jgm@berkeley.edu>2023-04-28 12:17:22 -0700
commit60e72b2542b997b16794bbbe40b9ec69e3eb9380 (patch)
tree473cd8128b2fabd8c7a47b8b9c54df861cc95e8b
parent54c0c494a2967661462a50d0a5fed5da646730fa (diff)
Writers.ODT: don't add Configurations2 dir
This empty file is some ancient OOo wart and it's quite pointless here.
-rw-r--r--data/odt/Configurations2/accelerator/current.xml0
-rw-r--r--data/odt/META-INF/manifest.xml2
-rw-r--r--pandoc.cabal1
-rw-r--r--src/Text/Pandoc/Data.hs1
4 files changed, 0 insertions, 4 deletions
diff --git a/data/odt/Configurations2/accelerator/current.xml b/data/odt/Configurations2/accelerator/current.xml
deleted file mode 100644
index e69de29bb..000000000
--- a/data/odt/Configurations2/accelerator/current.xml
+++ /dev/null
diff --git a/data/odt/META-INF/manifest.xml b/data/odt/META-INF/manifest.xml
index 9691c9b5f..d00dba6d4 100644
--- a/data/odt/META-INF/manifest.xml
+++ b/data/odt/META-INF/manifest.xml
@@ -5,7 +5,5 @@
<manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
<manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
<manifest:file-entry manifest:full-path="manifest.rdf" manifest:media-type="application/rdf+xml"/>
- <manifest:file-entry manifest:full-path="Configurations2/accelerator/current.xml" manifest:media-type=""/>
- <manifest:file-entry manifest:full-path="Configurations2/" manifest:media-type="application/vnd.sun.xml.ui.configuration"/>
<manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
</manifest:manifest>
diff --git a/pandoc.cabal b/pandoc.cabal
index 5229b6042..44749c784 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -126,7 +126,6 @@ data-files:
data/odt/content.xml
data/odt/meta.xml
data/odt/settings.xml
- data/odt/Configurations2/accelerator/current.xml
data/odt/META-INF/manifest.xml
-- source files for reference.pptx
data/pptx/_rels/.rels
diff --git a/src/Text/Pandoc/Data.hs b/src/Text/Pandoc/Data.hs
index 823ff93a5..0d4828ca2 100644
--- a/src/Text/Pandoc/Data.hs
+++ b/src/Text/Pandoc/Data.hs
@@ -124,7 +124,6 @@ getDefaultReferenceODT = do
"content.xml",
"meta.xml",
"settings.xml",
- "Configurations2/accelerator/current.xml",
"META-INF/manifest.xml"]
let pathToEntry path = do epochtime <- floor `fmap` getPOSIXTime
contents <- (BL.fromChunks . (:[])) `fmap`