[SCM] frei0r/master: Build-depend on doxygen, build html documentation, and install below /usr/share (not /usr/share/doc as wrongly done in the past).

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Dec 26 02:28:29 UTC 2012


The following commit has been merged in the master branch:
commit ae5f3b4da77148d80657b45adc88db5d89428c9e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Dec 26 02:22:04 2012 +0100

    Build-depend on doxygen, build html documentation, and install below /usr/share (not /usr/share/doc as wrongly done in the past).

diff --git a/debian/control b/debian/control
index e68afe2..2024647 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: cdbs,
  pkg-config,
  libgavl-dev,
  libopencv-dev
+Build-Depends-Indep: doxygen
 Standards-Version: 3.9.4
 
 Package: frei0r-plugins
diff --git a/debian/frei0r-plugins-doc.doc-base b/debian/frei0r-plugins-doc.doc-base
index fea241c..77dc9ab 100644
--- a/debian/frei0r-plugins-doc.doc-base
+++ b/debian/frei0r-plugins-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: A minimalistic plugin API for video effects
 Section: Graphics
 
 Format: HTML
-Index: /usr/share/doc/frei0r-plugins-1.1/html/index.html
-Files: /usr/share/doc/frei0r-plugins-1.1/html/*.html
+Index: /usr/share/frei0r/html/index.html
+Files: /usr/share/frei0r/html/*.html
diff --git a/debian/frei0r-plugins-doc.install b/debian/frei0r-plugins-doc.install
deleted file mode 100644
index 7276ecd..0000000
--- a/debian/frei0r-plugins-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc
diff --git a/debian/rules b/debian/rules
index 426cc6d..6e807f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,30 @@
 #!/usr/bin/make -f
 
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 pkg = $(DEB_SOURCE_PACKAGE)
+pkgdoc = frei0r-plugins-doc
 
 DEB_UPSTREAM_URL = http://www.piksel.no/$(pkg)/releases
 DEB_UPSTREAM_PACKAGE = frei0r-plugins
 DEB_UPSTREAM_TARBALL_MD5 = a2eb63feeeb0c5cf439ccca276cbf70c
+
+# TODO: have autotools build docs as part of main build, when doxygen is found
+DEB_BUILDDIR_$(pkgdoc) = doc
+build/$(pkgdoc)::
+	$(DEB_MAKE_INVOKE)
+# TODO: have autotools support DESTDIR for doc install target
+#install/$(pkgdoc)::
+#	$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
+DEB_DH_INSTALL_ARGS_$(pkgdoc) = doc/html usr/share/$(pkg)
+# TODO: have autotools support DESTDIR for doc clean target
+#DEB_PHONY_RULES += doc-clean/$(pkgdoc)
+#doc-clean/$(pkgdoc):
+#	$(DEB_MAKE_INVOKE) distclean
+#clean:: doc-clean/$(pkgdoc)
+clean::
+	rm -f $(patsubst %,doc/html/*.%,html js css png map md5)
+	rm -f doc/Makefile

-- 
frei0r packaging



More information about the pkg-multimedia-commits mailing list