[Pkg-ocaml-maint-commits] r3250 - in /trunk/packages/hevea: trunk/debian/changelog trunk/debian/patches/02_nogif.dpatch trunk/debian/patches/03_charset.dpatch upstream/hevea_1.09.orig.tar.gz

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Mon Oct 16 19:04:15 UTC 2006 

Author: treinen
Date: Mon Oct 16 19:04:14 2006
New Revision: 3250

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3250
Log:
started on packaging hevea 1.09

Added:
    trunk/packages/hevea/upstream/hevea_1.09.orig.tar.gz   (with props)
Modified:
    trunk/packages/hevea/trunk/debian/changelog
    trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch
    trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch

Modified: trunk/packages/hevea/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/changelog?rev=3250&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/changelog (original)
+++ trunk/packages/hevea/trunk/debian/changelog Mon Oct 16 19:04:14 2006
@@ -1,3 +1,9 @@
+hevea (1.09-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 16 Oct 2006 19:36:07 +0200
+
 hevea (1.08-5) unstable; urgency=low
 
   * Removed mechanism of rebuilding debian/control from debian/control.in

Modified: trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch?rev=3250&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch Mon Oct 16 19:04:14 2006
@@ -1,18 +1,18 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_nogif.dpatch by Ralf Treinen <treinen at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: generate by default images as png, not gif 
+## DP: Ralf Treinen <treinen at debian.org>
 
 @DPATCH@
-diff -urNad hevea-1.08/html/gif.hva /tmp/dpep.j2ynes/hevea-1.08/html/gif.hva
---- hevea-1.08/html/gif.hva	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.j2ynes/hevea-1.08/html/gif.hva	2005-05-15 14:40:42.000000000 +0200
+diff -urNad trunk~/html/gif.hva trunk/html/gif.hva
+--- trunk~/html/gif.hva	1970-01-01 01:00:00.000000000 +0100
++++ trunk/html/gif.hva	2006-10-16 20:27:17.000000000 +0200
 @@ -0,0 +1 @@
 +\renewcommand{\heveaimageext}{.gif}
-diff -urNad hevea-1.08/imagen /tmp/dpep.j2ynes/hevea-1.08/imagen
---- hevea-1.08/imagen	2005-05-15 14:40:10.000000000 +0200
-+++ /tmp/dpep.j2ynes/hevea-1.08/imagen	2005-05-15 14:40:10.000000000 +0200
+diff -urNad trunk~/imagen trunk/imagen
+--- trunk~/imagen	2006-09-07 17:06:15.000000000 +0200
++++ trunk/imagen	2006-10-16 20:27:17.000000000 +0200
 @@ -7,10 +7,10 @@
  PNMEXTRA=""
  PNMMARGIN="pnmmargin -white 1"
@@ -28,10 +28,10 @@
  TODIR="."
  RM="/bin/rm -f"
  
-diff -urNad hevea-1.08/latexcommon.hva /tmp/dpep.j2ynes/hevea-1.08/latexcommon.hva
---- hevea-1.08/latexcommon.hva	2005-05-15 14:40:10.000000000 +0200
-+++ /tmp/dpep.j2ynes/hevea-1.08/latexcommon.hva	2005-05-15 14:40:10.000000000 +0200
-@@ -488,7 +488,7 @@
+diff -urNad trunk~/latexcommon.hva trunk/latexcommon.hva
+--- trunk~/latexcommon.hva	2006-10-13 19:25:03.000000000 +0200
++++ trunk/latexcommon.hva	2006-10-16 20:27:17.000000000 +0200
+@@ -476,7 +476,7 @@
  % Images     %
  %%%%%%%%%%%%%%
  \newcounter{image}
@@ -40,12 +40,12 @@
  \newcommand{\heveaimagedir}{}
  \renewcommand{\theimage}{\@arabic{image}}
  \newcommand{\imageflush}[1][]
-diff -urNad hevea-1.08/libs.def /tmp/dpep.j2ynes/hevea-1.08/libs.def
---- hevea-1.08/libs.def	2005-05-15 14:40:10.000000000 +0200
-+++ /tmp/dpep.j2ynes/hevea-1.08/libs.def	2005-05-15 14:40:10.000000000 +0200
+diff -urNad trunk~/libs.def trunk/libs.def
+--- trunk~/libs.def	2006-10-13 19:25:03.000000000 +0200
++++ trunk/libs.def	2006-10-16 20:28:23.000000000 +0200
 @@ -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 mathaccents.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 english.hva  czech.hva ragged2e.hva
--HTMLLIB= amssymb.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.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva
-+HTMLLIB= amssymb.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 gif.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva
- TEXTLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva report.hva seminar.hva symb.hva french.hva
- INFOLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva multind.hva report.hva seminar.hva
+ 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
+-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 inputenc.hva latin1.hva latin2.hva latin3.hva latin4.hva latin5.hva latin6.hva latin7.hva latin8.hva latin9.hva latin10.hva ascii.hva cp1250.hva cp1252.hva cp1257.hva ansinew.hva applemac.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 inputenc.hva latin1.hva latin2.hva latin3.hva latin4.hva latin5.hva latin6.hva latin7.hva latin8.hva latin9.hva latin10.hva ascii.hva cp1250.hva cp1252.hva cp1257.hva ansinew.hva applemac.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 inputenc.hva latin1.hva latin2.hva latin3.hva latin4.hva latin5.hva latin6.hva latin7.hva latin8.hva latin9.hva latin10.hva ascii.hva cp1250.hva cp1252.hva cp1257.hva ansinew.hva applemac.hva
+ INFOLIB=article.hva book.hva hevea.hva report.hva seminar.hva

Modified: trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch?rev=3250&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch Mon Oct 16 19:04:14 2006
@@ -1,98 +1,39 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 03-charset.dpatch by Ralf Treinen <treinen at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Get charset from locale or command line option
+## DP: Add command-line option to set the charsetOB
 
 @DPATCH@
-diff -urNad hevea-1.07.beta.2005.03.07/html/hevea.hva /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/html/hevea.hva
---- hevea-1.07.beta.2005.03.07/html/hevea.hva	2005-03-09 22:58:03.000000000 +0100
-+++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/html/hevea.hva	2005-03-09 22:58:04.000000000 +0100
-@@ -220,11 +220,10 @@
- \newsavebox{\@bibbox}
- \newcommand{\@biblabel}[1]{\@locname{#1}{\purple[\@bibread{#1}]}}
- %%% Environment document.
--\newcommand{\@charset}{ISO-8859-1}
- \newcommand{\@bodyargs}{}
- \newcommand{\@meta}
- {\begin{rawhtml}
--<META http-equiv="Content-Type" content="text/html; charset=\end{rawhtml}\@charset\begin{rawhtml}">
-+<META http-equiv="Content-Type" content="text/html; charset=\end{rawhtml}\usebox{\@charset}\begin{rawhtml}">
- <META name="GENERATOR" content="hevea \end{rawhtml}\usebox{\@heveaversion}\@print{">
- }%
- % style declarations
-diff -urNad hevea-1.07.beta.2005.03.07/Makefile /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/Makefile
---- hevea-1.07.beta.2005.03.07/Makefile	2005-03-09 22:58:03.000000000 +0100
-+++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/Makefile	2005-03-09 22:58:04.000000000 +0100
-@@ -79,7 +79,7 @@
- 
- 
- hevea.byte: ${OBJS}
--	${OCAMLC}  ${OCAMLFLAGS} -o $@ ${OBJS}
-+	${OCAMLC}  ${OCAMLFLAGS} unix.cma -o $@ ${OBJS}
- 
- hacha.byte: ${OBJSCUT}
- 	${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJSCUT}
-@@ -88,7 +88,7 @@
- 	${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJSESPONJA}
- 
- hevea.opt: ${OPTS}
--	${OCAMLOPT} -o $@ ${OPTS}
-+	${OCAMLOPT} unix.cmxa -o $@ ${OPTS}
- 
- hacha.opt: ${OPTSCUT}
- 	${OCAMLOPT} -o $@ ${OPTSCUT}
-diff -urNad hevea-1.07.beta.2005.03.07/package.ml /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/package.ml
---- hevea-1.07.beta.2005.03.07/package.ml	2005-03-09 22:58:03.000000000 +0100
-+++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/package.ml	2005-03-09 22:58:04.000000000 +0100
-@@ -42,6 +42,7 @@
- 
- def_print "\\@basein" Parse_opts.base_in ;
- def_print "\\jobname" Parse_opts.base_out ;
-+def_print "\\@charset" !Parse_opts.charset ;
- def_print "\\@heveacomline"
-   (Array.fold_right
-      (fun arg r -> arg^" "^r)
-diff -urNad hevea-1.07.beta.2005.03.07/parse_opts.ml /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.ml
---- hevea-1.07.beta.2005.03.07/parse_opts.ml	2005-03-09 22:58:03.000000000 +0100
-+++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.ml	2005-03-09 22:58:32.000000000 +0100
-@@ -49,6 +49,19 @@
+
+diff -urNad trunk~/parse_opts.ml trunk/parse_opts.ml
+--- trunk~/parse_opts.ml	2006-09-29 15:53:59.000000000 +0200
++++ trunk/parse_opts.ml	2006-10-16 20:52:39.000000000 +0200
+@@ -44,6 +44,7 @@
+ and destination = ref Html
+ and fixpoint = ref false
  and optimize = ref false
++and charset_option = ref ""
  ;;
  
-+let defaultcharset = "ISO-8859-1";;
-+let charset =
-+  ref (try
-+	 let c = Unix.open_process_in "/usr/bin/locale charmap"
-+	 in let s = input_line c
-+	 in begin
-+	     Unix.close_process_in c;
-+	     if s = "" then defaultcharset else s
-+	   end
-+       with
-+	   _ -> defaultcharset)
-+;;
-+
  (* Variables for BibTex and GlossTex support *)
- let bib = ref false
- and gloss = ref false
-@@ -107,6 +120,8 @@
+@@ -108,6 +109,8 @@
  
-   ("-noiso",Arg.Unit (fun () -> iso := false),
-    "use HTML entities in place of isolatin1 non-ascii characters") ;
-+  ("-charset",Arg.String (fun s -> charset := s),
+   ("-noiso",Arg.Unit (fun () -> Misc.warning "-noiso is deprecated, by default hevea output is ascii"),
+    "deprecated, does nothing") ;
++  ("-charset",Arg.String (fun s -> charset_option := s),
 +   "character set, use ``character set'' in the HEAD tag") ;
    ("-pedantic",Arg.Unit (fun () -> pedantic := true),
     "be pedantic in interpreting HTML 4.0 transitional definition") ;
    ("-mathml",Arg.Unit (fun() -> mathml := true),
-diff -urNad hevea-1.07.beta.2005.03.07/parse_opts.mli /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.mli
---- hevea-1.07.beta.2005.03.07/parse_opts.mli	2005-03-09 22:58:03.000000000 +0100
-+++ /tmp/dpep.x5jZR3/hevea-1.07.beta.2005.03.07/parse_opts.mli	2005-03-09 22:58:04.000000000 +0100
-@@ -18,6 +18,7 @@
+
+diff -urNad trunk~/parse_opts.mli trunk/parse_opts.mli
+--- trunk~/parse_opts.mli	2006-03-29 18:31:18.000000000 +0200
++++ trunk/parse_opts.mli	2006-10-16 20:54:01.000000000 +0200
+@@ -17,6 +17,7 @@
+ type destination = Html | Text | Info
  val destination : destination ref
  
- val iso : bool ref
-+val charset : string ref
++val charset_option : string ref
  val moreentities : bool ref
  val mathml : bool ref
  val pedantic : bool ref

Added: trunk/packages/hevea/upstream/hevea_1.09.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/upstream/hevea_1.09.orig.tar.gz?rev=3250&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/hevea/upstream/hevea_1.09.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

More information about the Pkg-ocaml-maint-commits mailing list