mark the apps as part of the shipped package and increase the requirement to ownCloud 4

diff --git a/apps/admin_dependencies_chk/appinfo/info.xml b/apps/admin_dependencies_chk/appinfo/info.xml
index d5f8bd3783da51d59f45ae6e0c413d03e82ff2be..90ea72bf4b67900e2c2a3e42c89e088db0e4a29a 100644 (file)
--- a/apps/admin_dependencies_chk/appinfo/info.xml
+++ b/apps/admin_dependencies_chk/appinfo/info.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?> 
 <info>
        <id>admin_dependencies_chk</id>
-       <name>Owncloud dependencies info</name>
+       <name>ownCloud dependencies info</name>
        <licence>AGPL</licence>
        <author>Brice Maron (eMerzh)</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <description>Display OwnCloud's dependencies informations (missings modules, ...)</description>
 </info>

diff --git a/apps/admin_migrate/appinfo/info.xml b/apps/admin_migrate/appinfo/info.xml
index 51721579002ca10525ff8842f850d1af181ef8dc..f48c666ffeb97c49346f2f1099264e337465bee5 100644 (file)
--- a/apps/admin_migrate/appinfo/info.xml
+++ b/apps/admin_migrate/appinfo/info.xml
@@ -5,6 +5,7 @@
        <description>Import/Export your owncloud instance</description>
        <licence>AGPL</licence>
        <author>Thomas Schmidt and Tom Needham</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <default_enable/>
 </info>

diff --git a/apps/bookmarks/appinfo/info.xml b/apps/bookmarks/appinfo/info.xml
index 4dbb74bb767b953d55f890a54d0301a0ba78bad4..93510815f5e9d839e4548d135bb2e6fa4553b268 100644 (file)
--- a/apps/bookmarks/appinfo/info.xml
+++ b/apps/bookmarks/appinfo/info.xml
@@ -6,5 +6,6 @@
        <licence>AGPL</licence>
        <author>Arthur Schiwon, Marvin Thomas Rabe</author>
        <standalone/>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
 </info>

diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml
index f45f306e7d0f0184bd513eea6ae752c043f9c30d..dde0260f071ebfec5105089d2f90c8a94feee569 100644 (file)
--- a/apps/calendar/appinfo/info.xml
+++ b/apps/calendar/appinfo/info.xml
@@ -4,7 +4,8 @@
        <name>Calendar</name>
        <licence>AGPL</licence>
        <author>Georg Ehrke, Bart Visscher, Jakob Sack</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <description>Calendar with CalDAV support</description>
        <default_enable/>
        <remote>

diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml
index 86692d65b4ff2a9af8dace4ded0418273be95e13..74fd6b012dd83874ce5704d80636eaf7d1ec1fb9 100644 (file)
--- a/apps/contacts/appinfo/info.xml
+++ b/apps/contacts/appinfo/info.xml
@@ -4,7 +4,8 @@
        <name>Contacts</name>
        <licence>AGPL</licence>
        <author>Jakob Sack</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <description>Address book with CardDAV support.</description>
        <standalone/>
        <default_enable/>

diff --git a/apps/external/appinfo/info.xml b/apps/external/appinfo/info.xml
index 83130f17e62761c3332e58811c48109c0b9a3e84..c4d0b55481f299f75962b975845a2e59ab013c72 100644 (file)
--- a/apps/external/appinfo/info.xml
+++ b/apps/external/appinfo/info.xml
@@ -5,5 +5,6 @@
        <description>Show external Application in the ownCloud menu</description>
        <licence>AGPL</licence>
        <author>Frank Karlitschek</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
 </info>

diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 92d0a50814eb040d355ea3ea41a619e6fed2abdc..105df092ce59c743bff1b9b115226c761ae4f9b7 100644 (file)
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>File Management</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <standalone/>
        <default_enable/>
        <types>

diff --git a/apps/files_archive/appinfo/info.xml b/apps/files_archive/appinfo/info.xml
index 9872187f9b30fd5717454b5be8681f76e69c9aa8..93ec68ee10dac08ecab450a72a914db2a0c16d33 100644 (file)
--- a/apps/files_archive/appinfo/info.xml
+++ b/apps/files_archive/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>Transparent opening of archives</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>3</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <types>
                <filesystem/>
        </types>

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index c2e1aa9604340afc49f247eec5f214f02bc74774..06807813ea55599842712d8a5e9f86d742fcbd1b 100644 (file)
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>Server side encryption of files</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>3</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <types>
                <filesystem/>
        </types>

diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 1918925389de69ca1395d9a539e14f570e835e23..c324730593f7f7349addb754c343bfac71c8f382 100644 (file)
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>Mount external storage sources</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>3</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <types>
                <filesystem/>
        </types>

diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml
index dbc78ffba0f8bc5c2906cd6f971a49af5bfb8ab2..1e3192f6ed53e8c3aed9dac3503406395a859440 100644 (file)
--- a/apps/files_imageviewer/appinfo/info.xml
+++ b/apps/files_imageviewer/appinfo/info.xml
@@ -5,6 +5,7 @@
        <description>Simple image viewer for owncloud</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <default_enable/>
 </info>

diff --git a/apps/files_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml
index 0e81729a8bc1201f3480f84bad9a521e04ef91ec..e3813be1001a3808619e5b00ec377aec78cc8265 100644 (file)
--- a/apps/files_pdfviewer/appinfo/info.xml
+++ b/apps/files_pdfviewer/appinfo/info.xml
@@ -5,6 +5,7 @@
        <description>Inline PDF viewer (pdfjs-based)</description>
        <licence>GPL</licence>
        <author>Joan Creus</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <default_enable/>
 </info>

diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 58298a205fe046ab5549a532f11b799629e3b107..e31d3299f59bc2c6b738aca2ddb1b42c6d21ba99 100644 (file)
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>File sharing between users</description>
        <licence>AGPL</licence>
        <author>Michael Gapczynski</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <default_enable/>
        <types>
                <filesystem/>

diff --git a/apps/files_texteditor/appinfo/info.xml b/apps/files_texteditor/appinfo/info.xml
index 83c057f38fdf3ce3fb01fd1ae10b5e1de81d423b..e3c6615e041472d30293fa470a26d41ec4de6e85 100644 (file)
--- a/apps/files_texteditor/appinfo/info.xml
+++ b/apps/files_texteditor/appinfo/info.xml
@@ -5,6 +5,7 @@
        <description>Simple plain text editor based on Ace editor.</description>
        <licence>AGPL</licence>
        <author>Tom Needham</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <default_enable/>
 </info>

diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 913be0d93ca5e0b53eb9124dce69a8cc5da49b1a..d806291ed1d5ab78b833d40012f43a8e776fe302 100644 (file)
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <info>
-    <id>files_versions</id>
-    <name>Versions</name>
-    <licence>AGPL</licence>
-    <author>Frank Karlitschek</author>
-    <require>3</require>
-    <description>Versioning of files</description>
+       <id>files_versions</id>
+       <name>Versions</name>
+       <licence>AGPL</licence>
+       <author>Frank Karlitschek</author>
+       <require>4</require>
+       <shipped>true</shipped>
+       <description>Versioning of files</description>
        <types>
                <filesystem/>
        </types>

diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index 43a22bae077058a497fff57918686a61d5555c6a..84f6e960990bc8d8feec90093b1643f38538306f 100644 (file)
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -4,7 +4,8 @@
        <name>Pictures</name>
        <licence>AGPL</licence>
        <author>Bartek Przybylski</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <description>Dedicated pictures application</description>
        <standalone/>
        <default_enable/>

diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml
index b0f205f8b1dbd44e74bade67c8778ae525ee18f6..e2d974670811e9e0538f7fd1b4cd114d46c5a0f9 100644 (file)
--- a/apps/media/appinfo/info.xml
+++ b/apps/media/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>Media player and server for ownCloud</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <standalone/>
        <default_enable/>
        <remote>

diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index 1875e70a300c6e7cd62362d620da08c594f65c38..fa878762a05a82ca761ba5e9b6ad22b73823b53a 100644 (file)
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -5,5 +5,6 @@
        <description>Enables you to use ownCloud as their remote storage for unhosted applications. This app requires the Webfinger app to be installed and enabled correctly. More info on <a href="http://unhosted.org">the website of the unhosted movement</a>.</description>
        <licence>AGPL or MIT</licence>
        <author>Michiel de Jong</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
 </info>

diff --git a/apps/tasks/appinfo/info.xml b/apps/tasks/appinfo/info.xml
index 21ab9a2476239624c297b24a177879edb348cf2a..736fc2324438a2e5e78b77a79dddc47c6bc8e725 100644 (file)
--- a/apps/tasks/appinfo/info.xml
+++ b/apps/tasks/appinfo/info.xml
@@ -5,6 +5,7 @@
        <version>0.1</version>
        <licence>AGPL</licence>
        <author>Bart Visscher</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <description>Tasks view from calendar</description>
 </info>

diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index fe7e61fb5c3a3762dc933fc5d7828e670e151fe3..aac72b57a8bb677042287bea6545213994a04870 100644 (file)
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -4,8 +4,9 @@
        <name>LDAP user backend</name>
        <description>Authenticate Users by LDAP</description>
        <licence>AGPL</licence>
-       <author>Dominik Schmidt</author>
-       <require>2</require>
+       <author>Dominik Schmidt and Arthur Schiwon</author>
+       <require>4</require>
+       <shipped>true</shipped>
        <types>
                <authentication/>
        </types>

diff --git a/apps/user_migrate/appinfo/info.xml b/apps/user_migrate/appinfo/info.xml
index 4c3646f770cccf999ece37590bbe0413f220740b..a128742480ad72b87dc698f80694b481d29f289e 100644 (file)
--- a/apps/user_migrate/appinfo/info.xml
+++ b/apps/user_migrate/appinfo/info.xml
@@ -5,6 +5,7 @@
        <description>Migrate your user accounts</description>
        <licence>AGPL</licence>
        <author>Tom Needham</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <default_enable/>
 </info>

diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml
index 6214229c0a18f197cdc0eea73f04df1b8b8675e6..268af23973837f9faba0cec72fa6180a20702617 100644 (file)
--- a/apps/user_openid/appinfo/info.xml
+++ b/apps/user_openid/appinfo/info.xml
@@ -5,7 +5,8 @@
        <description>Allow login through OpenID</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
        <types>
                <authentication/>
        </types>

diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml
index fe1d43718633d1a591a46f2165cc062ac5dfb7fb..4e28814a26cc10fe087f48fe61ef8af82af725fe 100644 (file)
--- a/apps/user_webfinger/appinfo/info.xml
+++ b/apps/user_webfinger/appinfo/info.xml
@@ -5,5 +5,6 @@
        <description>Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for external applications. Other apps can provide information for webfinger requests, such as remoteStorage compatibility.</description>
        <licence>AGPL or MIT</licence>
        <author>Michiel de Jong, Florian Hülsmann</author>
-       <require>2</require>
+       <require>4</require>
+       <shipped>true</shipped>
 </info>