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/markasjunk/composer.json |  2 +-
 plugins/markasjunk/package.xml   | 68 ----------------------------------------
 2 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 plugins/markasjunk/package.xml

(limited to 'plugins/markasjunk')

diff --git a/plugins/markasjunk/composer.json b/plugins/markasjunk/composer.json
index edf1ad699..8ec5f3de8 100644
--- a/plugins/markasjunk/composer.json
+++ b/plugins/markasjunk/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/markasjunk",
     "type": "roundcube-plugin",
     "description": "Adds a new button to the mailbox toolbar to mark the selected messages as Junk and move them to the configured Junk folder.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.2",
     "authors": [
         {
diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml
deleted file mode 100644
index 95597481a..000000000
--- a/plugins/markasjunk/package.xml
+++ /dev/null
@@ -1,68 +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>markasjunk</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Mark messages as Junk</summary>
-	<description>Adds a new button to the mailbox toolbar to mark the selected messages as Junk and move them to the configured Junk folder.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2013-08-29</date>
-	<version>
-		<release>1.2</release>
-		<api>1.2</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="markasjunk.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="markasjunk.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/cs_CZ.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_AR.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/gl_ES.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/pl_PL.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/classic/junk_act.png" role="data"></file>
-			<file name="skins/classic/junk_pas.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/>
-</package>
-- 
cgit v1.2.3