[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.8-1-37-gb52324d

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit 470dbaf901645837ddcd4eecebdd27de7af1302d
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Mar 10 21:17:07 2010 +0100

    patch to use the right data dir

diff --git a/debian/advi.dirs b/debian/advi.dirs
index 355a824..c7b2f15 100644
--- a/debian/advi.dirs
+++ b/debian/advi.dirs
@@ -1 +1 @@
-/usr/share/advi/screens
+/usr/share/advi
diff --git a/debian/advi.install b/debian/advi.install
index 24f78fe..a316ff5 100644
--- a/debian/advi.install
+++ b/debian/advi.install
@@ -1,5 +1,5 @@
 debian/jpfonts.conf		/etc/advi
 debian/utils/zadvi		/usr/bin
-doc/splash.dvi			/usr/share/advi/screens
-doc/scratch_draw_splash.dvi	/usr/share/advi/screens
-doc/scratch_write_splash.dvi	/usr/share/advi/screens
+doc/splash.dvi			/usr/share/advi
+doc/scratch_draw_splash.dvi	/usr/share/advi
+doc/scratch_write_splash.dvi	/usr/share/advi
diff --git a/debian/changelog b/debian/changelog
index da1ad6d..a807d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ advi (1.8-3) experimental; urgency=low
       the clean target to remove all generated stuff from doc/.
     - debian/advi.dirs: create directory /usr/share/advi/screens for them
     - debian/advi.install: install them there
+    - patch use-data-dir: search dvi screens at data dir location
   
  -- Ralf Treinen <treinen at debian.org>  Wed, 10 Mar 2010 19:34:35 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index cb9ddbf..4253ce6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ cache-dir-tilde-expansion
 manpage
 no-local-advirc
 use-ghostscript
+use-data-dir
diff --git a/debian/patches/use-data-dir b/debian/patches/use-data-dir
new file mode 100644
index 0000000..50680e8
--- /dev/null
+++ b/debian/patches/use-data-dir
@@ -0,0 +1,13 @@
+Index: advi/src/config.ml.in
+===================================================================
+--- advi.orig/src/config.ml.in	2010-03-10 21:16:19.000000000 +0100
++++ advi/src/config.ml.in	2010-03-10 21:16:36.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 =
diff --git a/debian/patches/use-ghostscript b/debian/patches/use-ghostscript
index 18edfc5..464870c 100644
--- a/debian/patches/use-ghostscript
+++ b/debian/patches/use-ghostscript
@@ -4,8 +4,8 @@ Description: Let configure behave as if ghostscript where installed at
 
 Index: advi/configure
 ===================================================================
---- advi.orig/configure	2010-03-09 23:04:50.000000000 +0100
-+++ advi/configure	2010-03-09 23:07:21.000000000 +0100
+--- advi.orig/configure	2010-03-10 21:09:15.000000000 +0100
++++ advi/configure	2010-03-10 21:09:19.000000000 +0100
 @@ -6698,30 +6698,7 @@
  
  
diff --git a/debian/rules b/debian/rules
index 243a25a..cc151a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_auto_configure:
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info
 
-override_dh_auto-build:
+override_dh_auto_build:
 	$(MAKE)
 	cd doc && $(MAKE) $(DVIS)
 

-- 
advi packaging