[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9-2-8-gcdd5af2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit c1ce8c992a76319ab92d7857c74f7af7044b1ac2
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Mar 23 22:17:01 2010 +0100

    try to remove some old patches

diff --git a/debian/changelog b/debian/changelog
index b2ad032..65c4712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ advi (1.9.0~rc1-1) UNRELEASED; urgency=low
     disappeared from he package.
   * Removed zadvi from the package since advi now can directly read
     gzipped dvi files. Add an entry about this is debian/NEWS.
+  * Removed patch use-data-dir as upstream has fixed his build system
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 23 Mar 2010 21:51:31 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 23 Mar 2010 22:15:02 +0100
 
 advi (1.9-2) unstable; urgency=low
 
diff --git a/debian/patches/japanese-fonts b/debian/patches/japanese-fonts
index 945d67b..fc86edb 100644
--- a/debian/patches/japanese-fonts
+++ b/debian/patches/japanese-fonts
@@ -1,12 +1,11 @@
-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
+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	2010-03-01 10:57:39.000000000 +0100
-+++ advi/src/font.ml	2010-03-01 11:53:39.000000000 +0100
+--- 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 @@
   ;;
  
@@ -18,12 +17,12 @@ Index: advi/src/font.ml
      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 @@
+--- 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 = "@ADVI_LOC@";;
+ let advi_loc = "@dvidir@";;
 +let etc_advi_loc = "/etc/advi/";;
  let splash_screen = Filename.concat advi_loc "splash.dvi";;
  let scratch_draw_splash_screen =
diff --git a/debian/patches/series b/debian/patches/series
index 272134a..7a67439 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 japanese-fonts
 # byte-compilation-no-custom
-manpage
 no-local-advirc
-use-data-dir
-doc-without-htmlc
-examples-phony-targets
+# doc-without-htmlc
+# examples-phony-targets
diff --git a/debian/patches/use-data-dir b/debian/patches/use-data-dir
deleted file mode 100644
index f73c5bb..0000000
--- a/debian/patches/use-data-dir
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: advi/src/config.ml.in
-===================================================================
---- advi.orig/src/config.ml.in	2010-03-10 22:18:22.000000000 +0100
-+++ advi/src/config.ml.in	2010-03-10 22:18:22.000000000 +0100
-@@ -46,7 +46,7 @@
- let database_path = Filename.concat texdir_path "ls-R";;
- 
- (* Location of splash.dvi and test/caml.eps *)
--let advi_loc = "@ADVI_LOC@";;
-+let advi_loc = "/usr/share/advi/";;
- let etc_advi_loc = "/etc/advi/";;
- let splash_screen = Filename.concat advi_loc "splash.dvi";;
- let scratch_draw_splash_screen =
-Index: advi/tex/Makefile.am
-===================================================================
---- advi.orig/tex/Makefile.am	2010-03-10 22:19:30.000000000 +0100
-+++ advi/tex/Makefile.am	2010-03-10 22:20:38.000000000 +0100
-@@ -17,6 +17,7 @@
- 
- # $Id: Makefile.am,v 1.3 2007/09/12 13:55:13 remy Exp $
- 
-+latexdir = /usr/share/texmf/tex/latex
- pkglatexdir = $(latexdir)/advi
- pkglatex_DATA = advi-annot.sty \
- 		advi-slides.sty \

-- 
advi packaging