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

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>

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>

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>

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>

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/>

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>

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>

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>

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>

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>

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>

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>

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/>

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>

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>

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/>

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>

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>

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>

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>

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>

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>

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>