Update build depends, convert refman.tex to utf8HEADmaster

3 files changed, 40 insertions, 40 deletions

diff --git a/debian/control b/debian/control
index fa48e97..d6a6c72 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: zinc-tk
 Section: devel
 Priority: extra
 Maintainer: Patrick Lecoanet <lecoanet@ath.cena.fr>
-Build-Depends: libgl1-mesa-dev ,libglew-dev , tk8.6-dev, tcl8.6-dev, perl-base, python (>= 2.1), python-dev, debhelper (>> 3.0.0), tetex-extra (>= 1.0.2+20011202-2) | texlive-latex-base, gcc(>= 2.95.4-14), perl (>= 5.6.1-8.2), tex4ht,texlive-latex-recommended, perl-tk (>= 800.024)
+Build-Depends: libgl1-mesa-dev ,libglew-dev , tk8.6-dev, tcl8.6-dev, perl-base, python2 (>= 2.1), python2-dev, debhelper (>> 3.0.0), tetex-extra (>= 1.0.2+20011202-2) | texlive-latex-base, texlive-latex-extra, gcc(>= 2.95.4-14), perl (>= 5.6.1-8.2), tex4ht,texlive-latex-recommended, perl-tk (>= 800.024)
 Standards-Version: 2.3.0.0
 
 Package: zinc-tk
diff --git a/debian/rules b/debian/rules
index e5e64af..72ebd05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-TMP=`pwd`/debian/tmp
+TMP=`pwd`/debian/zinc-tk
 TMP_DOC=`pwd`/debian/zinc-doc
 TMP_PERL=`pwd`/debian/zinc-perl
 TMP_PYTHON=$(shell echo `pwd`/debian/zinc-python)
@@ -38,7 +38,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 #
@@ -51,7 +51,7 @@ install: build
 # Making/installing the documentation
 # TODO regenerer la doc html
 # 	make pdf html
-# 	make pdf
+	make pdf
 	-mkdir -p $(TMP_DOC)/usr/share/doc/zinc-doc/refman
 	-install -m644 doc/refman.pdf $(TMP_DOC)/usr/share/doc/zinc-doc
 # 	-install -m644 doc/*.html doc/*.css doc/*.png $(TMP_DOC)/usr/share/doc/zinc-doc/refman
@@ -72,32 +72,32 @@ install: build
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i BUGS
-	dh_installexamples -i
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs BUGS
+	dh_installexamples
 #	dh_install --sourcedir=debian/tmp
-#	dh_installmenu -i
-#	dh_installdebconf -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
-#	dh_installcron -i
-#	dh_installinfo -i
-#	dh_undocumented -i
-	dh_installman -i
-	dh_link -i
-	dh_compress -i --exclude=.pdf --exclude=.py
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_perl -i
-# 	dh_python2 -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_undocumented
+	dh_installman
+	dh_link
+	dh_compress --exclude=.pdf --exclude=.py
+	dh_fixperms
+	dh_installdeb
+	dh_perl
+# 	dh_python2
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 # Build architecture-dependent files here.
 binary-arch: build install
diff --git a/doc/refman.tex b/doc/refman.tex
index fa87967..790ce47 100644
--- a/doc/refman.tex
+++ b/doc/refman.tex
@@ -6,10 +6,10 @@
 %
 % TODO
 %
-% Relire et reprendre l'item Track et compléter les attributs
-% Même chose pour triangles
-% Vérifier que les couleurs sont bien décrites comme des gradients
-% Les reliefs sont calculés sur le linecolor/bordercolor et non
+% Relire et reprendre l'item Track et compléter les attributs
+% Même chose pour triangles
+% Vérifier que les couleurs sont bien décrites comme des gradients
+% Les reliefs sont calculés sur le linecolor/bordercolor et non
 %  sur le fillcolor comme avant
 % Ecrire les quelques descriptions d'item qui manquent.
 % Mettre quelques images: au moins une par item, une pour chaque relief,
@@ -35,7 +35,7 @@
     menucolor=webdarkblue,
     citecolor=webbrightgreen,
     pdftitle={Zinc, an advanced scriptable Canvas.},
-    pdfauthor={Patrick Lecoanet, Christophe Mertz, Centre d'Étude de la Navigation Aérienne},
+    pdfauthor={Patrick Lecoanet, Christophe Mertz, Centre d'Étude de la Navigation Aérienne},
     pdfsubject={The 3.3.8 Reference Manual.},
     pdfkeywords={tk tcl perl x11 canvas opengl script gui TkZinc},
     pagebackref,
@@ -170,7 +170,7 @@
 
 % Premier parametre : nom du fichier image
 % Deuxieme parametre : legende
-% Troisieme parametre : scaling (e.g. 2.2 1 ou 0.54) à appliquer en pdf / dvi
+% Troisieme parametre : scaling (e.g. 2.2 1 ou 0.54) à appliquer en pdf / dvi
 \newcommand{\fig}[3]{%
   \begin{figure}[htbp]%
     \centering%
@@ -346,7 +346,7 @@ This document is also referenced as CENA technical note NT03-532.
 \begin{itemize}
 \item Updated Python binding and new demos added
 \item python :Updated Python binding and new demos added
-\item python :No more need to call explicitely the function havetkzinc to load the library ELF tkzinc. On peut créer un objet Zinc avec ou sans conteneur. 
+\item python :No more need to call explicitely the function havetkzinc to load the library ELF tkzinc. On peut créer un objet Zinc avec ou sans conteneur. 
 \item python :A Zinc object can be created with or without container object. If master arg is 0, a new object Tkinter.Frame is created and the object Zinc is inserted on.
 \item python :Add Zinc.Zinc.addtagancestors
 \item python :Del Zinc.Zinc.addtagatpoint ( not anymore in specifications of Zinc API )
@@ -584,18 +584,18 @@ describes some resources provided by or with TkZinc.
 \section{Copyright and License}
 
 Zinc has been developed by the CENA (Centres d'Etudes de la Navigation
-Aérienne) for its own needs in advanced HMI (Human Machine Interfaces or Interactions).
+Aérienne) for its own needs in advanced HMI (Human Machine Interfaces or Interactions).
 Because we are confident in the benefit of free software, the CENA delivered this
 toolkit under the GNU Lesser General Public License.
 
-This software is copyrighted by the Centre d'études de la Navigation
-Aérienne, Patrick Lecoanet, and other parties.  The following terms
+This software is copyrighted by the Centre d'études de la Navigation
+Aérienne, Patrick Lecoanet, and other parties.  The following terms
 apply to all files associated with the software unless explicitly
 disclaimed in individual files.
 
 Here is the license text:
 
-Copyright (c) 2005, Centre d'études de la Navigation Aérienne, Patrick Lecoanet
+Copyright (c) 2005, Centre d'études de la Navigation Aérienne, Patrick Lecoanet
 All rights reserved.
 
 This library is free software; you can redistribute it and/or