Use consistent license identifiers, remove redundant package.xml files

Aleksander Machniak

2014-12-09 72b117feb1afafb74d33056c22a14b257d9fa38e

Use consistent license identifiers, remove redundant package.xml files

 plugins/acl/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/acl",
    "type": "roundcube-plugin",
    "description": "IMAP Folders Access Control Lists Management (RFC4314, RFC2086).",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.5",
    "authors": [
        {

 plugins/acl/package.xml

File was deleted

 plugins/archive/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/archive",
    "type": "roundcube-plugin",
    "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "2.3",
    "authors": [
        {

 plugins/archive/package.xml

File was deleted

 plugins/attachment_reminder/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/Attachment Reminder",
    "type": "roundcube-plugin",
    "description": "This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.1",
    "authors": [
        {

 plugins/attachment_reminder/package.xml

File was deleted

 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"
    }
}

 plugins/database_attachments/package.xml

File was deleted

 plugins/debug_logger/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/debug_logger",
    "type": "roundcube-plugin",
    "description": "Enhanced logging for debugging purposes. It is not recommened to be enabled on production systems without testing because of the somewhat increased memory, cpu and disk i/o overhead.",
    "license": "GNU GPLv2",
    "license": "GPLv2",
    "version": "1.0",
    "authors": [
        {

 plugins/debug_logger/package.xml

File was deleted

 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": [
        {

 plugins/emoticons/package.xml

File was deleted

 plugins/filesystem_attachments/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/filesystem_attachments",
    "type": "roundcube-plugin",
    "description": "This is a core plugin which provides basic, filesystem based attachment temporary file handling. This includes storing attachments of messages currently being composed, writing attachments to disk when drafts with attachments are re-opened and writing attachments to disk for inline display in current html compositions.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.0",
    "authors": [
        {

 plugins/filesystem_attachments/package.xml

File was deleted

 plugins/help/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/help",
    "type": "roundcube-plugin",
    "description": "Plugin adds a new item (Help) in taskbar.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.4",
    "authors": [
        {

 plugins/help/package.xml

File was deleted

 plugins/hide_blockquote/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/hide_blockquote",
    "type": "roundcube-plugin",
    "description": "This allows to hide long blocks of cited text in messages.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.0",
    "authors": [
        {

 plugins/hide_blockquote/package.xml

File was deleted

 plugins/identity_select/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/identity_select",
    "type": "roundcube-plugin",
    "description": "On reply to a message user identity selection is based on\n\t\tcontent of standard headers like From, To, Cc and Return-Path.\n\t\tHere you can add header(s) set by your SMTP server (e.g.\n\t\tDelivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make\n\t\tidentity selection more accurate.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.0",
    "authors": [
        {

 plugins/identity_select/package.xml

File was deleted

 plugins/jqueryui/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/jqueryui",
    "type": "roundcube-plugin",
    "description": "Plugin adds the complete jQuery-UI library including the smoothness theme to Roundcube. This allows other plugins to use jQuery-UI without having to load their own version. The benefit of using one central jQuery-UI is that we wont run into problems of conflicting jQuery libraries being loaded. All plugins that want to use jQuery-UI should use this plugin as a requirement.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.10.4",
    "authors": [
        {

 plugins/legacy_browser/package.xml

File was deleted

 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": [
        {

 plugins/markasjunk/package.xml

File was deleted

 plugins/new_user_dialog/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/new_user_dialog",
    "type": "roundcube-plugin",
    "description": "When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "2.1",
    "authors": [
        {

 plugins/new_user_dialog/package.xml

File was deleted

 plugins/new_user_identity/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/new_user_identity",
    "type": "roundcube-plugin",
    "description": "Populates a new user's default identity from LDAP on their first visit.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.1",
    "authors": [
        {

 plugins/new_user_identity/package.xml

File was deleted

 plugins/newmail_notifier/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/newmail_notifier",
    "type": "roundcube-plugin",
    "description": "Supports three methods of notification: 1. Basic - focus browser window and change favicon 2. Sound - play wav file 3. Desktop - display desktop notification (using webkitNotifications feature, supported by Chrome and Firefox with 'HTML5 Notifications' plugin).",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "0.7",
    "authors": [
        {

 plugins/newmail_notifier/package.xml

File was deleted

 plugins/password/package.xml

File was deleted

 plugins/redundant_attachments/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/redundant_attachments",
    "type": "roundcube-plugin",
    "description": "This plugin provides a redundant storage for temporary uploaded attachment files. They are stored in both the database backend as well as on the local file system. It provides also memcache store as a fallback.",
    "license": "GNU GPLv2",
    "license": "GPLv2",
    "version": "1.0",
    "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"
    }
}

 plugins/redundant_attachments/package.xml

File was deleted

 plugins/show_additional_headers/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/show_additional_headers",
    "type": "roundcube-plugin",
    "description": "Proof-of-concept plugin which will fetch additional headers and display them in the message view.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "2.0",
    "authors": [
        {

 plugins/show_additional_headers/package.xml

File was deleted

 plugins/subscriptions_option/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/subscriptions_option",
    "type": "roundcube-plugin",
    "description": "A plugin which can enable or disable the use of imap subscriptions. It includes a toggle on the settings page under \"Server Settings\". The preference can also be locked.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.3",
    "authors": [
        {

 plugins/subscriptions_option/package.xml

File was deleted

 plugins/userinfo/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/userinfo",
    "type": "roundcube-plugin",
    "description": "Sample plugin that adds a new tab to the settings section to display some information about the current user.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.0",
    "authors": [
        {

 plugins/userinfo/package.xml

File was deleted

 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": [
        {

 plugins/vcard_attachments/package.xml

File was deleted

 plugins/virtuser_file/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/virtuser_file",
    "type": "roundcube-plugin",
    "description": "Plugin adds possibility to resolve user email/login according to lookup tables in files.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "1.0",
    "authors": [
        {

 plugins/virtuser_file/package.xml

File was deleted

 plugins/virtuser_query/composer.json

@@ -2,7 +2,7 @@
    "name": "roundcube/virtuser_query",
    "type": "roundcube-plugin",
    "description": "Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.",
    "license": "GNU GPLv3+",
    "license": "GPLv3+",
    "version": "2.0",
    "authors": [
        {

 plugins/virtuser_query/package.xml

File was deleted

 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": [
        {

 plugins/zipdownload/package.xml

File was deleted

 program/lib/Roundcube/rcube_plugin_api.php

@@ -252,6 +252,7 @@
        'GPLv2'      => 'http://www.gnu.org/licenses/gpl-2.0.html',
        'GPL-2.0'    => 'http://www.gnu.org/licenses/gpl-2.0.html',
        'GPLv3'      => 'http://www.gnu.org/licenses/gpl-3.0.html',
        'GPLv3+'     => 'http://www.gnu.org/licenses/gpl-3.0.html',
        'GPL-3.0'    => 'http://www.gnu.org/licenses/gpl-3.0.html',
        'GPL-3.0+'   => 'http://www.gnu.org/licenses/gpl.html',
        'GPL-2.0+'   => 'http://www.gnu.org/licenses/gpl.html',