[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-3-2-gb6f63c6

[Ralf Treinen]

The following commit has been merged in the master branch:
commit b6f63c6ffe2ddcc182103ee4bc0bf32186978c3b
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Feb 9 22:20:56 2011 +0100

    fix Makefile of examples/basic

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
new file mode 100644
index 0000000..2c0fdbd
--- /dev/null
+++ b/debian/TODO.Debian
@@ -0,0 +1,4 @@
+remove useless files from example directory:
+
+examples/basic/alltt.sty
+examples/basic/bar.eps
diff --git a/debian/changelog b/debian/changelog
index ab49b26..3703582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 advi (1.9.0-3) unstable; urgency=low
 
-  * Add lintian-override to bypass lintian bug #612568 (wronly complaining
-    about a missing build-dependency).
+  * Add build-dependency on ocaml-nox to bypass lintian bug #612568
+    (wrongly complaining about a missing build-dependency).
+  * Patch examples-makefiles: fix pathnames in examples/basic/Makefile
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 09 Feb 2011 19:31:18 +0100
+ -- Ralf Treinen <treinen at debian.org>  Wed, 09 Feb 2011 22:13:33 +0100
 
 advi (1.9.0-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index a386e97..f8b0914 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
- ocaml (>=3.11.1-3~), libcamlimages-ocaml-dev, ocaml-findlib,
+ ocaml (>=3.11.1-3~), ocaml-nox (>=3.11.1-3~),
+ libcamlimages-ocaml-dev, ocaml-findlib,
  tex-common, texlive-binaries, texlive-latex-base, texlive-pstricks,
  texlive-latex-recommended, texlive-pictures, hevea,
  x11proto-core-dev, libx11-dev, libxinerama-dev, zlib1g-dev
diff --git a/debian/patches/examples-makefiles b/debian/patches/examples-makefiles
new file mode 100644
index 0000000..c7b699f
--- /dev/null
+++ b/debian/patches/examples-makefiles
@@ -0,0 +1,34 @@
+Description: fix pathnames in examples makefiles
+Author: Ralf Treinen <treinen at debian.org>
+
+Index: advi/examples/basics/Makefile
+===================================================================
+--- advi.orig/examples/basics/Makefile	2011-02-09 22:07:24.000000000 +0100
++++ advi/examples/basics/Makefile	2011-02-09 22:11:05.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ TEXFILES= simple.tex moderate.tex 
+ 
+-ADVIDIR=../..
++ADVIDIR=/usr/share/texmf/tex/latex/advi
+ 
+ RM=/bin/rm -f
+ 
+@@ -32,7 +32,7 @@
+ PLATEX=TEXINPUTS=.:$(ADVIDIR)/tex:$(TEXINPUTS): platex
+ 
+ DVIFILES= $(TEXFILES:.tex=.dvi)
+-ADVI=TEXPSHEADERS=$(ADVIDIR)/tex: $(ADVIDIR)/advi
++ADVI=TEXPSHEADERS=$(ADVIDIR)/tex: advi
+ 
+ MLPROG=
+ 
+@@ -44,7 +44,7 @@
+ 
+ dvi : $(DVIFILES) $(MLPROG)
+ 
+-$(DVIFILES): $(ADVIDIR)/tex/bar.eps $(ADVIDIR)/tex/advi.sty $(ADVIDIR)/tex/advi-annot.sty 
++$(DVIFILES): $(ADVIDIR)/bar.eps $(ADVIDIR)/advi.sty $(ADVIDIR)/advi-annot.sty 
+ 
+ .dvi.advi:
+ 	$(ADVI) $<
diff --git a/debian/patches/linker_as_needed b/debian/patches/linker_as_needed
index 828e90b..33f01bb 100644
--- a/debian/patches/linker_as_needed
+++ b/debian/patches/linker_as_needed
@@ -3,10 +3,10 @@ Author: Stefan Potyra <sistpoty at ubuntu.com>
 Integrated: Ralf Treinen <treinen at debian.org>
 Debian-bug: 607530:
 
-Index: advi-1.9.0/src/Makefile.am
+Index: advi/src/Makefile.am
 ===================================================================
---- advi-1.9.0.orig/src/Makefile.am	2010-03-24 08:52:41.000000000 +0100
-+++ advi-1.9.0/src/Makefile.am	2010-12-19 15:32:36.392866917 +0100
+--- advi.orig/src/Makefile.am	2011-01-04 03:07:45.000000000 +0100
++++ advi/src/Makefile.am	2011-02-09 22:03:54.000000000 +0100
 @@ -75,7 +75,7 @@
  COBJS           = $(CSOURCES:.c=.o)
  
@@ -31,10 +31,10 @@ Index: advi-1.9.0/src/Makefile.am
  
  install_hook: $(INSTALLEXEC) installdata
  	- texhash
-Index: advi-1.9.0/src/Makefile.in
+Index: advi/src/Makefile.in
 ===================================================================
---- advi-1.9.0.orig/src/Makefile.in	2010-12-19 15:33:10.582866917 +0100
-+++ advi-1.9.0/src/Makefile.in	2010-12-19 15:34:47.332866917 +0100
+--- advi.orig/src/Makefile.in	2011-01-04 03:07:45.000000000 +0100
++++ advi/src/Makefile.in	2011-02-09 22:03:54.000000000 +0100
 @@ -253,7 +253,7 @@
  OCAMLOPTOBJS = $(OCAMLBUILTSOURCES:.ml=.cmx) $(OCAMLSOURCES:.ml=.cmx)
  COBJS = $(CSOURCES:.c=.o)
diff --git a/debian/patches/series b/debian/patches/series
index 12a9965..b307c60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ typo-message
 manpage
 examples-distclean
 linker_as_needed
+examples-makefiles
diff --git a/examples/basics/alltt.sty b/examples/basics/alltt.sty
old mode 100755
new mode 100644

-- 
advi packaging