[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-4-5-gf53e212

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6ca3e8d611c10fef6f5e50a6cd96b96049abaa78
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 2 18:15:15 2011 +0200

    Adapt to camlimages 4.0.1

diff --git a/debian/control b/debian/control
index 0d2c9fa..d9e9d5f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Uploaders: Ralf Treinen <treinen 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,
+ libcamlimages-ocaml-dev (>= 4.0.1),
+ 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/camlimages-4.0.1 b/debian/patches/camlimages-4.0.1
new file mode 100644
index 0000000..d0f18fd
--- /dev/null
+++ b/debian/patches/camlimages-4.0.1
@@ -0,0 +1,31 @@
+Description: Adapt to camlimages 4.0.1
+ In camlimages 4.0.1, the library has been splitted in several
+ sub-libraries used by advi. Adapt it in consequence.
+Author: Stéphane Glondu <glondu at debian.org>
+
+--- advi-1.9.0.orig/configure.ac
++++ advi-1.9.0/configure.ac
+@@ -33,8 +33,8 @@ else
+   AC_MSG_RESULT([yes])
+   HAVE_CAMLIMAGES="true"
+   CAMLIMAGES_INCLUDES=`$OCAMLFIND query -i-format -separator ' ' -recursive camlimages`
+-  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages`
+-  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages`
++  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages.ps camlimages.graphics camlimages.freetype`
++  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages.ps camlimages.graphics camlimages.freetype`
+   AC_SUBST(CAMLIMAGES_INCLUDES)
+   AC_SUBST(CAMLIMAGES_LIBS_NATIVE)
+   AC_SUBST(CAMLIMAGES_LIBS_BYTE)
+--- advi-1.9.0.orig/configure
++++ advi-1.9.0/configure
+@@ -3988,8 +3988,8 @@ else
+ echo "${ECHO_T}yes" >&6; }
+   HAVE_CAMLIMAGES="true"
+   CAMLIMAGES_INCLUDES=`$OCAMLFIND query -i-format -separator ' ' -recursive camlimages`
+-  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages`
+-  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages`
++  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages.ps camlimages.graphics camlimages.freetype`
++  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages.ps camlimages.graphics camlimages.freetype`
+ 
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3203a3f..466fcee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ examples-distclean
 linker_as_needed
 examples-makefiles
 examples-scripts
+camlimages-4.0.1

-- 
advi packaging