From 7e9670eb3dc93f0e433a1727d878adabb5bbb6fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 9 Feb 2018 13:39:32 +0100 Subject: [PATCH] Fixed building of documentation (for real) --- debian/libjuce-doc.install | 2 +- debian/patches/debian_doxylinks.patch | 17 ----------------- debian/patches/series | 1 - debian/rules | 9 ++++----- 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/debian_doxylinks.patch diff --git a/debian/libjuce-doc.install b/debian/libjuce-doc.install index 42e8fc54..1b4da23f 100644 --- a/debian/libjuce-doc.install +++ b/debian/libjuce-doc.install @@ -1 +1 @@ -doc/* /usr/share/doc/libjuce-doc/apiref +doxygen/doc/* /usr/share/doc/libjuce-doc/apiref diff --git a/debian/patches/debian_doxylinks.patch b/debian/patches/debian_doxylinks.patch deleted file mode 100644 index 756288be..00000000 --- a/debian/patches/debian_doxylinks.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: allow symlinks when generating doxygen documentation -Author: IOhannes m zmölnig -Forwarded: https://github.com/WeAreROLI/JUCE/issues/349 -Last-Update: 2018-02-08 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/doxygen/Doxyfile -+++ juce/doxygen/Doxyfile -@@ -862,7 +862,7 @@ - # from the input. - # The default value is: NO. - --EXCLUDE_SYMLINKS = YES -+EXCLUDE_SYMLINKS = NO - - # If the value of the INPUT tag contains directories, you can use the - # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude diff --git a/debian/patches/series b/debian/patches/series index e686d40c..31adb158 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ debian_fixed-defines.patch debian_gpl_variant.patch debian_no-update-check.patch debian_system_modules.patch -debian_doxylinks.patch diff --git a/debian/rules b/debian/rules index 884dab0c..e965e059 100755 --- a/debian/rules +++ b/debian/rules @@ -37,8 +37,7 @@ override_dh_auto_build-arch: > $(DEBIAN_BUILD_ARTIFACTS)/Projucer.1 override_dh_auto_build-indep: - ln -s modules build - doxygen doxygen/Doxyfile + make -C doxygen override_dh_auto_install-arch: install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/juce/lv2-ttl-generator @@ -46,7 +45,7 @@ override_dh_auto_install-arch: install debian/extra/lv2-ttl-generator/generate-ttl.sh debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/juce/lv2-ttl-generator/generate-ttl.sh override_dh_auto_install-indep: - -dh_doxygen doc/ + -dh_doxygen doxygen/doc/ override_dh_install-indep: dh_install --indep @@ -60,9 +59,9 @@ override_dh_installchangelogs: override_dh_clean: dh_clean - rm -rf doc build - rm -rf $(DEB_SRCDIR)/build + make -C doxygen/ clean make -C debian/extra/lv2-ttl-generator/ clean + rm -rf build $(DEB_SRCDIR)/build rm -f $(DEBIAN_BUILD_ARTIFACTS)/* -- 2.30.2