#i10000# fix the problems from extensionupdate01

4 files changed, 15 insertions, 24 deletions

diff --git a/swext/mediawiki/help/component.txt b/swext/mediawiki/help/component.txt
index d48e55c4bd54..8afa12126e03 100755
--- a/swext/mediawiki/help/component.txt
+++ b/swext/mediawiki/help/component.txt
@@ -1,3 +1,3 @@
-The Sun Wiki Publisher enables you to create Wiki articles on MediaWiki servers
+The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers
 without having to know the syntax of the MediaWiki markup language. Publish
 your new and existing documents transparently with the Writer to a wiki page.
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index a5d0ad7c1ec2..8c4ed87636be 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.2 $
+# $Revision: 1.3 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -54,10 +54,12 @@ XHPFILES= \
 
 HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(OUT_HELP)$/$j$/$(PACKAGE)$/$(i:f)))
 
-ALLTAR : $(OUT_MEDIAWIKI)$/$(TARGET).done
+ALLTAR : $(OUT_MEDIAWIKI)$/$(TARGET).done $(OUT_HELP)$/component.txt
 
 #$(OUT_MEDIAWIKI)$/xhp_changed.flag optix
 
+$(OUT_HELP)$/component.txt : component.txt
+    $(COPY) component.txt $(OUT_HELP)$/component.txt
 
 $(HLANGXHPFILES) : #$$(@:d)thisdir.created
     -$(MKDIRHIER) $(@:d)
diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml
index 9eb8dbcaf827..835e4d59d5ca 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -1,30 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description
-
-    xmlns="http://openoffice.org/extensions/description/2006"
-    xmlns:dep="http://openoffice.org/extensions/description/2006"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-
-    <identifier value="com.sun.star.WikiPublisher" />
-
-    <dependencies>
-        <OpenOffice.org-minimal-version value="2.4" dep:name="OpenOffice.org 2.4"/>
-    </dependencies>
-
+<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <version value="1.0"/>
+    <identifier value="@WIKIEXTENSIONID@"/>
+    <display-name>
+        <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
+    </display-name>
     <registration>
         <simple-license accept-by="admin" default-license-id="lic-en-US">
             <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
-
-    <version value="1.0" />
-
+    <dependencies>
+        <OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/>
+    </dependencies>
     <publisher>
         <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Sun Microsystems</name>
     </publisher>
-
-    <display-name>
-        <name lang="en">Wiki Publisher</name>
-    </display-name>
-
 </description>
diff --git a/swext/mediawiki/src/uno-extension-manifest.xml b/swext/mediawiki/src/uno-extension-manifest.xml
index 815bf4399b14..4d5b3f0c96b3 100644
--- a/swext/mediawiki/src/uno-extension-manifest.xml
+++ b/swext/mediawiki/src/uno-extension-manifest.xml
@@ -9,7 +9,7 @@
 
   $RCSfile: uno-extension-manifest.xml,v $
 
-  $Revision: 1.4 $
+  $Revision: 1.5 $
 
   This file is part of OpenOffice.org.