[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 80f6307bc6113ffe19de4a67b33cd9fd0fa4b12c
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Mar 10 22:22:13 2010 +0100

    fix latexdir

diff --git a/debian/changelog b/debian/changelog
index a807d0e..1f65000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,14 +5,10 @@ advi (1.8-3) experimental; urgency=low
     at compilation time.
   * debian/control: Updated location of upstream homepage
   * debian/watch: put new domain (advi.inria.fr)
-  * additional dvis referenced from advi:
-    - debian/rules: create them in the build target. This entails overriding
-      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
+  * Set --latexdir in the configure target of debian/rules (thanks to Meik
+    Hellmund for having indiated the wrong installation of latex files!)
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 10 Mar 2010 22:05:27 +0100
 
 advi (1.8-2) experimental; urgency=low
 
diff --git a/debian/patches/use-data-dir b/debian/patches/use-data-dir
index ea44b19..f73c5bb 100644
--- a/debian/patches/use-data-dir
+++ b/debian/patches/use-data-dir
@@ -1,7 +1,7 @@
 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
+--- 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";;
  
@@ -11,3 +11,15 @@ Index: advi/src/config.ml.in
  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 \
diff --git a/debian/rules b/debian/rules
index cfb8aab..14c9df1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,8 @@ override_dh_auto_configure:
 			--build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr \
 			--mandir=\$${prefix}/share/man \
-			--infodir=\$${prefix}/share/info
+			--infodir=\$${prefix}/share/info \
+			--latexdir=\$${prefix}/usr/share/texmf/tex/latex
 
 override_dh_auto_build:
 	$(MAKE)

-- 
advi packaging