Use consistent license identifiers, remove redundant package.xml files

2 files changed, 1 insertions, 97 deletions

diff --git a/plugins/zipdownload/composer.json b/plugins/zipdownload/composer.json
index cdfbf9923..bc171d82a 100644
--- a/plugins/zipdownload/composer.json
+++ b/plugins/zipdownload/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/zipdownload",
     "type": "roundcube-plugin",
     "description": "Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. Also allows the download of a selection of messages in one zip file. Supports mbox and maildir format.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "3.0",
     "authors": [
         {
diff --git a/plugins/zipdownload/package.xml b/plugins/zipdownload/package.xml
deleted file mode 100644
index 7485c5870..000000000
--- a/plugins/zipdownload/package.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-		http://pear.php.net/dtd/tasks-1.0.xsd
-		http://pear.php.net/dtd/package-2.0
-		http://pear.php.net/dtd/package-2.0.xsd">
-	<name>zipdownload</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Download multiple attachments or messages in one zip file</summary>
-	<description>Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments.
-	Also allows the download of a selection of messages in one zip file. Supports mbox and maildir formats.</description>
-	<lead>
-		<name>Philip Weir</name>
-		<user>JohnDoh</user>
-		<email>roundcube@tehinterweb.co.uk</email>
-		<active>no</active>
-	</lead>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-04-18</date>
-	<time>09:00:00</time>
-	<version>
-		<release>3.0</release>
-		<api>3.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>Repo only</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="zipdownload.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="zipdownload.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="config.inc.php.dist" role="data"/>
-			<file name="CHANGELOG" role="data"/>
-			<file name="README" role="data"/>
-			<file name="localization/ca_ES.inc" role="data"/>
-			<file name="localization/cs_CZ.inc" role="data"/>
-			<file name="localization/da_DK.inc" role="data"/>
-			<file name="localization/de_CH.inc" role="data"/>
-			<file name="localization/de_DE.inc" role="data"/>
-			<file name="localization/en_GB.inc" role="data"/>
-			<file name="localization/en_US.inc" role="data"/>
-			<file name="localization/es_AR.inc" role="data"/>
-			<file name="localization/es_ES.inc" role="data"/>
-			<file name="localization/et_EE.inc" role="data"/>
-			<file name="localization/fr_FR.inc" role="data"/>
-			<file name="localization/gl_ES.inc" role="data"/>
-			<file name="localization/hu_HU.inc" role="data"/>
-			<file name="localization/it_IT.inc" role="data"/>
-			<file name="localization/nl_NL.inc" role="data"/>
-			<file name="localization/pl_PL.inc" role="data"/>
-			<file name="localization/pt_BR.inc" role="data"/>
-			<file name="localization/ro_RO.inc" role="data"/>
-			<file name="localization/ru_RU.inc" role="data"/>
-			<file name="localization/tr_TR.inc" role="data"/>
-			<file name="skins/classic/zip.png" role="data"/>
-			<file name="skins/classic/zipdownload.css" role="data"/>
-			<file name="skins/larry/zipdownload.css" role="data"/>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<extension>
-				<name>zip</name>
-				<channel>pecl.php.net</channel>
-				<providesextension>zip</providesextension>
-			</extension>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>