From 6530e43c5e80f0cf723d96ab47407d39bbdc8aef Mon Sep 17 00:00:00 2001
From: su_v <suv-sf@users.sourceforge.net>
Date: Thu, 31 Jan 2013 16:40:36 +0100
Subject: Revert change of file names of the UC-based input extensions
 (changing the ID and name tags is sufficiant, keeping the old names prevents
 any issues with left-behind duplicates in the install dir of a trunk build)

(bzr r12059.1.5)
---
 share/extensions/ccx_input-uniconv.inx | 15 ---------------
 share/extensions/ccx_input.inx         | 15 +++++++++++++++
 share/extensions/cdr_input-uniconv.inx | 17 -----------------
 share/extensions/cdr_input.inx         | 17 +++++++++++++++++
 share/extensions/cdt_input-uniconv.inx | 15 ---------------
 share/extensions/cdt_input.inx         | 15 +++++++++++++++
 share/extensions/cmx_input-uniconv.inx | 15 ---------------
 share/extensions/cmx_input.inx         | 15 +++++++++++++++
 8 files changed, 62 insertions(+), 62 deletions(-)
 delete mode 100644 share/extensions/ccx_input-uniconv.inx
 create mode 100644 share/extensions/ccx_input.inx
 delete mode 100644 share/extensions/cdr_input-uniconv.inx
 create mode 100644 share/extensions/cdr_input.inx
 delete mode 100644 share/extensions/cdt_input-uniconv.inx
 create mode 100644 share/extensions/cdt_input.inx
 delete mode 100644 share/extensions/cmx_input-uniconv.inx
 create mode 100644 share/extensions/cmx_input.inx

