Update build depends, convert refman.tex to utf8HEADmaster

2 files changed, 29 insertions, 29 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