[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 674a9d9a9e4c70fdbcb824a01b1ca4b8601005fc
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Mon Mar 1 11:51:16 2010 +0100

    adapt old patch on japanese fonts

diff --git a/debian/changelog b/debian/changelog
index 02be295..0b49c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,8 @@ advi (1.8-1) UNRELEASED; urgency=low
     - 0001-Pull-CVS-HEAD-as-of-20060103: now integrated in upstream
     - 0002-Makefile-.depend-workaround-for-buggy-make-behavior: no longer
       relevant
-    
+    - 0004-Japanese-fonts: jpfonts.config is no longer in upstream, put it
+      into debian/. Patch renamed to japanese-fonts
 
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
@@ -33,7 +34,7 @@ advi (1.8-1) UNRELEASED; urgency=low
   * Replace obsolete build-dep on x-dev (Closes: #515364)
   * Switch packaging to git
 
- -- Ralf Treinen <treinen at debian.org>  Sat, 27 Feb 2010 18:28:34 +0100
+ -- Ralf Treinen <treinen at debian.org>  Mon, 01 Mar 2010 11:50:40 +0100
 
 advi (1.6.0-13) unstable; urgency=low
 
diff --git a/debian/jpfonts.conf b/debian/jpfonts.conf
new file mode 100644
index 0000000..9d8b829
--- /dev/null
+++ b/debian/jpfonts.conf
@@ -0,0 +1,15 @@
+# Japanese font table configuration
+#   /etc/advi/jpfonts.conf 
+#   ~/.advi/jpfonts.conf 
+#
+# For each line contains following three elements:
+#  [font-type] affects character rendering parameter, which can be
+#  either [Mincho] or [Gothic]. 
+#
+# The default (upstream) setting is as follows:
+#
+# min Mincho msmincho.ttc
+# goth Gothic msgothic.ttc
+
+min Mincho /usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+goth Gothic /usr/share/fonts/truetype/kochi/kochi-gothic.ttf
diff --git a/debian/patches/0004-Japanese-fonts.patch b/debian/patches/0004-Japanese-fonts.patch
deleted file mode 100644
index fb9e14b..0000000
--- a/debian/patches/0004-Japanese-fonts.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 90f989966addd7d833d31bb763e50ca37d741971 Mon Sep 17 00:00:00 2001
-From: Sven Luther <luther at debian.org>
-Date: Fri, 24 Apr 2009 00:09:47 +0200
-Subject: [PATCH] Japanese fonts
-
-Makefiles, configure scripts and other build stuff adapted for
-debian package creation
----
- conf/jpfonts.conf |    9 +++++----
- font.ml           |    2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/conf/jpfonts.conf b/conf/jpfonts.conf
-index df927d3..59df9e8 100644
---- a/conf/jpfonts.conf
-+++ b/conf/jpfonts.conf
-@@ -1,5 +1,5 @@
- # Japanese font table configuration
--#   $(ADVI_LOC)/jpfonts.conf 
-+#   /etc/advi/jpfonts.conf 
- #   ~/.advi/jpfonts.conf 
- #
- # For each line contains following three elements:
-@@ -10,11 +10,12 @@
- # [font-type] affects character rendering parameter, which can be
- # either [Mincho] or [Gothic]. 
- #
--# The default setting is as follows:
-+# The default (upstream) setting is as follows:
- #
- # min Mincho msmincho.ttc
- # goth Gothic msgothic.ttc
- #
- 
--min Mincho msmincho.ttc
--goth Gothic msgothic.ttc
-+min Mincho /usr/share/fonts/truetype/kochi/kochi-mincho.ttf
-+goth Gothic /usr/share/fonts/truetype/kochi/kochi-gothic.ttf
-+
-diff --git a/font.ml b/font.ml
-index 1c5a1a5..833cf83 100644
---- a/font.ml
-+++ b/font.ml
-@@ -91,7 +91,7 @@ module Japanese = struct
-  ;;
- 
-   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
--- 
-1.6.2.1
-
diff --git a/debian/patches/japanese-fonts b/debian/patches/japanese-fonts
new file mode 100644
index 0000000..46c32a1
--- /dev/null
+++ b/debian/patches/japanese-fonts
@@ -0,0 +1,18 @@
+From 90f989966addd7d833d31bb763e50ca37d741971 Mon Sep 17 00:00:00 2001
+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
+  ;;
+ 
+   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
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..e6a7f94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+japanese-fonts

-- 
advi packaging