[Pkg-ocaml-maint-commits] r1474 - in trunk/packages/ocamldap: . debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-07-21 22:42:09 +0000 (Thu, 21 Jul 2005)
New Revision: 1474

Added:
   trunk/packages/ocamldap/ocamldap_2.1.3.orig.tar.gz
Removed:
   trunk/packages/ocamldap/ocamldap_1.6.5.orig.tar.gz
Modified:
   trunk/packages/ocamldap/debian/changelog
   trunk/packages/ocamldap/debian/control
   trunk/packages/ocamldap/debian/rules
   trunk/packages/ocamldap/debian/watch
Log:
New upstream release of ocamldap -- SLG


Modified: trunk/packages/ocamldap/debian/changelog
===================================================================
--- trunk/packages/ocamldap/debian/changelog	2005-07-21 22:40:37 UTC (rev 1473)
+++ trunk/packages/ocamldap/debian/changelog	2005-07-21 22:42:09 UTC (rev 1474)
@@ -1,3 +1,16 @@
+ocamldap (2.1.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Migration to Standards-Version 3.6.2.0 (no change)
+  * Adapt the watch file so that it can be used by Debian QA
+  * Add dependency on libocaml-ssl-dev
+  * Remove the package libldap-ocaml: the library is now 100% pure OCaml
+  * Use "ocamlfind ocamldoc -package ssl" to generate the documentation
+  * Adpat debian/rules: removes the "mv" of the shared library (no more shared
+    library)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Fri, 22 Jul 2005 00:13:39 +0200
+
 ocamldap (1.6.5-3) unstable; urgency=medium
 
   * Rebuild against ocamlnet 1.0

Modified: trunk/packages/ocamldap/debian/control
===================================================================
--- trunk/packages/ocamldap/debian/control	2005-07-21 22:40:37 UTC (rev 1473)
+++ trunk/packages/ocamldap/debian/control	2005-07-21 22:42:09 UTC (rev 1474)
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
-Build-Depends: ocaml-nox-3.08.3, debhelper (>= 4), libldap2-dev, chrpath, dpatch (>=1.11), ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98)
-Standards-Version: 3.6.1
+Build-Depends: ocaml-nox-3.08.3, debhelper (>= 4), libldap2-dev, chrpath, dpatch (>=1.11), ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Standards-Version: 3.6.2.0
 
 Package: libldap-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-nox-3.08.3, libldap-ocaml (=${Source-Version}), libocamlnet-ocaml-dev (>= 0.98)
+Depends: ${shlibs:Depends}, ocaml-nox-3.08.3, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
 Description: LDAP bindings for OCaml ( Devel ) 
  It supports the core ldap-client functions, including search, add,
  modify, and delete.
@@ -19,17 +19,3 @@
  them with the server, fewer arguments needed to perform simple 
  tasks, and an API modeled after Perl's Net::LDAP.
 
-Package: libldap-ocaml
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.08.3
-Description: LDAP bindings for OCaml
- It supports the core ldap-client functions, including search, add,
- modify, and delete.
- .
- It has now an object oriented interface which supports the above 
- features, and some additional ones. Such as, nice data structures 
- for local ldap entries which record local modifications and can sync
- them with the server, fewer arguments needed to perform simple 
- tasks, and an API modeled after Perl's Net::LDAP.
-

Modified: trunk/packages/ocamldap/debian/rules
===================================================================
--- trunk/packages/ocamldap/debian/rules	2005-07-21 22:40:37 UTC (rev 1473)
+++ trunk/packages/ocamldap/debian/rules	2005-07-21 22:42:09 UTC (rev 1474)
@@ -2,23 +2,20 @@
 
 include /usr/share/dpatch/dpatch.make 
 
-OCAML_VERSION=3.08.3
+OCAML_LIBDIR=$(shell ocamlc -where)
 PACKAGE=ocamldap
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure 
 	touch configure-stamp
 
 build-arch: build-arch-stamp
 build-arch-stamp: configure
 	dh_testdir
-	$(MAKE) dep
+	$(MAKE) 
 	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-		$(MAKE) reallyall;\
-	else\
-		$(MAKE) all;\
+		$(MAKE) opt;\
 	fi
 	touch build-arch-stamp
 
@@ -46,10 +43,9 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install \
-	  OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(CURDIR)/debian/libldap-ocaml-dev/usr/lib/ocaml/$(OCAML_VERSION)"
-	mv $(CURDIR)/debian/libldap-ocaml-dev/usr/lib/ocaml/$(OCAML_VERSION)/ocamldap/*.so \
-	  $(CURDIR)/debian/libldap-ocaml/usr/lib/ocaml/$(OCAML_VERSION)/stublibs/
-	ocamldoc -html -d $(CURDIR)/debian/libldap-ocaml-dev/usr/share/doc/libldap-ocaml-dev/html/ *.mli
+	  OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(CURDIR)/debian/libldap-ocaml-dev/$(OCAML_LIBDIR)"
+	ocamlfind ocamldoc -package ssl -html -d \
+	$(CURDIR)/debian/libldap-ocaml-dev/usr/share/doc/libldap-ocaml-dev/html/ *.mli
 	  
 install-indep: DH_OPTIONS=
 install-indep: build

Modified: trunk/packages/ocamldap/debian/watch
===================================================================
--- trunk/packages/ocamldap/debian/watch	2005-07-21 22:40:37 UTC (rev 1473)
+++ trunk/packages/ocamldap/debian/watch	2005-07-21 22:42:09 UTC (rev 1474)
@@ -1,2 +1,2 @@
-version=3
+version=2
 http://prdownloads.sourceforge.net/ocamldap/ocamldap-([0-9\.]*).tar.bz2

Deleted: trunk/packages/ocamldap/ocamldap_1.6.5.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/ocamldap/ocamldap_2.1.3.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/ocamldap/ocamldap_2.1.3.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream