create html with utf-8 encoding

bareos · Sep 15, 2015 · b58ccf3 · b58ccf3
1 parent 35f8c27
commit b58ccf3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/debian/control b/debian/control
@@ -1,7 +1,7 @@
 Source: bareos-docs
 Priority: extra
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
-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-recommended, tex4ht
+Build-Depends: bareos-director, bareos-database-sqlite3, bareos-storage, bareos-filedaemon, bareos-bconsole, bareos-traymonitor, debhelper, ghostscript, imagemagick, librsvg2-bin, pandoc, python, texlive-fonts-recommended, texlive-latex-recommended, tex4ht
 Standards-Version: 3.8.4
 Section: doc
 Vcs-Git: https://github.com/bareos/bareos-docs.git

diff --git a/manuals/en/main/Makefile b/manuals/en/main/Makefile
@@ -48,7 +48,7 @@ html: html/bareos-manual-main-reference.html
 
 html/bareos-manual-main-reference.html: depend *.sty *.tex bareos-manual-main-reference.htlatex.cfg $(GENERATED) $(HTINDEXES) bareos-manual-main-reference.toc
 	mkdir -p html/
-	htlatex bareos-manual-main-reference "bareos-manual-main-reference.htlatex.cfg" "" -d./html/
+	htlatex bareos-manual-main-reference "bareos-manual-main-reference.htlatex.cfg" "  -cunihtf -utf8" -d./html/
 	mkdir -p html/images/
 	mv html/*.png html/images/
 
@@ -59,7 +59,7 @@ html/bareos-manual-main-reference.html: depend *.sty *.tex bareos-manual-main-re
 	$(MAKEINDEX) $<
 
 %.htidx:
-	htlatex bareos-manual-main-reference "bareos-manual-main-reference.htlatex.cfg" "" -d./html/
+	htlatex bareos-manual-main-reference "bareos-manual-main-reference.htlatex.cfg" "  -cunihtf -utf8" -d./html/
 
 %.4dx: %.htidx
 	name=`basename $< .htidx`; tex "\def\filename{{$$name}{htidx}{4dx}{htind}} \input idxmake.4ht"

diff --git a/manuals/en/main/bareos-manual-main-reference.htlatex.cfg b/manuals/en/main/bareos-manual-main-reference.htlatex.cfg
@@ -1,7 +1,6 @@
-\Preamble{html,index=2,info,sections+}
+\Preamble{html,index=2,info,sections+,charset=utf-8}
 % ,imgdir:images/
 %\Preamble{html,index=2,mouseover,obj-toc,sections+}
-\Configure{charset}{utf-8}
 \Configure{@HEAD}{\HCode{<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css' />}}
 \begin{document}
 

diff --git a/manuals/images/Makefile b/manuals/images/Makefile
@@ -61,6 +61,7 @@ conv/dbconfig-3-postgresql-password.eps: dbconfig-3-postgresql-password.png
 	$(CONVERT) dbconfig-3-postgresql-password.png conv/dbconfig-3-postgresql-password.eps
 
 conv/duplicate-real.png: duplicate-real.svg
+	@$(MKDIRCONV)
 	$(CONVERT) duplicate-real.svg conv/duplicate-real.png
 
 conv/%.png: %.png

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, dvipng, 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, librsvg2-bin, pandoc, python, texlive-fonts-recommended, texlive-latex-extra, tex4ht
 DEBTRANSFORM-RELEASE: unstable; urgency=low