[X2Go-Commits] [python-x2go] 01/02: Makefile.docupload: make sphinx-apidoc overridable/configurable.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 4b8ec8d7133b7058ccff48818d09786f53139ccd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Dec 31 19:13:12 2019 +0100

    Makefile.docupload: make sphinx-apidoc overridable/configurable.
---
 Makefile.docupload | 3 ++-
 debian/changelog   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.docupload b/Makefile.docupload
index 9ba799d..9ac7961 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -6,6 +6,7 @@ VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
 DOC_PATH=/srv/sites/x2go.org/code/doc/python-x2go
 DOC_USER=x2go-admin
+SPHINX_APIDOC=sphinx-apidoc
 
 doc: docbuild docupload
 
@@ -13,7 +14,7 @@ clean:
 	${MAKE} -C docs/ clean
 
 apidoc:
-	sphinx-apidoc -f -e -o docs/source/ x2go
+	$(SPHINX_APIDOC) -f -e -o docs/source/ x2go
 
 docbuild: clean
 	${MAKE} -C docs/ html SPHINXOPTS="-a -E"
diff --git a/debian/changelog b/debian/changelog
index b2fb6ac..9014983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ python-x2go (0.6.1.3-0x2go1) UNRELEASED; urgency=medium
       it is broken under Python3.
       See: https://github.com/paramiko/paramiko/pull/1583/
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.6.1.3):
+    - Makefile.docupload: make sphinx-apidoc overridable/configurable.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 26 Dec 2019 10:37:02 +0100
 
 python-x2go (0.6.1.2-0x2go1) unstable; urgency=medium

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git