[Pkg-ocaml-maint-commits] r4524 - in /trunk/packages/ocamldap/trunk/debian: changelog control control.in libldap-ocaml-dev.dirs.in libldap-ocaml-dev.doc-base rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Tue Sep 18 09:56:23 UTC 2007 

Author: gildor
Date: Tue Sep 18 09:56:23 2007
New Revision: 4524

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4524
Log:
* Prepare 3.10.0 transition
* Generate ocamldoc documentation in standard place

Removed:
    trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.doc-base
Modified:
    trunk/packages/ocamldap/trunk/debian/changelog
    trunk/packages/ocamldap/trunk/debian/control
    trunk/packages/ocamldap/trunk/debian/control.in
    trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in
    trunk/packages/ocamldap/trunk/debian/rules

Modified: trunk/packages/ocamldap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/changelog?rev=4524&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/changelog (original)
+++ trunk/packages/ocamldap/trunk/debian/changelog Tue Sep 18 09:56:23 2007
@@ -1,3 +1,11 @@
+ocamldap (2.1.8-5) unstable; urgency=low
+
+  * Build for ocaml 3.10.0
+  * Tighten build dependency for ocaml 3.10.0
+  * Move standard documentation to standard OCaml documentation place
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 18 Sep 2007 11:10:01 +0200
+
 ocamldap (2.1.8-4) experimental; urgency=low
 
   * Add missing dependency on ocaml-nox

Modified: trunk/packages/ocamldap/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/control?rev=4524&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/control (original)
+++ trunk/packages/ocamldap/trunk/debian/control Tue Sep 18 09:56:23 2007
@@ -2,14 +2,14 @@
 Section: libdevel
 Priority: optional
 Maintainer: 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-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib (>= 1.1.2pl1-4), libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldap
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/
 
 Package: libldap-ocaml-dev
 Architecture: any
-Depends: ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Depends:  ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
 Description: LDAP bindings for OCaml 
  It supports the core ldap-client functions, including search, add,
  modify, and delete.

Modified: trunk/packages/ocamldap/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/control.in?rev=4524&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/control.in (original)
+++ trunk/packages/ocamldap/trunk/debian/control.in Tue Sep 18 09:56:23 2007
@@ -2,14 +2,14 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org> 
-Build-Depends: @cdbs@, ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Build-Depends: @cdbs@, ocaml-findlib (>= 1.1.2pl1-4), libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldap
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/
 
 Package: libldap-ocaml-dev
 Architecture: any
-Depends:  ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Depends:  ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
 Description: LDAP bindings for OCaml 
  It supports the core ldap-client functions, including search, add,
  modify, and delete.

Modified: trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in?rev=4524&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in (original)
+++ trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in Tue Sep 18 09:56:23 2007
@@ -1,2 +1,2 @@
 @OCamlStdlibDir@
-usr/share/doc/libldap-ocaml-dev/html
+usr/share/doc/libldap-ocaml-dev/html/api/

Modified: trunk/packages/ocamldap/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/rules?rev=4524&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/rules (original)
+++ trunk/packages/ocamldap/trunk/debian/rules Tue Sep 18 09:56:23 2007
@@ -38,113 +38,22 @@
 DEB_MAKE_INSTALL_TARGET  := install \
   OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-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))
 
 clean::
-	-$(RM) $(CURDIR)/varcc.cmo 
-	-$(RM) $(CURDIR)/varcc.cmi 
-	-$(RM) $(CURDIR)/varcc 
-	-$(RM) $(CURDIR)/debian/libldap-ocaml-dev.dirs
+	-$(RM) '$(CURDIR)/varcc.cmo' 
+	-$(RM) '$(CURDIR)/varcc.cmi'
+	-$(RM) '$(CURDIR)/varcc'
+	-$(RM) '$(CURDIR)/debian/libldap-ocaml-dev.dirs'
+	-$(RM) '$(CURDIR)/debian/libldap-ocaml-dev.doc-base.ocamldoc-apiref'
+
+build/libldap-ocaml-dev::
+	i=libmlpcap-ocaml-dev; \
+	sed -e "s/@PACKAGE@/$$i/g" \
+	  /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+	  > debian/$$i.doc-base.ocamldoc-apiref
 
 install/libldap-ocaml-dev::
 	ocamlfind ocamldoc -package ssl -html -d \
-	  $(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/ *.mli
+	  $(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/api/ *.mli
 
-##!/usr/bin/make -f
-#
-#include /usr/share/dpatch/dpatch.make 
-#
-#OCAMLIBDIR=$(shell ocamlc -where)
-#PACKAGE=ocamldap
-#DESTDIR_DEV=$(CURDIR)/debian/libldap-ocaml-dev/
-#OCAMLABI=$(shell ocamlc -version)
-#OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-#
-#ocamlinit:
-#	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-#
-#configure: ocamlinit configure-stamp
-#configure-stamp:
-#	dh_testdir
-#	touch configure-stamp
-#
-#build-arch: build-arch-stamp
-#build-arch-stamp: configure
-#	dh_testdir
-#	$(MAKE) 
-#	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-#		$(MAKE) opt;\
-#	fi
-#	touch build-arch-stamp
-#
-#build-indep: build-indep-stamp
-#build-indep-stamp: configure
-#	dh_testdir
-#	touch build-indep-stamp
-#
-#build: build-stamp
-#build-stamp: patch-stamp build-arch build-indep
-#	touch build-stamp
-#
-#clean: unpatch
-#	dh_testdir
-#	dh_testroot
-#	rm -f build-arch-stamp build-indep-stamp build-stamp
-#	-$(MAKE) clean
-#	-$(RM) varcc.cmo varcc.cmi varcc
-#	dh_clean
-#
-#install: DH_OPTIONS=
-#install: build
-#	dh_testdir
-#	dh_testroot
-#	dh_clean -k
-#	dh_installdirs
-#		
-#	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
-#
-#	$(MAKE) install \
-#	  OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir \
-#	  $(DESTDIR_DEV)/$(OCAMLIBDIR)"
-#			   
-#	ocamlfind ocamldoc -package ssl -html -d \
-#	$(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/ *.mli
-#	  
-#install-indep: DH_OPTIONS=
-#install-indep: build
-#	dh_testdir
-#	dh_testroot
-#	dh_clean -k
-#	dh_installdirs
-#
-#binary-indep: build install-indep
-#	dh_testdir -i
-#	dh_testroot -i
-#	dh_installdocs -i
-#	dh_installexamples -i
-#	dh_installchangelogs Changelog -i
-#	dh_compress -i
-#	dh_fixperms -i
-#	dh_installdeb -i
-#	dh_gencontrol -i
-#	dh_md5sums -i
-#	dh_builddeb -i
-#
-#binary-arch: build install
-#	dh_testdir -a
-#	dh_testroot -a
-#	dh_installdocs -a
-#	dh_installexamples -a
-#	dh_installchangelogs Changelog -a
-#	dh_strip -a
-#	dh_link -a
-#	dh_compress -a
-#	dh_fixperms -a
-#	dh_installdeb -a
-#	dh_shlibdeps -a
-#	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
-#	dh_md5sums -a
-#	dh_builddeb -a
-#
-#binary: binary-arch
-#.PHONY: build clean binary-indep binary-arch binary install ocamlinit

More information about the Pkg-ocaml-maint-commits mailing list