[Pkg-ocaml-maint-commits] r3251 - in /trunk/packages: hevea-doc/upstream/hevea-doc_1.09.orig.tar.gz hevea/trunk/debian/changelog hevea/trunk/debian/control hevea/trunk/debian/patches/03_charset.dpatch hevea/trunk/debian/watch

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Tue Oct 17 15:45:32 UTC 2006 

Author: treinen
Date: Tue Oct 17 15:45:31 2006
New Revision: 3251

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3251
Log:
further towards packaging hevea 1.09

Added:
    trunk/packages/hevea-doc/upstream/hevea-doc_1.09.orig.tar.gz   (with props)
Modified:
    trunk/packages/hevea/trunk/debian/changelog
    trunk/packages/hevea/trunk/debian/control
    trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch
    trunk/packages/hevea/trunk/debian/watch

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

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

Modified: trunk/packages/hevea/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/changelog?rev=3251&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/changelog (original)
+++ trunk/packages/hevea/trunk/debian/changelog Tue Oct 17 15:45:31 2006
@@ -1,8 +1,10 @@
 hevea (1.09-1) unstable; urgency=low
 
   * New upstream release
-
- -- Ralf Treinen <treinen at debian.org>  Mon, 16 Oct 2006 19:36:07 +0200
+  * updated upstream url in debian/control (package description) and 
+    debian/watch.
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 17 Oct 2006 10:45:24 +0200
 
 hevea (1.08-5) unstable; urgency=low
 

Modified: trunk/packages/hevea/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/control?rev=3251&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/control (original)
+++ trunk/packages/hevea/trunk/debian/control Tue Oct 17 15:45:31 2006
@@ -25,4 +25,4 @@
  This version of HeVeA is patched to generate by default picture files
  in the PNG format instead of the GIF format.
  .
- See also http://pauillac.inria.fr/hevea/.
+ See also http://hevea.inria.fr/.

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=3251&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/03_charset.dpatch Tue Oct 17 15:45:31 2006
@@ -4,36 +4,89 @@
 ## DP: Add command-line option to set the charsetOB
 
 @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
+@@ -84,7 +84,7 @@
+ 
+ 
+ hevea.byte: ${OBJS}
+-	${OCAMLC}  ${OCAMLFLAGS} -o $@ ${OBJS}
++	${OCAMLC}  ${OCAMLFLAGS} unix.cma -o $@ ${OBJS}
+ 
+ hacha.byte: ${OBJSCUT}
+ 	${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJSCUT}
+@@ -96,7 +96,7 @@
+ 	${OCAMLC} ${OCAMLFLAGS} -o $@ ${OBJSBIBHVA}
+ 
+ hevea.opt: ${OPTS}
+-	${OCAMLOPT} -o $@ ${OPTS}
++	${OCAMLOPT} unix.cmxa -o $@ ${OPTS}
+ 
+ hacha.opt: ${OPTSCUT}
+ 	${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 @@
+ \newsavebox{\@bibbox}
+ \newcommand{\@biblabel}[1]{\@locname{\bibtag at hook{#1}}{\purple[\@bibread{\bibtag at hook{#1}}]}}
+ %%% Environment document.
+-\newcommand{\@charset}{US-ASCII}
+ \newcommand{\@def at charset}[1]
+ {\renewcommand{\@charset}{#1}\@set at out@translator{mappings/#1.map}}
+ \newcommand{\@bodyargs}{}
+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
+@@ -219,6 +219,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 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
++++ trunk/parse_opts.ml	2006-10-17 12:08:43.000000000 +0200
+@@ -46,6 +46,19 @@
  and optimize = ref false
-+and charset_option = ref ""
  ;;
  
++let defaultcharset = "US-ASCII";;
++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 *)
-@@ -108,6 +109,8 @@
+ let bib = ref false
+ and gloss = ref false
+@@ -108,6 +121,8 @@
  
    ("-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),
++  ("-charset",Arg.String (fun s -> charset := 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 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
++++ trunk/parse_opts.mli	2006-10-17 12:08:43.000000000 +0200
 @@ -17,6 +17,7 @@
  type destination = Html | Text | Info
  val destination : destination ref
  
-+val charset_option : string ref
++val charset : string ref
  val moreentities : bool ref
  val mathml : bool ref
  val pedantic : bool ref

Modified: trunk/packages/hevea/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/watch?rev=3251&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/watch (original)
+++ trunk/packages/hevea/trunk/debian/watch Tue Oct 17 15:45:31 2006
@@ -1,2 +1,2 @@
 version=2
-http://pauillac.inria.fr/hevea/distri/hevea-([0-9\.]*)\.tar\.gz
+http://hevea.inria.fr/distri/hevea-([0-9\.]*)\.tar\.gz

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