[Pkg-ocaml-maint-commits] r3254 - in /trunk/packages/hevea/trunk/debian/patches: 02_nogif.dpatch 03_charset.dpatch

[treinen at users.alioth.debian.org]

Author: treinen
Date: Fri Oct 20 20:26:13 2006
New Revision: 3254

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3254
Log:
finished patch

Modified:
    trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch
    trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch

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=3254&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch Fri Oct 20 20:26:13 2006
@@ -2,7 +2,6 @@
 ## 02_nogif.dpatch by Ralf Treinen <treinen at debian.org>
 ##
 ## DP: generate by default images as png, not gif 
-## DP: Ralf Treinen <treinen at debian.org>
 
 @DPATCH@
 diff -urNad trunk~/html/gif.hva trunk/html/gif.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=3254&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch Fri Oct 20 20:26:13 2006
@@ -1,12 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-charset.dpatch by Ralf Treinen <treinen at debian.org>
+## 03_charset.dpatch by Ralf Treinen <treinen at debian.org>
 ##
-## DP: Add command-line option to set the charsetOB
+## DP: allow setting of charset from the command line
 
 @DPATCH@
 diff -urNad trunk~/Makefile trunk/Makefile
 --- trunk~/Makefile	2006-10-16 11:06:56.000000000 +0200
-+++ trunk/Makefile	2006-10-17 12:08:43.000000000 +0200
++++ trunk/Makefile	2006-10-20 20:56:49.000000000 +0200
 @@ -84,7 +84,7 @@
  
  
@@ -27,8 +27,8 @@
  	${OCAMLOPT} -o $@ ${OPTSCUT}
 diff -urNad trunk~/html/hevea.hva trunk/html/hevea.hva
 --- trunk~/html/hevea.hva	2006-10-16 10:57:17.000000000 +0200
-+++ trunk/html/hevea.hva	2006-10-17 12:11:39.000000000 +0200
-@@ -239,7 +239,6 @@
++++ trunk/html/hevea.hva	2006-10-20 20:57:25.000000000 +0200
+@@ -239,13 +239,12 @@
  \newsavebox{\@bibbox}
  \newcommand{\@biblabel}[1]{\@locname{\bibtag at hook{#1}}{\purple[\@bibread{\bibtag at hook{#1}}]}}
  %%% Environment document.
@@ -36,9 +36,16 @@
  \newcommand{\@def at charset}[1]
  {\renewcommand{\@charset}{#1}\@set at out@translator{mappings/#1.map}}
  \newcommand{\@bodyargs}{}
+ \newcommand{\@meta}
+ {\@print{<META http-equiv="Content-Type" content="text/html; charset=}%
+-\@getprint{\@charset}%
++\@getprint{\usebox{\@charset}}%
+ \@print{">
+ <META name="GENERATOR" content="hevea }%
+ \@getprint{\usebox{\@heveaversion}}\@print{">
 diff -urNad trunk~/package.ml trunk/package.ml
 --- trunk~/package.ml	2006-10-16 10:57:17.000000000 +0200
-+++ trunk/package.ml	2006-10-17 12:11:38.000000000 +0200
++++ trunk/package.ml	2006-10-20 20:56:49.000000000 +0200
 @@ -219,6 +219,7 @@
  
  def_print "\\@basein" Parse_opts.base_in ;
@@ -49,12 +56,12 @@
       (fun arg r -> arg^" "^r)
 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-17 12:08:43.000000000 +0200
-@@ -46,6 +46,19 @@
++++ trunk/parse_opts.ml	2006-10-20 20:56:49.000000000 +0200
+@@ -46,6 +46,20 @@
  and optimize = ref false
  ;;
  
-+let defaultcharset = "US-ASCII";;
++let defaultcharset = "ISO-8859-1";;
 +let charset =
 +  ref (try
 +	 let c = Unix.open_process_in "/usr/bin/locale charmap"
@@ -67,10 +74,11 @@
 +	   _ -> defaultcharset)
 +;;
 +
++
  (* Variables for BibTex and GlossTex support *)
  let bib = ref false
  and gloss = ref false
-@@ -108,6 +121,8 @@
+@@ -108,6 +122,8 @@
  
    ("-noiso",Arg.Unit (fun () -> Misc.warning "-noiso is deprecated, by default hevea output is ascii"),
     "deprecated, does nothing") ;
@@ -81,7 +89,7 @@
    ("-mathml",Arg.Unit (fun() -> mathml := true),
 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-17 12:08:43.000000000 +0200
++++ trunk/parse_opts.mli	2006-10-20 20:56:49.000000000 +0200
 @@ -17,6 +17,7 @@
  type destination = Html | Text | Info
  val destination : destination ref