[SCM] gavl/master: Make missing doxygen non-fatal to configure

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Fri Jul 17 21:43:53 UTC 2015


The following commit has been merged in the master branch:
commit 2c9bcf7aa822b6dbe2d329f74f8a2fead6577ac7
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Jul 17 23:34:08 2015 +0200

    Make missing doxygen non-fatal to configure
    
    do allow "arch-dependent only" builds (e.g. Debian buildbots)

diff --git a/debian/patches/0003-nonfatal-missing-doxygen.patch b/debian/patches/0003-nonfatal-missing-doxygen.patch
new file mode 100644
index 0000000..aed4cb4
--- /dev/null
+++ b/debian/patches/0003-nonfatal-missing-doxygen.patch
@@ -0,0 +1,20 @@
+Description: don't fail on missing doxygen
+ Debian does not install doxygen on arch-dependent only builds.
+ Not having doxygen installed is a fatal error (unless the --without-doxygen
+ option is specified, which we don't want to do since we do want to build the
+ docs in the full builds)
+Author: IOhannes m zmölnig
+Last-Update: 2015-07-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- gavl.orig/configure.ac
++++ gavl/configure.ac
+@@ -53,7 +53,7 @@
+ if test "x$test_doxygen" = "xtrue"; then
+   AC_CHECK_PROG(DOXYGEN, doxygen, "doxygen")
+   if test -z "$DOXYGEN"; then
+-    AC_MSG_ERROR([Doxygen not found, use --without-doxygen to disable documentation generation])
++    AC_MSG_WARN([Doxygen not found, use --without-doxygen to disable documentation generation])
+   else
+     have_doxygen="true"
+   fi
diff --git a/debian/patches/series b/debian/patches/series
index 354267c..6b828fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-ubuntu_armel_ftbfs.patch
 0002-cpuid_x32.patch
+0003-nonfatal-missing-doxygen.patch

-- 
gavl packaging



More information about the pkg-multimedia-commits mailing list