Use consistent license identifiers, remove redundant package.xml files

2 files changed, 1 insertions, 188 deletions

diff --git a/plugins/vcard_attachments/composer.json b/plugins/vcard_attachments/composer.json
index 5e451adf4..07105bdf6 100644
--- a/plugins/vcard_attachments/composer.json
+++ b/plugins/vcard_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/vcard_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin detects vCard attachments/bodies and shows a button(s) to add them to address book",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "3.2",
     "authors": [
         {
diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml
deleted file mode 100644
index 9fdf0acf2..000000000
--- a/plugins/vcard_attachments/package.xml
+++ /dev/null
@@ -1,187 +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>vcard_attachments</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>vCard handler for Roundcube</summary>
-	<description>This plugin detects vCard attachments/bodies and shows a button(s) to add them to address book</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</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>2012-11-18</date>
-	<version>
-		<release>3.2</release>
-		<api>3.2</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>
-- Skip invalid vcards (#1488788)
-	</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="vcard_attachments.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="vcardattach.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="localization/be_BE.inc" role="data"></file>
-			<file name="localization/bs_BA.inc" role="data"></file>
-			<file name="localization/ca_ES.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/cy_GB.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_GB.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/eo.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/fa_IR.inc" role="data"></file>
-			<file name="localization/fi_FI.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/he_IL.inc" role="data"></file>
-			<file name="localization/hr_HR.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/hy_AM.inc" role="data"></file>
-			<file name="localization/id_ID.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/ko_KR.inc" role="data"></file>
-			<file name="localization/lt_LT.inc" role="data"></file>
-			<file name="localization/lv_LV.inc" role="data"></file>
-			<file name="localization/ml_IN.inc" role="data"></file>
-			<file name="localization/mr_IN.inc" role="data"></file>
-			<file name="localization/nb_NB.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/pt_PT.inc" role="data"></file>
-			<file name="localization/ro_RO.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/si_LK.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sl_SI.inc" role="data"></file>
-			<file name="localization/sr_CS.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/tr_TR.inc" role="data"></file>
-			<file name="localization/uk_UA.inc" role="data"></file>
-			<file name="localization/vi_VN.inc" role="data"></file>
-			<file name="localization/zh_CN.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/classic/style.css" role="data"></file>
-			<file name="skins/classic/vcard_add_contact.png" role="data"></file>
-			<file name="skins/classic/vcard.png" role="data"></file>
-			<file name="skins/larry/style.css" role="data"></file>
-			<file name="skins/larry/vcard_add_contact.png" role="data"></file>
-			<file name="skins/larry/vcard.png" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-	<changelog>
-		<release>
-			<date>2010-04-28</date>
-			<time>12:00:00</time>
-			<version>
-				<release>2.0</release>
-				<api>2.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes>
-- Added support for Content-Type: text/directory; profile=vCard
-- Added handler for message bodies of type vCard (#1486683)
-- Added support for more than one vCard attachment/body
-- Added support for more than one contact in one vCard file
-- Created package.xml
-			</notes>
-		</release>
-		<release>
-			<date>2012-03-11</date>
-			<time>19:00:00</time>
-			<version>
-				<release>3.1</release>
-				<api>3.1</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-			<notes>
-				- Add styles for new skin "Larry"
-			</notes>
-		</release>
-        <release>
-        	<date>2012-03-11</date>
-        	<time>19:00</time>
-	        <version>
-        		<release>3.1-beta</release>
-		        <api>3.1-beta</api>
-        	</version>
-	        <stability>
-        		<release>stable</release>
-        		<api>stable</api>
-        	</stability>
-        	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-        	<notes>
-- Add styles for new skin "Larry"
-- Exec contact_create hook when adding contact (#1486964)
-- Make icons skinable
-- Display vcard icon on messages list when message is of type vcard
-            </notes>
-        </release>
-        <release>
-            <date>2012-04-13</date>
-            <version>
-                <release>3.1</release>
-                <api>3.1</api>
-            </version>
-            <stability>
-                <release>stable</release>
-                <api>stable</api>
-            </stability>
-            <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-            <notes>
-- Fixed doble urlencoding of vcard identifier
-- Fixed encoding when default charset is different than vcard charset
-- Improved vcards import to work as addressbook::import procedure (with validation and autofix)
-- Support IDNA
-- Import contacts to default addressbook
-            </notes>
-        </release>
-    </changelog>
-</package>