[Pkg-ocaml-maint-commits] r4389 - in /trunk/packages/camlimages/trunk/debian: changelog control control.in libcamlimages-ocaml.dirs.in rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed Sep  5 21:17:06 2007
New Revision: 4389

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4389
Log:
* Rebuild for ocaml 3.10.0
* Generate standard API documentation
* Use OCamlDllDir

Modified:
    trunk/packages/camlimages/trunk/debian/changelog
    trunk/packages/camlimages/trunk/debian/control
    trunk/packages/camlimages/trunk/debian/control.in
    trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in
    trunk/packages/camlimages/trunk/debian/rules

Modified: trunk/packages/camlimages/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/changelog?rev=4389&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/changelog (original)
+++ trunk/packages/camlimages/trunk/debian/changelog Wed Sep  5 21:17:06 2007
@@ -1,3 +1,11 @@
+camlimages (1:2.2.0-2) unstable; urgency=low
+
+  * Build for ocaml 3.10.0
+  * Generate ocamldoc API documentation
+  * Use OCAML_DLL_DIR/OCamlDllDir
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 04 Sep 2007 00:26:44 +0200
+
 camlimages (1:2.2.0-1) experimental; urgency=low
 
   * Change email address to gildor at debian.org everywhere

Modified: trunk/packages/camlimages/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/control?rev=4389&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/control (original)
+++ trunk/packages/camlimages/trunk/debian/control Wed Sep  5 21:17:06 2007
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:  Julien Cristau <julien.cristau at ens-lyon.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml, ocaml-findlib, libpng12-dev, 
- libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), 
- libungif4-dev, liblablgtk2-ocaml-dev, gs, chrpath, dpkg-dev (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml, ocaml-findlib (>= 1.1.2pl1-4), libpng12-dev, 
+ libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev (>= 2.1.7), 
+ libungif4-dev, liblablgtk2-ocaml-devi (>= 2.6.0-11), gs, chrpath, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlimages
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/

Modified: trunk/packages/camlimages/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/control.in?rev=4389&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/control.in (original)
+++ trunk/packages/camlimages/trunk/debian/control.in Wed Sep  5 21:17:06 2007
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: @OCamlTeam@
-Build-Depends: @cdbs@, ocaml, ocaml-findlib, libpng12-dev, 
- libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), 
- libungif4-dev, liblablgtk2-ocaml-dev, gs, chrpath, dpkg-dev (>= 1.13.19)
+Build-Depends: @cdbs@, ocaml, ocaml-findlib (>= 1.1.2pl1-4), libpng12-dev, 
+ libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev (>= 2.1.7), 
+ libungif4-dev, liblablgtk2-ocaml-devi (>= 2.6.0-11), gs, chrpath, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlimages
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/

Modified: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in?rev=4389&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in (original)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in Wed Sep  5 21:17:06 2007
@@ -1,1 +1,1 @@
- at OCamlStdlibDir@/stublibs
+ at OCamlDllDir@

Modified: trunk/packages/camlimages/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/rules?rev=4389&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/rules (original)
+++ trunk/packages/camlimages/trunk/debian/rules Wed Sep  5 21:17:06 2007
@@ -55,7 +55,11 @@
 DEB_INSTALL_EXAMPLES_libcamlimages-ocaml-doc := -X Makefile -X .depend
 DEB_DH_INSTALL_ARGS                          := -X LICENSE -X README -X INSTALL -X Makefile
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+
+OCAML_OCAMLDOC_PACKAGES := $(PACKAGE_DEV)
+OCAML_OCAMLDOC_FLAGS := -I $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/camlimages/ \
+  			$(shell ocamlfind query -i-format lablgtk2)
 
 clean::
 	-test -L html && $(RM) html
@@ -72,7 +76,7 @@
 	VERSION=$${VERSION%%-*}; \
 	sed -i "s/@VERSION@/$$VERSION/g" debian/META.camlimages
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/camlimages/*.so \
-	 $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/
-	chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so
+	 $(DESTDIR)/$(OCAML_DLL_DIR)/
+	chrpath -d $(DESTDIR)/$(OCAML_DLL_DIR)/*.so