[SCM] serd/master: Patched waf to find generated docs

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1faeed697e99d0195b3bcd64cabfe6100e12a8d2
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Oct 13 11:51:00 2015 +0200

    Patched waf to find generated docs

diff --git a/debian/patches/1002-doxy-path.patch b/debian/patches/1002-doxy-path.patch
new file mode 100644
index 0000000..3788861
--- /dev/null
+++ b/debian/patches/1002-doxy-path.patch
@@ -0,0 +1,41 @@
+Description: fixed path to doxygen-documentation in scripts
+ newer doxygen seems to output into a *.doxy/ subdirectory,
+ which keeps waf from finding (and cleaning up) the documentation.
+ This patch fixes the search-paths in the wafscript.
+Author: IOhannes m zmölnig
+Forwarded: no
+Last-Update: 2015-10-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- serd.orig/waflib/extras/autowaf.py
++++ serd/waflib/extras/autowaf.py
+@@ -295,7 +295,7 @@
+ 	NAME=name.upper()
+ 	try:
+ 		top=os.getcwd()
+-		os.chdir(build_dir(name,'doc/html'))
++		os.chdir(build_dir(name,'doc/reference.doxygen.doxy/html'))
+ 		page='group__%s.html'%name
+ 		if not os.path.exists(page):
+ 			return
+@@ -306,7 +306,7 @@
+ 			if i!='index.html'and i!='style.css':
+ 				os.remove(i)
+ 		os.chdir(top)
+-		os.chdir(build_dir(name,'doc/man/man3'))
++		os.chdir(build_dir(name,'doc/reference.doxygen.doxy/man/man3'))
+ 		for i in glob.glob('*.3'):
+ 			os.system("sed -i 's/%s_API //' %s"%(NAME,i))
+ 		for i in glob.glob('_*'):
+@@ -330,9 +330,9 @@
+ 	outname=name.lower()
+ 	if versioned:
+ 		outname+='-%d'%int(version[0:version.find('.')])
+-	bld.install_files(os.path.join('${DOCDIR}',outname,outdir,'html'),bld.path.get_bld().ant_glob('doc/html/*'))
++	bld.install_files(os.path.join('${DOCDIR}',outname,outdir,'html'),bld.path.get_bld().ant_glob('doc/reference.doxygen.doxy/html/*'))
+ 	for i in range(1,8):
+-		bld.install_files('${MANDIR}/man%d'%i,bld.path.get_bld().ant_glob('doc/man/man%d/*'%i,excl='**/_*'))
++		bld.install_files('${MANDIR}/man%d'%i,bld.path.get_bld().ant_glob('doc/reference.doxygen.doxy/man/man%d/*'%i,excl='**/_*'))
+ def build_version_files(header_path,source_path,domain,major,minor,micro):
+ 	header_path=os.path.abspath(header_path)
+ 	source_path=os.path.abspath(source_path)
diff --git a/debian/patches/series b/debian/patches/series
index c656dfd..f206a80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-kfreebsd_ftbfs.patch
 1001-dont_run_ldconfig.patch
+1002-doxy-path.patch

-- 
serd packaging