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/database_attachments/composer.json |  5 ++-
 plugins/database_attachments/package.xml   | 62 ------------------------------
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 plugins/database_attachments/package.xml

(limited to 'plugins/database_attachments')

diff --git a/plugins/database_attachments/composer.json b/plugins/database_attachments/composer.json
index 86eced62c..d0df987eb 100644
--- a/plugins/database_attachments/composer.json
+++ b/plugins/database_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/database_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin which provides database backed storage for temporary attachment file handling. The primary advantage of this plugin is its compatibility with round-robin dns multi-server Roundcube installations.",
-    "license": "GNU GPLv2",
+    "license": "GPLv2",
     "version": "1.1",
     "authors": [
         {
@@ -24,6 +24,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3"
+        "roundcube/plugin-installer": ">=0.1.3",
+        "roundcube/filesystem_attachments": ">=1.0.0"
     }
 }
diff --git a/plugins/database_attachments/package.xml b/plugins/database_attachments/package.xml
deleted file mode 100644
index 44adc219e..000000000
--- a/plugins/database_attachments/package.xml
+++ /dev/null
@@ -1,62 +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>database_attachments</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Database storage for uploaded attachments</summary>
-	<description>
-	    This plugin which provides database backed storage for temporary
-        attachment file handling. The primary advantage of this plugin
-        is its compatibility with round-robin dns multi-server Roundcube
-        installations.
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Ziba Scott</name>
-		<user>ziba</user>
-		<email>ziba@umich.edu</email>
-		<active>yes</active>
-	</developer>
-	<date>2013-06-13</date>
-	<version>
-		<release>1.1</release>
-		<api>1.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>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="database_attachments.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>
-			<package>
-	            <name>filesystem_attachments</name>
-	            <channel>pear.roundcube.net</channel>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
-- 
cgit v1.2.3