Fixed building of documentation (for real)

diff --git a/debian/libjuce-doc.install b/debian/libjuce-doc.install
index 42e8fc5478b5a8845d14f6dd679084ed1cb47a25..1b4da23ffd8c1aa358bd132baa282095306c8662 100644 (file)
--- 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 (file)
index 756288b..0000000
--- 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 e686d40c0c27ed92de6fd391fda0f09a68093cd6..31adb158c57634cd2638424482fde05276b70367 100644 (file)
--- 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 884dab0cbb476486ec3d99380452009e29146d58..e965e059c4edabc157403d15e79dfbcd2e60ff1a 100755 (executable)
--- 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)/*