Merge branch 'feature/upstream' into develop

5 files changed, 8 insertions, 9 deletions

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 0fe524f..dd0926f 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -2,7 +2,7 @@
 

 # .qhp output

 GENERATE_QHP = yes

-QHP_NAMESPACE = "net.sourceforge.uriparser"

+QHP_NAMESPACE = "io.github.uriparser"

 QHP_VIRTUAL_FOLDER = "uriparser-@VERSION@"

 

 # .qch output

@@ -280,7 +280,7 @@ WARN_FORMAT = "WARNING: $text ($line, $file)"
 ###############################################################

 

 

-INPUT = @ac_abs_confdir@/include @ac_abs_confdir@/doc/Mainpage

+INPUT = @ac_abs_confdir@/include @ac_abs_confdir@/doc/Mainpage.txt

 # The INPUT tag is used to specify the files and/or directories that contain documented source files. You may enter file names like myfile.cpp or directories like /usr/src/myproject. Separate the files or directories with spaces.

 #

 # Note: If this tag is empty the current directory is searched.

diff --git a/doc/Mainpage b/doc/Mainpage.txt
index 3a80e30..3a80e30 100644
--- a/doc/Mainpage
+++ b/doc/Mainpage.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fb9e035..012f0bc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,7 @@ all-local: html/index.html
 html/index.html: $(srcdir)/../include/uriparser/*.h \
 		$(srcdir)/../src/*.c \
 		$(srcdir)/../src/*.h \
-		$(srcdir)/Mainpage
+		$(srcdir)/Mainpage.txt
 	rm -Rf "$(builddir)/html"
 	doxygen Doxyfile
 	touch html/index.html
@@ -24,7 +24,7 @@ distclean-local:
 ## Install doc files
 install-data-local:
 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
-	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
+	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
 	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
 	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d6c8bd7..b8bbff5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -454,7 +454,7 @@ all-local: html/index.html
 html/index.html: $(srcdir)/../include/uriparser/*.h \
 		$(srcdir)/../src/*.c \
 		$(srcdir)/../src/*.h \
-		$(srcdir)/Mainpage
+		$(srcdir)/Mainpage.txt
 	rm -Rf "$(builddir)/html"
 	doxygen Doxyfile
 	touch html/index.html
@@ -468,7 +468,7 @@ distclean-local:
 
 install-data-local:
 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
-	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
+	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
 	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
 	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
 
diff --git a/doc/release.sh.in b/doc/release.sh.in
index d970773..70a52b4 100755
--- a/doc/release.sh.in
+++ b/doc/release.sh.in
@@ -17,7 +17,6 @@ cp \
 	html/*.css \
 	html/*.html \
 	html/*.js \
-	html/*.map \
 	html/*.md5 \
 	html/*.png \
 	\