From c232ff3af0a380efcfd6b0b6ffb60ea1d16a9f0a Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Wed, 29 Apr 2015 07:17:00 -0400
Subject: [PATCH 1/2] Git Migration: Create doc/rest-api when needed.

Create the directory './doc/rest-api' at the start of 'make ari-stubs'
to prevent an error when documentation is generated.  The directory is
also added to git ignores.

ASTERISK-25027
Reported by: Corey Farrell

Change-Id: Iaccc7f0138501c23aa78feaca2f3cce9e68cbc1b
---
 Makefile       | 1 +
 doc/.gitignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 15e21b6b8c..3252f76828 100644
--- a/Makefile
+++ b/Makefile
@@ -982,6 +982,7 @@ ifeq ($(PYTHON),:)
 	@echo "--------------------------------------------------------------------------"
 	@false
 else
+	@$(INSTALL) -d doc/rest-api
 	$(PYTHON) rest-api-templates/make_ari_stubs.py \
 		rest-api/resources.json .
 endif
diff --git a/doc/.gitignore b/doc/.gitignore
index 27acdb3249..e098ec027f 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
 core-en_US.xml
+rest-api
\ No newline at end of file

From 881844297aae505e86081814be74341000c39666 Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Wed, 29 Apr 2015 07:26:13 -0400
Subject: [PATCH 2/2] res_pjsip: Remove incorrect MODULEINFO from
 presence_xml.c.

Remove incorrect MODULEINFO block and unneeded header includes
from presence_xml.c.

ASTERISK-25027
Reported by: Corey Farrell

Change-Id: I977c609ab9d1fe05373027c4138900f6985990eb
---
 res/res_pjsip/presence_xml.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/res/res_pjsip/presence_xml.c b/res/res_pjsip/presence_xml.c
index 2fe6bdc00a..12bfa078c5 100644
--- a/res/res_pjsip/presence_xml.c
+++ b/res/res_pjsip/presence_xml.c
@@ -16,14 +16,6 @@
  * at the top of the source tree.
  */
 
-/*** MODULEINFO
-	<depend>pjproject</depend>
-	<depend>res_pjsip</depend>
-	<depend>res_pjsip_pubsub</depend>
-	<depend>res_pjsip_exten_state</depend>
-	<support_level>core</support_level>
- ***/
-
 #include "asterisk.h"
 
 #include <pjsip.h>
@@ -31,10 +23,8 @@
 #include <pjlib.h>
 
 #include "asterisk/module.h"
-#include "asterisk/res_pjsip.h"
-#include "asterisk/res_pjsip_pubsub.h"
+#include "asterisk/pbx.h"
 #include "asterisk/res_pjsip_presence_xml.h"
-#include "asterisk/res_pjsip_body_generator_types.h"
 
 void ast_sip_sanitize_xml(const char *input, char *output, size_t len)
 {