[SCM] serd/master: Doxy patch dropped - not needed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Sep 22 19:04:01 UTC 2016
The following commit has been merged in the master branch:
commit e06cd501221e62f88ad7ca83db0c8ca95458bb88
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Sep 22 20:59:18 2016 +0200
Doxy patch dropped - not needed.
diff --git a/debian/patches/1002-doxy-path.patch b/debian/patches/1002-doxy-path.patch
deleted file mode 100644
index 9bd15ff..0000000
--- a/debian/patches/1002-doxy-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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: David Robillard <d at drobilla.net>
-Last-Update: 2015-10-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: serd/waflib/extras/autowaf.py
-===================================================================
---- serd.orig/waflib/extras/autowaf.py
-+++ serd/waflib/extras/autowaf.py
-@@ -315,7 +315,7 @@ def make_simple_dox(name):
- 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
-@@ -326,7 +326,7 @@ def make_simple_dox(name):
- 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('_*'):
-@@ -350,9 +350,9 @@ def build_dox(bld,name,version,srcdir,bl
- 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 f206a80..c656dfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
0001-kfreebsd_ftbfs.patch
1001-dont_run_ldconfig.patch
-1002-doxy-path.patch
--
serd packaging
More information about the pkg-multimedia-commits
mailing list