Fix extension manifests for packaging

.gitignore

@@ -1,3 +1,4 @@
 .idea
 build
 releases
+.DS_Store

src/com_weblinks/weblinks.xml

@@ -43,8 +43,8 @@
 		<folder>controllers</folder>
 		<folder>helpers</folder>
 	</files>
-	<languages folder="site">
+	<languages folder="site/language">
-		<language tag="en-GB">language/en-GB.com_weblinks.ini</language>
+		<language tag="en-GB">en-GB/en-GB.com_weblinks.ini</language>
 	</languages>
 	<administration>
 		<menu img="class:weblinks">com_weblinks</menu>
@@ -70,9 +70,9 @@
 			<folder>tables</folder>
 			<folder>views</folder>
 		</files>
-		<languages folder="admin">
+		<languages folder="admin/language">
-			<language tag="en-GB">language/en-GB.com_weblinks.ini</language>
+			<language tag="en-GB">en-GB/en-GB.com_weblinks.ini</language>
-			<language tag="en-GB">language/en-GB.com_weblinks.sys.ini</language>
+			<language tag="en-GB">en-GB/en-GB.com_weblinks.sys.ini</language>
 		</languages>
 	</administration>
 </extension>

src/mod_weblinks/mod_weblinks.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension
+<extension type="module" version="3.1" client="site" method="upgrade">
-	type="module"
-	version="3.1"
-	client="site"
-	method="upgrade">
 	<name>mod_weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2009</creationDate>
@@ -14,15 +10,13 @@
 	<version>3.4.0-dev</version>
 	<description>MOD_WEBLINKS_XML_DESCRIPTION</description>
 	<files>
-	<filename module="mod_weblinks">mod_weblinks.php</filename>
+		<folder>tmpl</folder>
-	<folder>tmpl</folder>
+		<filename module="mod_weblinks">mod_weblinks.php</filename>
 		<filename>helper.php</filename>
-		<filename>index.html</filename>
-		<filename>mod_weblinks.xml</filename>
 	</files>
-	<languages>
+	<languages folder="language">
-		<language tag="en-GB">en-GB.mod_weblinks.ini</language>
+		<language tag="en-GB">en-GB/en-GB.mod_weblinks.ini</language>
-		<language tag="en-GB">en-GB.mod_weblinks.sys.ini</language>
+		<language tag="en-GB">en-GB/en-GB.mod_weblinks.sys.ini</language>
 	</languages>
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_WEBLINKS" />
 	<config>

src/pkg_weblinks.xml

@@ -13,15 +13,15 @@
 	<version>3.4.0-dev</version>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<description>PKG_WEBLINKS_XML_DESCRIPTION</description>
-	<files folder="packages">
+	<files>
 		<!-- The id for each extension is the element stored in the DB -->
 		<file type="component" id="com_weblinks">com_weblinks.zip</file>
 		<file type="module" id="mod_weblinks" client="site">mod_weblinks.zip</file>
 		<file type="plugin" id="weblinks" group="finder">plg_finder_weblinks.zip</file>
 		<file type="plugin" id="weblinks" group="search">plg_search_weblinks.zip</file>
 	</files>
-	<languages>
+	<languages folder="language">
-		<language tag="en-GB">language/en-GB/en-GB.pkg_weblinks.sys.ini</language>
+		<language tag="en-GB">en-GB/en-GB.pkg_weblinks.sys.ini</language>
 	</languages>
 	<updateservers>
 		<!-- Note: No spaces or linebreaks allowed between the server tags -->

src/plg_finder_weblinks/weblinks.xml

@@ -9,13 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.4.0-dev</version>
 	<description>PLG_FINDER_WEBLINKS_XML_DESCRIPTION</description>
-	<scriptfile>script.php</scriptfile>
 	<files>
-		<file plugin="weblinks">weblinks.php</file>
+		<filename plugin="weblinks">weblinks.php</filename>
-    	<filename>index.html</filename>
 	</files>
-	<languages>
+	<languages folder="language">
-		<language tag="en-GB">language/en-GB/en-GB.plg_finder_weblinks.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_finder_weblinks.ini</language>
-		<language tag="en-GB">language/en-GB/en-GB.plg_finder_weblinks.sys.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_finder_weblinks.sys.ini</language>
 	</languages>
 </extension>

src/plg_search_weblinks/weblinks.xml

@@ -11,11 +11,10 @@
 	<description>PLG_SEARCH_WEBLINKS_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="weblinks">weblinks.php</filename>
-		<filename>index.html</filename>
 	</files>
-	<languages>
+	<languages folder="language">
-		<language tag="en-GB">en-GB.plg_search_weblinks.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_search_weblinks.ini</language>
-		<language tag="en-GB">en-GB.plg_search_weblinks.sys.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_search_weblinks.sys.ini</language>
 	</languages>
 	<config>
 		<fields name="params">