[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.0.42.0-6-g5bb4b2e

[X2Go dev team]

The branch, build-baikal has been updated
       via  5bb4b2ee430225cab03cc3e211b612e42dcb85af (commit)
      from  5de9a49250bcd14318043e2fc7aa57c7688b78a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile.pre-debuild    |   28 ----------------------------
 debian/python-x2go.docs |    4 ++--
 debian/rules            |   15 ++++++++++++++-
 3 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 Makefile.pre-debuild

The diff of changes is:
diff --git a/Makefile.pre-debuild b/Makefile.pre-debuild
deleted file mode 100644
index 004f973..0000000
--- a/Makefile.pre-debuild
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/make -f
-# Makefile.pre-debuild file - for python-x2go
-# Copyright 2010-2011 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3 applies to this file
-
-VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
-DOC_HOST=packages.x2go.org
-DOC_PATH=/srv/sites/x2go.org/packages/doc/python-x2go
-DOC_USER=x2go-admin
-
-all: epydoc
-
-epydoc:
-	mkdir -p doc/html
-	mkdir -p doc/pdf
-	mkdir -p doc/pdf.tmp
-	rm -Rf doc/html/*
-	epydoc -n "Python X2go" -u http://www.x2go.org -v --html --no-private -o doc/html x2go/
-	epydoc --pdf --no-private -o doc/pdf.tmp x2go/
-	mv doc/pdf.tmp/api.pdf doc/pdf/Python-X2go_API.pdf
-	rm -Rf doc/pdf.tmp
-
-docupload:
-	ssh -l${DOC_USER} ${DOC_HOST} rm -Rfv ${DOC_PATH}/*
-	scp -r doc/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/
-
-targz:
-	tar --exclude *.pyc --exclude *.pyo -vzcf ../python-x2go_${VERSION}.orig.tar.gz x2go/ examples/ doc/ setup.py README TODO LICENSE Makefile.pre-debuild
-
diff --git a/debian/python-x2go.docs b/debian/python-x2go.docs
index a13869d..3ba7a3e 100644
--- a/debian/python-x2go.docs
+++ b/debian/python-x2go.docs
@@ -1,6 +1,6 @@
 README
 README.Trinity-Desktop
 TODO
-doc/html/
-doc/pdf/
+.epydoc/doc/html/
+.epydoc/doc/pdf/
 patches/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 2cd5ecd..0fc5762 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,19 @@
 %:
 	dh ${@}
 
-build:
+build: build-epydoc build-dh
+
+build-epydoc:
+	mkdir -p .epydoc/html
+	mkdir -p .epydoc/pdf
+	mkdir -p .epydoc/pdf.tmp
+	rm -Rf .epydoc/html/*
+	epydoc -n "Python X2go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
+	epydoc --pdf --no-private -o .epydoc/pdf.tmp x2go/
+	mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2go_API.pdf
+	rm -Rf .epydoc/pdf.tmp
+
+build-dh:
 	dh ${@}
 
 install:
@@ -20,5 +32,6 @@ binary-indep:
 clean:
 	rm -Rfv debian/*.log debian/python-x2go debian/python-x2go.*.debhelper debian/python-x2go.substvars
 	rm -Rfv debian/tmp debian/patches build x2go.egg-info
+	rm -Rfv .epydoc
 	dh ${@}
 


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).