From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 4 May 2022 10:08:43 +0000 (+0200)
Subject: Use merge for Batik
X-Git-Tag: v2.3.5~70
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=464e07b50bdcbc4ea79dca498a91397a80c99c92;p=gpl%2Fargeo-slc.git

Use merge for Batik
---

diff --git a/tp/org.argeo.tp.formats/batik/common.bnd b/tp/org.argeo.tp.formats/batik/common.bnd
deleted file mode 100644
index bc76a9738..000000000
--- a/tp/org.argeo.tp.formats/batik/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.14
\ No newline at end of file
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.anim.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.anim.bnd
deleted file mode 100644
index 26debce5e..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.anim.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.anim
-SLC-Origin-M2: org.apache.xmlgraphics:batik-anim
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.awt.util.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.awt.util.bnd
deleted file mode 100644
index e6e775a62..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.awt.util.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.awt.util
-SLC-Origin-M2: org.apache.xmlgraphics:batik-awt-util
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.bridge.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.bridge.bnd
deleted file mode 100644
index 33328ebe9..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.bridge.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.bridge
-SLC-Origin-M2: org.apache.xmlgraphics:batik-bridge
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.codec.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.codec.bnd
deleted file mode 100644
index c821f345e..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.codec.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.codec
-SLC-Origin-M2: org.apache.xmlgraphics:batik-codec
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.constants.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.constants.bnd
deleted file mode 100644
index fea69fa98..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.constants.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.constants
-SLC-Origin-M2: org.apache.xmlgraphics:batik-constants
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.css.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.css.bnd
deleted file mode 100644
index 8ec1225ac..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.css.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.css
-SLC-Origin-M2: org.apache.xmlgraphics:batik-css
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.dom.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.dom.bnd
deleted file mode 100644
index c5dd20b55..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.dom.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.dom
-SLC-Origin-M2: org.apache.xmlgraphics:batik-dom
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.ext.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.ext.bnd
deleted file mode 100644
index 2349f6e92..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.ext.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.ext
-SLC-Origin-M2: org.apache.xmlgraphics:batik-ext
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.extension.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.extension.bnd
deleted file mode 100644
index bff767bfe..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.extension.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.extension
-SLC-Origin-M2: org.apache.xmlgraphics:batik-extension
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.gui.util.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.gui.util.bnd
deleted file mode 100644
index 5ecc4214e..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.gui.util.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.gui.util
-SLC-Origin-M2: org.apache.xmlgraphics:batik-gui-util
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.gvt.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.gvt.bnd
deleted file mode 100644
index fd5265164..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.gvt.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.gvt
-SLC-Origin-M2: org.apache.xmlgraphics:batik-gvt
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.i18n.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.i18n.bnd
deleted file mode 100644
index 321ae882a..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.i18n.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.i18n
-SLC-Origin-M2: org.apache.xmlgraphics:batik-i18n
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.parser.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.parser.bnd
deleted file mode 100644
index 93792016d..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.parser.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.parser
-SLC-Origin-M2: org.apache.xmlgraphics:batik-parser
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.resources.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.resources.bnd
deleted file mode 100644
index 08564a43b..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.resources.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.resources
-SLC-Origin-M2: org.apache.xmlgraphics:batik-shared-resources
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.script.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.script.bnd
deleted file mode 100644
index 7356915e2..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.script.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.script
-SLC-Origin-M2: org.apache.xmlgraphics:batik-script
-Import-Package: \
-org.python.*;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.svg.dom.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.svg.dom.bnd
deleted file mode 100644
index f6a187baa..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.svg.dom.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.svg.dom
-SLC-Origin-M2: org.apache.xmlgraphics:batik-svg-dom
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.svggen.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.svggen.bnd
deleted file mode 100644
index 33fa54236..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.svggen.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.svggen
-SLC-Origin-M2: org.apache.xmlgraphics:batik-svggen
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.swing.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.swing.bnd
deleted file mode 100644
index ddf9a782f..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.swing.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.swing
-SLC-Origin-M2: org.apache.xmlgraphics:batik-swing
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.transcoder.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.transcoder.bnd
deleted file mode 100644
index 8afd5afd3..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.transcoder.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.transcoder
-SLC-Origin-M2: org.apache.xmlgraphics:batik-transcoder
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.util.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.util.bnd
deleted file mode 100644
index 0b672dc50..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.util.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.util
-SLC-Origin-M2: org.apache.xmlgraphics:batik-util
diff --git a/tp/org.argeo.tp.formats/batik/org.apache.batik.xml.bnd b/tp/org.argeo.tp.formats/batik/org.apache.batik.xml.bnd
deleted file mode 100644
index c42c15ce6..000000000
--- a/tp/org.argeo.tp.formats/batik/org.apache.batik.xml.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.batik.xml
-SLC-Origin-M2: org.apache.xmlgraphics:batik-xml