[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-1-1-gf6ecf83

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 2969d4aba810bd5a9fb9fe6e684190a5cc1e1e83
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Apr 4 19:41:48 2010 +0200

    patch japanese-fonts no longer needed

diff --git a/debian/changelog b/debian/changelog
index 65eaf79..980eea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ advi (1.9.0~rc2-1) UNRELEASED; urgency=low
     an entry about this in debian/NEWS.
   * Removed patches use-data-dir, examples-phony-targets, and
     doc-without-htmlc as upstream has fixed his build system.
+  * Removed patch japanes-fonts as upstream has fixed this.y
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 23 Mar 2010 22:15:02 +0100
+ -- Ralf Treinen <treinen at debian.org>  Sun, 04 Apr 2010 19:41:22 +0200
 
 advi (1.9-2) unstable; urgency=low
 
diff --git a/debian/patches/byte-compilation-no-custom b/debian/patches/byte-compilation-no-custom
deleted file mode 100644
index 168f4ba..0000000
--- a/debian/patches/byte-compilation-no-custom
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: advi/src/Makefile.in
-===================================================================
---- advi.orig/src/Makefile.in	2010-03-02 20:54:53.000000000 +0100
-+++ advi/src/Makefile.in	2010-03-02 20:55:01.000000000 +0100
-@@ -522,7 +522,7 @@
- 
- advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
- 	$(OCAMLC) -o advi.byt$(EXEEXT) \
--		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
-+		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
- 		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
- 
- install_hook: $(INSTALLEXEC) installdata
diff --git a/debian/patches/japanese-fonts b/debian/patches/japanese-fonts
deleted file mode 100644
index fc86edb..0000000
--- a/debian/patches/japanese-fonts
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Sven Luther <luther at debian.org>, Ralf Treinen <treinen at debian.org>
-Date: Tue, 23 Mar 2010
-Subject: Fix location of japanese font confguration file
-
-Index: advi/src/font.ml
-===================================================================
---- advi.orig/src/font.ml	2007-01-18 15:14:36.000000000 +0100
-+++ advi/src/font.ml	2010-03-23 22:08:46.000000000 +0100
-@@ -91,7 +91,7 @@
-  ;;
- 
-   let japanese_fontfiles =
--    let sys_conffile = Filename.concat Config.advi_loc "jpfonts.conf" in
-+    let sys_conffile = Filename.concat Config.etc_advi_loc "jpfonts.conf" in
-     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-23 21:39:31.000000000 +0100
-+++ advi/src/config.ml.in	2010-03-23 22:10:15.000000000 +0100
-@@ -49,6 +49,7 @@
- 
- (* Location of splash.dvi and test/caml.eps *)
- let advi_loc = "@dvidir@";;
-+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";;
diff --git a/debian/patches/series b/debian/patches/series
index 2d9990e..ea0d3ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-japanese-fonts
-# byte-compilation-no-custom
 no-local-advirc

-- 
advi packaging