From 72b117feb1afafb74d33056c22a14b257d9fa38e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 9 Dec 2014 05:02:13 -0500
Subject: Use consistent license identifiers, remove redundant package.xml
 files

---
 plugins/emoticons/composer.json |  2 +-
 plugins/emoticons/package.xml   | 53 -----------------------------------------
 2 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 plugins/emoticons/package.xml

(limited to 'plugins/emoticons')

diff --git a/plugins/emoticons/composer.json b/plugins/emoticons/composer.json
index c2ada7846..8e7b90ae9 100644
--- a/plugins/emoticons/composer.json
+++ b/plugins/emoticons/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/emoticons",
     "type": "roundcube-plugin",
     "description": "Sample plugin to replace emoticons in plain text message body with real icons.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.3",
     "authors": [
         {
diff --git a/plugins/emoticons/package.xml b/plugins/emoticons/package.xml
deleted file mode 100644
index b4218103c..000000000
--- a/plugins/emoticons/package.xml
+++ /dev/null
@@ -1,53 +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>emoticons</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Display emoticons in text messages</summary>
-	<description>Sample plugin to replace emoticons in plain text message body with real icons.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</developer>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.3</release>
-		<api>1.3</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="emoticons.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
-- 
cgit v1.2.3