[Pkg-ocaml-maint-commits] [SCM] hevea packaging branch, master, updated. debian/1.10-9-2-g0ac7e8a

Wed Jan 13 19:58:24 UTC 2010

The following commit has been merged in the master branch:
commit ead9240a22a703bd360b6db76f586af87036133a
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Jan 13 20:51:19 2010 +0100

    convert to source format 3.0 (quilt), drop dependency on tetex

diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..81d0b4f
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1 @@
+nogif
diff --git a/html/symb-eng.hva b/.pc/nogif/.timestamp
similarity index 100%
copy from html/symb-eng.hva
copy to .pc/nogif/.timestamp
diff --git a/html/symb-eng.hva b/.pc/nogif/html/gif.hva
similarity index 100%
copy from html/symb-eng.hva
copy to .pc/nogif/html/gif.hva
diff --git a/imagen b/.pc/nogif/imagen
similarity index 100%
copy from imagen
copy to .pc/nogif/imagen
diff --git a/latexcommon.hva b/.pc/nogif/latexcommon.hva
similarity index 100%
copy from latexcommon.hva
copy to .pc/nogif/latexcommon.hva
diff --git a/libs.def b/.pc/nogif/libs.def
similarity index 100%
copy from libs.def
copy to .pc/nogif/libs.def
diff --git a/debian/changelog b/debian/changelog
index a52eef2..f5d52e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+hevea (1.10-10) unstable; urgency=low
+
+  * Standards-version 3.8.3 (no change)
+  * Source format 3.0 (quilt):
+    - add debian/sources/format
+    - drop build-dependency on dpatch
+    - no more patching in debian/rules
+    - rename patches quilt-style
+  * removed dependency on obsolete tetex-bin
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 13 Jan 2010 20:48:14 +0100
+
 hevea (1.10-9) unstable; urgency=low
 
   * debian/rules: added call to dh_installtex in the post deb preparation
diff --git a/debian/control b/debian/control
index 650a3e5..bddb05c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
  Sylvain Le Gall <gildor at debian.org>,
  Stephane Glondu <steph at glondu.net>
 Build-Depends-Indep:  ocaml-nox (>= 3.07), 
-Build-Depends: debhelper (>= 7.0), dpatch, tex-common, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0), tex-common, cdbs, dh-ocaml
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/hevea.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/hevea.git
@@ -18,7 +18,7 @@ Homepage: http://hevea.inria.fr/
 
 Package: hevea
 Architecture: all
-Depends: ghostscript, netpbm(>=2:9.10-1), texlive-base | tetex-bin , ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ghostscript, netpbm(>=2:9.10-1), texlive-base , ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
 Suggests: hevea-doc 
 Description: translates from LaTeX to HTML, info, or text
  Its remarkable features are
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e9fac5f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-02_nogif
diff --git a/debian/patches/02_nogif.dpatch b/debian/patches/nogif
similarity index 89%
rename from debian/patches/02_nogif.dpatch
rename to debian/patches/nogif
index 976d177..00cb9b9 100755
--- a/debian/patches/02_nogif.dpatch
+++ b/debian/patches/nogif
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_nogif.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## DP: generate by default images as png, not gif 
+Author: Ralf Treinen <treinen at debian.org>
+Description: generate by default images as png, not gif 
 
- at DPATCH@
-diff -urNad hevea-1.10~/html/gif.hva hevea-1.10/html/gif.hva
 --- hevea-1.10~/html/gif.hva	1970-01-01 01:00:00.000000000 +0100
 +++ hevea-1.10/html/gif.hva	2007-08-26 17:59:42.000000000 +0200
 @@ -0,0 +1 @@
@@ -27,7 +23,6 @@ diff -urNad hevea-1.10~/imagen hevea-1.10/imagen
  TODIR="."
  RM="/bin/rm -f"
  