diff --git a/share/extensions/ccx_input-uniconv.inx b/share/extensions/ccx_input-uniconv.inx
deleted file mode 100644
index 040a2891a..000000000
--- a/share/extensions/ccx_input-uniconv.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW Compressed Exchange files input (UC)</_name>
-    <id>org.inkscape.input.ccx.uniconvertor</id>
-    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
-    <input>
-        <extension>.ccx</extension>
-        <mimetype>application/x-xccx</mimetype>
-        <_filetypename>Corel DRAW Compressed Exchange files (UC) (.ccx)</_filetypename>
-        <_filetypetooltip>Open compressed exchange files saved in Corel DRAW (UC)</_filetypetooltip>
-    </input>
-    <script>
-        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
-    </script>
-</inkscape-extension>
diff --git a/share/extensions/ccx_input.inx b/share/extensions/ccx_input.inx
new file mode 100644
index 000000000..040a2891a
--- /dev/null
+++ b/share/extensions/ccx_input.inx
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Corel DRAW Compressed Exchange files input (UC)</_name>
+    <id>org.inkscape.input.ccx.uniconvertor</id>
+    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+    <input>
+        <extension>.ccx</extension>
+        <mimetype>application/x-xccx</mimetype>
+        <_filetypename>Corel DRAW Compressed Exchange files (UC) (.ccx)</_filetypename>
+        <_filetypetooltip>Open compressed exchange files saved in Corel DRAW (UC)</_filetypetooltip>
+    </input>
+    <script>
+        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
+    </script>
+</inkscape-extension>
diff --git a/share/extensions/cdr_input-uniconv.inx b/share/extensions/cdr_input-uniconv.inx
deleted file mode 100644
index 6fd7f90ab..000000000
--- a/share/extensions/cdr_input-uniconv.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW Input (UC)</_name>
-    <id>org.inkscape.input.cdr.uniconvertor</id>
-    <!-- the uniconv or uniconvertor dependency will be tested by uniconv-ext.py -->
-    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
-    <input>
-        <extension>.cdr</extension>
-        <mimetype>image/x-xcdr</mimetype>
-        <_filetypename>Corel DRAW 7-X4 files (UC) (*.cdr)</_filetypename>
-        <_filetypetooltip>Open files saved in Corel DRAW 7-X4 (UC)</_filetypetooltip>
-        <output_extension>org.inkscape.output.cdr</output_extension>
-    </input>
-    <script>
-        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
-    </script>
-</inkscape-extension>
diff --git a/share/extensions/cdr_input.inx b/share/extensions/cdr_input.inx
new file mode 100644
index 000000000..6fd7f90ab
--- /dev/null
+++ b/share/extensions/cdr_input.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Corel DRAW Input (UC)</_name>
+    <id>org.inkscape.input.cdr.uniconvertor</id>
+    <!-- the uniconv or uniconvertor dependency will be tested by uniconv-ext.py -->
+    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+    <input>
+        <extension>.cdr</extension>
+        <mimetype>image/x-xcdr</mimetype>
+        <_filetypename>Corel DRAW 7-X4 files (UC) (*.cdr)</_filetypename>
+        <_filetypetooltip>Open files saved in Corel DRAW 7-X4 (UC)</_filetypetooltip>
+        <output_extension>org.inkscape.output.cdr</output_extension>
+    </input>
+    <script>
+        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
+    </script>
+</inkscape-extension>
diff --git a/share/extensions/cdt_input-uniconv.inx b/share/extensions/cdt_input-uniconv.inx
deleted file mode 100644
index 78d5c6a97..000000000
--- a/share/extensions/cdt_input-uniconv.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW templates input (UC)</_name>
-    <id>org.inkscape.input.cdt.uniconvertor</id>
-    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
-    <input>
-        <extension>.cdt</extension>
-        <mimetype>application/x-xcdt</mimetype>
-        <_filetypename>Corel DRAW 7-13 template files (UC) (.cdt)</_filetypename>
-        <_filetypetooltip>Open files saved in Corel DRAW 7-13 (UC)</_filetypetooltip>
-    </input>
-    <script>
-        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
-    </script>
-</inkscape-extension>
diff --git a/share/extensions/cdt_input.inx b/share/extensions/cdt_input.inx
new file mode 100644
index 000000000..78d5c6a97
--- /dev/null
+++ b/share/extensions/cdt_input.inx
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Corel DRAW templates input (UC)</_name>
+    <id>org.inkscape.input.cdt.uniconvertor</id>
+    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+    <input>
+        <extension>.cdt</extension>
+        <mimetype>application/x-xcdt</mimetype>
+        <_filetypename>Corel DRAW 7-13 template files (UC) (.cdt)</_filetypename>
+        <_filetypetooltip>Open files saved in Corel DRAW 7-13 (UC)</_filetypetooltip>
+    </input>
+    <script>
+        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
+    </script>
+</inkscape-extension>
diff --git a/share/extensions/cmx_input-uniconv.inx b/share/extensions/cmx_input-uniconv.inx
deleted file mode 100644
index 7840302d5..000000000
--- a/share/extensions/cmx_input-uniconv.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW Presentation Exchange files input (UC)</_name>
-    <id>org.inkscape.input.cmx.uniconvertor</id>
-    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
-    <input>
-        <extension>.cmx</extension>
-        <mimetype>application/x-xcmx</mimetype>
-        <_filetypename>Corel DRAW Presentation Exchange files (UC) (.cmx)</_filetypename>
-        <_filetypetooltip>Open presentation exchange files saved in Corel DRAW (UC)</_filetypetooltip>
-    </input>
-    <script>
-        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
-    </script>
-</inkscape-extension>
diff --git a/share/extensions/cmx_input.inx b/share/extensions/cmx_input.inx
new file mode 100644
index 000000000..7840302d5
--- /dev/null
+++ b/share/extensions/cmx_input.inx
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Corel DRAW Presentation Exchange files input (UC)</_name>
+    <id>org.inkscape.input.cmx.uniconvertor</id>
+    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+    <input>
+        <extension>.cmx</extension>
+        <mimetype>application/x-xcmx</mimetype>
+        <_filetypename>Corel DRAW Presentation Exchange files (UC) (.cmx)</_filetypename>
+        <_filetypetooltip>Open presentation exchange files saved in Corel DRAW (UC)</_filetypetooltip>
+    </input>
+    <script>
+        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
+    </script>
+</inkscape-extension>
-- 
cgit v1.2.3