build fixes

bareos · May 20, 2015 · dbf7478 · dbf7478
1 parent 0255446
commit dbf7478
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ cache: apt
 before_install:
     - sudo bash -c 'URL=http://download.bareos.org/bareos/experimental/nightly/xUbuntu_12.04/; wget -q $URL/Release.key -O- | apt-key add -; echo "deb $URL /" >> /etc/apt/sources.list.d/bareos.list'
     - sudo apt-get update -qq
-    - sudo apt-get install -qq make texlive-latex-extra tex4ht imagemagick python bareos bareos-database-sqlite3
+    - sudo apt-get install -qq make texlive-latex-extra tex4ht imagemagick python bareos bareos-database-sqlite3 pandoc
 
 script:
     - make pdf

diff --git a/manuals/en/developers/Makefile b/manuals/en/developers/Makefile
@@ -21,6 +21,9 @@ FILES = generaldevel.md \
 
 all: html
 
+pdf:
+	# skipped, pdf will not be generated
+
 depend:
 	@for I in ${subdirs}; \
 		do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) || exit 1); done
@@ -29,7 +32,7 @@ html: html/bareos-developer-guide.html
 
 html/bareos-developer-guide.html: depend bareos-developer-guide.css footer.html $(FILES)
 	mkdir -p html
-	$(PANDOC) -s -S --toc -c bareos-developer-guide.css -B footer.html -A footer.html  $(FILES) -o html/bareos-developer-guide.html
+	$(PANDOC) --standalone --smart --toc --css=bareos-developer-guide.css --include-after-body=footer.html $(FILES) --output=html/bareos-developer-guide.html
 	cp -a bareos-developer-guide.css html/
 
 check: html

diff --git a/manuals/en/developers/footer.html b/manuals/en/developers/footer.html
@@ -1,6 +1,6 @@
 <div id="footer">
 <hr>
-&copy; 2015 <a href="http://www.bareos.org/">Bareos Project</a>
+&copy; <a href="http://www.bareos.org/">Bareos Project</a>
 <hr>
 </div>
 
diff --git a/packaging/bareos-docs.dsc b/packaging/bareos-docs.dsc
@@ -5,5 +5,5 @@ Architecture: all
 Version: 15.2
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Standards-Version: 3.8.4
-Build-Depends: bareos-director, bareos-database-sqlite3, bareos-storage, bareos-filedaemon, bareos-bconsole, bareos-traymonitor, debhelper, ghostscript, imagemagick, pandoc, python, texlive-fonts-recommended, texlive-latex-extra, tex4ht
+Build-Depends: bareos-director, bareos-database-sqlite3, bareos-storage, bareos-filedaemon, bareos-bconsole, bareos-traymonitor, debhelper, dvipng, ghostscript, imagemagick, pandoc, python, texlive-fonts-recommended, texlive-latex-extra, tex4ht
 DEBTRANSFORM-RELEASE: unstable; urgency=low