[Pkg-ocaml-maint-commits] r5185 - in /trunk/packages/galax/trunk/debian: control patches/00list patches/build-wo-ocamlopt.dpatch patches/latex-inputenc.dpatch patches/no-clean-doc.dpatch rules

Sun Feb 17 21:57:18 UTC 2008

Author: zack
Date: Sun Feb 17 21:57:17 2008
New Revision: 5185

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5185
Log:
several fixes:
- fix generation of ocaml interpreted dep on non native archs
- add a patch which enables building on non native archs
- generate galax documentation from sources instead of relying on what already
  shipped by upstream
- fix LaTeX sources of the doc to use latin1 encoding

Added:
    trunk/packages/galax/trunk/debian/patches/build-wo-ocamlopt.dpatch   (with props)
    trunk/packages/galax/trunk/debian/patches/latex-inputenc.dpatch   (with props)
Removed:
    trunk/packages/galax/trunk/debian/patches/no-clean-doc.dpatch
Modified:
    trunk/packages/galax/trunk/debian/control
    trunk/packages/galax/trunk/debian/patches/00list
    trunk/packages/galax/trunk/debian/rules

Modified: trunk/packages/galax/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/control?rev=5185&op=diff
==============================================================================

--- trunk/packages/galax/trunk/debian/control (original)
+++ trunk/packages/galax/trunk/debian/control Sun Feb 17 21:57:17 2008
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), dpatch, ocaml-nox (>= 3.10.1), libpcre-ocaml-dev, libocamlnet-ocaml-dev, libpxp-ocaml-dev, libcamomile-ocaml-dev
+Build-Depends: cdbs, debhelper (>= 6), dpatch, ocaml-nox (>= 3.10.1), libpcre-ocaml-dev, libocamlnet-ocaml-dev, libpxp-ocaml-dev, libcamomile-ocaml-dev, hevea, texlive-latex-base
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/galax/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/
@@ -10,7 +10,7 @@
 
 Package: galax
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml-interp:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlInterp}
 Description: XQuery implementation with static typing - command line front-ends
  Galax is an implementation of XQuery, the W3C XML Query Language.
  .
@@ -30,7 +30,7 @@
 
 Package: galax-extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml-interp:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlInterp}
 Recommends: galax
 Description: XQuery implementation with static typing - utilities
  Galax is an implementation of XQuery, the W3C XML Query Language.
@@ -53,7 +53,7 @@
 
 Package: galaxd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml-interp:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlInterp}
 Suggests: galax
 Description: XQuery implementation with static typing - network servers
  Galax is an implementation of XQuery, the W3C XML Query Language.

Modified: trunk/packages/galax/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/patches/00list?rev=5185&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/patches/00list (original)
+++ trunk/packages/galax/trunk/debian/patches/00list Sun Feb 17 21:57:17 2008
@@ -1,3 +1,4 @@
+build-wo-ocamlopt.dpatch
 configure_typo.dpatch
 meta.dpatch
-no-clean-doc.dpatch
+latex-inputenc.dpatch

Added: trunk/packages/galax/trunk/debian/patches/build-wo-ocamlopt.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/patches/build-wo-ocamlopt.dpatch?rev=5185&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/patches/build-wo-ocamlopt.dpatch (added)
+++ trunk/packages/galax/trunk/debian/patches/build-wo-ocamlopt.dpatch Sun Feb 17 21:57:17 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## build-wo-ocamlopt.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid configure failures when ocamlopt is not available
+
+ at DPATCH@
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure	2007-10-25 02:08:41.000000000 +0200
++++ trunk/configure	2008-02-17 21:54:49.000000000 +0100
+@@ -578,7 +578,7 @@
+ 		echo "Found!"
+ 	else
+ 		echo "ERROR: Unable to find OCaml tool $i"
+-		if [ "$i" != "ocamlfind" ]
++		if [ "$i" != "ocamlfind" -a "$i" != "ocamlopt" ]
+ 		then
+ 			exit 1
+ 		fi

Propchange: trunk/packages/galax/trunk/debian/patches/build-wo-ocamlopt.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/packages/galax/trunk/debian/patches/latex-inputenc.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/patches/latex-inputenc.dpatch?rev=5185&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/patches/latex-inputenc.dpatch (added)
+++ trunk/packages/galax/trunk/debian/patches/latex-inputenc.dpatch Sun Feb 17 21:57:17 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## latex-inputenc.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/doc/manual.tex trunk/doc/manual.tex
+--- trunk~/doc/manual.tex	2007-10-25 02:08:41.000000000 +0200
++++ trunk/doc/manual.tex	2008-02-17 22:41:41.000000000 +0100
+@@ -2,6 +2,7 @@
+ 
+ \usepackage{hevea}
+ \usepackage{alltt}
++\usepackage[latin1]{inputenc}
+ \newcommand{\eat}[1]{}
+ \newcommand{\term}[1]{\textbf{#1}}
+ \newcommand{\func}[1]{\texttt{#1}}

Propchange: trunk/packages/galax/trunk/debian/patches/latex-inputenc.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/galax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/rules?rev=5185&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/rules (original)
+++ trunk/packages/galax/trunk/debian/rules Sun Feb 17 21:57:17 2008
@@ -9,9 +9,9 @@
  # $(LN) override so that we only install the best binary, instead of both .opt
  # and .byte together with the best symlink
 DEB_MAKE_INSTALL_TARGET = install LN=cp DESTDIR=$(CURDIR)/debian/tmp
-ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
 DEB_STRIP_EXCLUDE += usr/bin
-DEB_DH_GENCONTROL_ARGS += -Vocaml-interp:Depends=ocaml-base-nox-$(OCAMLABI)
+DEB_DH_GENCONTROL_ARGS += -VF:OCamlInterp="ocaml-base-nox-$(OCAML_ABI)"
 endif
 
 DEB_DH_INSTALL_ARGS += -XCVS -Xlicense.tex
@@ -65,7 +65,11 @@
 		-I debian/libgalax-ocaml-dev$(OCAML_STDLIB_DIR)/galax/ \
 		-html -d debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) \
 		|| true
-build/galax-doc::
+build/galax-doc:: debian/galax-doc-stamp
 	tmp=`$(_cdbs_class_path)/ocamldoc-api-ref-config --doc-base-generate libgalax-ocaml-dev` \
 	&& mv $$tmp `echo $$tmp | sed s/libgalax-ocaml-dev/galax-doc/`
+debian/galax-doc-stamp:
+	$(MAKE) -C doc/ manual.pdf manual.html
+clean::
+	rm -f debian/galax-doc-stamp
 


