From 1c0bda3d9868cf62788eaf88317af35326e0b4e7 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 8 Nov 2011 06:45:18 -0500
Subject: it is GPL General Public License not GPL Public License

---
 mod/oauth_api/manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/oauth_api/manifest.xml')

diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index 62111e258..efd3d944f 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -8,7 +8,7 @@
 	<category>api</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
-- 
cgit v1.2.3


From e8abce49de57d64a5475be011b51842be2cb0344 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 19 Dec 2011 21:04:00 -0500
Subject: Refs #4221 added a conflict statement to manifest for PECL extension

---
 mod/oauth_api/manifest.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mod/oauth_api/manifest.xml')

diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index efd3d944f..991be6a22 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -18,4 +18,8 @@
 		<type>plugin</type>
 		<name>oauth_lib</name>
 	</conflicts>
+	<conflicts>
+		<type>php_extension</type>
+		<name>oauth</name>
+	</conflicts>
 </plugin_manifest>
-- 
cgit v1.2.3