From 9e735241689a9ba6a7810f4873fe2bba548e4cc3 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 18 May 2012 16:06:57 +0200
Subject: [PATCH] mark the apps as part of the shipped package and increase the
 requirement to ownCloud 4

---
 apps/admin_dependencies_chk/appinfo/info.xml |  5 +++--
 apps/admin_migrate/appinfo/info.xml          |  3 ++-
 apps/bookmarks/appinfo/info.xml              |  3 ++-
 apps/calendar/appinfo/info.xml               |  3 ++-
 apps/contacts/appinfo/info.xml               |  3 ++-
 apps/external/appinfo/info.xml               |  3 ++-
 apps/files/appinfo/info.xml                  |  3 ++-
 apps/files_archive/appinfo/info.xml          |  3 ++-
 apps/files_encryption/appinfo/info.xml       |  3 ++-
 apps/files_external/appinfo/info.xml         |  3 ++-
 apps/files_imageviewer/appinfo/info.xml      |  3 ++-
 apps/files_pdfviewer/appinfo/info.xml        |  3 ++-
 apps/files_sharing/appinfo/info.xml          |  3 ++-
 apps/files_texteditor/appinfo/info.xml       |  3 ++-
 apps/files_versions/appinfo/info.xml         | 13 +++++++------
 apps/gallery/appinfo/info.xml                |  3 ++-
 apps/media/appinfo/info.xml                  |  3 ++-
 apps/remoteStorage/appinfo/info.xml          |  3 ++-
 apps/tasks/appinfo/info.xml                  |  3 ++-
 apps/user_ldap/appinfo/info.xml              |  5 +++--
 apps/user_migrate/appinfo/info.xml           |  3 ++-
 apps/user_openid/appinfo/info.xml            |  3 ++-
 apps/user_webfinger/appinfo/info.xml         |  3 ++-
 23 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/apps/admin_dependencies_chk/appinfo/info.xml b/apps/admin_dependencies_chk/appinfo/info.xml
index d5f8bd3783..90ea72bf4b 100644
--- 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 5172157900..f48c666ffe 100644
--- 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 4dbb74bb76..93510815f5 100644
--- 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 f45f306e7d..dde0260f07 100644
--- 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 86692d65b4..74fd6b012d 100644
--- 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 83130f17e6..c4d0b55481 100644
--- 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 92d0a50814..105df092ce 100644
--- 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 9872187f9b..93ec68ee10 100644
--- 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 c2e1aa9604..06807813ea 100644
--- 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 1918925389..c324730593 100644
--- 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 dbc78ffba0..1e3192f6ed 100644
--- 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 0e81729a8b..e3813be100 100644
--- 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 58298a205f..e31d3299f5 100644
--- 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 83c057f38f..e3c6615e04 100644
--- 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 913be0d93c..d806291ed1 100644
--- 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 43a22bae07..84f6e96099 100644
--- 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 b0f205f8b1..e2d9746708 100644
--- 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 1875e70a30..fa878762a0 100644
--- 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 21ab9a2476..736fc23244 100644
--- 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 fe7e61fb5c..aac72b57a8 100644
--- 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 4c3646f770..a128742480 100644
--- 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 6214229c0a..268af23973 100644
--- 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 fe1d437186..4e28814a26 100644
--- 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>
-- 
GitLab