-diff -urNad hevea-1.10~/latexcommon.hva hevea-1.10/latexcommon.hva
 --- hevea-1.10~/latexcommon.hva	2007-08-26 17:59:38.000000000 +0200
 +++ hevea-1.10/latexcommon.hva	2007-08-26 17:59:42.000000000 +0200
 @@ -499,7 +499,7 @@
@@ -39,7 +34,7 @@ diff -urNad hevea-1.10~/latexcommon.hva hevea-1.10/latexcommon.hva
  \newcommand{\heveaimagedir}{}
  \renewcommand{\theimage}{\@arabic{image}}
  \newcommand{\imageflush}[1][]
-diff -urNad hevea-1.10~/libs.def hevea-1.10/libs.def
+
 --- hevea-1.10~/libs.def	2007-06-14 11:08:36.000000000 +0200
 +++ hevea-1.10/libs.def	2007-08-26 18:00:14.000000000 +0200
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..81d0b4f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+nogif
diff --git a/debian/rules b/debian/rules
index b586305..d89118d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 makebuilddir/hevea::
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/html/gif.hva b/html/gif.hva
new file mode 100644
index 0000000..2f38367
--- /dev/null
+++ b/html/gif.hva
@@ -0,0 +1 @@
+\renewcommand{\heveaimageext}{.gif}
diff --git a/imagen b/imagen
index bd5df77..0b685b9 100755
--- a/imagen
+++ b/imagen
@@ -7,10 +7,10 @@ PNMCROP="pnmcrop -white"
 PNMEXTRA=""
 PNMMARGIN="pnmmargin -white 1"
 PPMQUANT=""
-#PPMTOEXT="pnmtopng -transparent '#ffffff'"
-#EXT=png
-PPMTOEXT="ppmtogif -transparent '#ffffff'"
-EXT=gif
+PPMTOEXT="pnmtopng -transparent '#ffffff'"
+EXT=png
+#PPMTOEXT="ppmtogif -transparent '#ffffff'"
+#EXT=gif
 TODIR="."
 RM="/bin/rm -f"
 
diff --git a/latexcommon.hva b/latexcommon.hva
index cab2088..35c4116 100644
--- a/latexcommon.hva
+++ b/latexcommon.hva
@@ -499,7 +499,7 @@
 % Images     %
 %%%%%%%%%%%%%%
 \newcounter{image}
-\newcommand{\heveaimageext}{.gif}
+\newcommand{\heveaimageext}{.png}
 \newcommand{\heveaimagedir}{}
 \renewcommand{\theimage}{\@arabic{image}}
 \newcommand{\imageflush}[1][]
diff --git a/libs.def b/libs.def
index 7f82498..c7f90b6 100644
--- a/libs.def
+++ b/libs.def
@@ -1,4 +1,4 @@
 ALLLIB= alltt.hva amsmath.hva articlecommon.hva babel.hva bookcommon.hva comment.hva compat.hva hyperref.hva ifthen.hva index.hva iso-symb.hva keyval.hva latexcommon.hva listings.hva lstlang1.hva lstlang2.hva lstlang3.hva makeidx.hva mathop.hva moreverb.hva multibib.hva multind.hva natbib-common.hva packages.hva plain.hva program.hva spaces.hva supertabular.hva underscore.hva url.hva verbatim.hva french-common.hva german-common.hva english.hva czech.hva ragged2e.hva chapterbib.hva deepcut.hva figcut.hva longtable.hva eurosym.hva isolatin1.hva textcomp.hva chngcntr.hva ifpdf.hva theorem.hva xspace.hva latexsym.hva iso-html.hva iso-text.hva winstyles.hva winfonts.hva epsfig.hva inputenc.hva thai.hva
-HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva natbib.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva
+HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva natbib.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva gif.hva
 TEXTLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva report.hva seminar.hva french.hva austrian.hva german.hva natbib.hva
 INFOLIB=article.hva book.hva hevea.hva report.hva seminar.hva

-- 
hevea packaging

