[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-41-gf4222a2

[Ralf Treinen (none)]

The following commit has been merged in the experimental branch:
commit bccc531681ecdf5dc34df7fe79a490fc77b3b1cf
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Mon Mar 1 11:56:57 2010 +0100

    we have to define etc_advi_loc

diff --git a/debian/patches/japanese-fonts b/debian/patches/japanese-fonts
index 46c32a1..945d67b 100644
--- a/debian/patches/japanese-fonts
+++ b/debian/patches/japanese-fonts
@@ -3,9 +3,11 @@ From: Sven Luther <luther at debian.org>
 Date: Fri, 24 Apr 2009 00:09:47 +0200
 Subject: [PATCH] Japanese fonts
 
---- a/src/font.ml
-+++ b/src/font.ml
-@@ -91,7 +91,7 @@ module Japanese = struct
+Index: advi/src/font.ml
+===================================================================
+--- advi.orig/src/font.ml	2010-03-01 10:57:39.000000000 +0100
++++ advi/src/font.ml	2010-03-01 11:53:39.000000000 +0100
+@@ -91,7 +91,7 @@
   ;;
  
    let japanese_fontfiles =
@@ -14,5 +16,15 @@ Subject: [PATCH] Japanese fonts
      let user_conffile =
        Filename.concat Userfile.user_advi_dir "jpfonts.conf" in
      try
-
-
+Index: advi/src/config.ml.in
+===================================================================
+--- advi.orig/src/config.ml.in	2010-03-01 11:54:56.000000000 +0100
++++ advi/src/config.ml.in	2010-03-01 11:56:09.000000000 +0100
+@@ -47,6 +47,7 @@
+ 
+ (* Location of splash.dvi and test/caml.eps *)
+ let advi_loc = "@ADVI_LOC@";;
++let etc_advi_loc = "/etc/advi/";;
+ let splash_screen = Filename.concat advi_loc "splash.dvi";;
+ let scratch_draw_splash_screen =
+   Filename.concat advi_loc "scratch_draw_splash.dvi";;

-- 
advi packaging