[SCM] mediagoblin/master: Fix generate and install documentation.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Aug 21 10:10:06 UTC 2017


The following commit has been merged in the master branch:
commit e155e52ceb8cece36389b0a53b90c2e759c96897
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Aug 21 11:11:33 2017 +0200

    Fix generate and install documentation.

diff --git a/debian/control b/debian/control
index 1ac0910..d37bf2c 100644
--- a/debian/control
+++ b/debian/control
@@ -106,6 +106,8 @@ Recommends:
  fonts-inconsolata,
  fonts-lato,
  libjs-jquery,
+Built-Using:
+ ${sphinxdoc:Built-Using},
 Description: web application for publishing all kinds of media - documentation
  GNU MediaGoblin is a free software media publishing platform that
  anyone can run. You can think of it as a decentralized alternative to
diff --git a/debian/mediagoblin-doc.docs b/debian/mediagoblin-doc.docs
index bbe1a53..a213c54 100644
--- a/debian/mediagoblin-doc.docs
+++ b/debian/mediagoblin-doc.docs
@@ -1 +1 @@
-docs/build/*
+docs/build/html
diff --git a/debian/rules b/debian/rules
index 6c15a6b..9eb0341 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@ export PYBUILD_DISABLE = test
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C docs html
+
 override_dh_installchangelogs:
 	dh_installchangelogs docs/source/siteadmin/relnotes.rst
 

-- 
mediagoblin packaging



More information about the pkg-multimedia-commits mailing list