[Pkg-ocaml-maint-commits] r2278 - trunk/packages/ocaml-ssl/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2005-12-09 20:21:38 +0000 (Fri, 09 Dec 2005)
New Revision: 2278

Removed:
   trunk/packages/ocaml-ssl/trunk/debian/control.in
   trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install
   trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install
Modified:
   trunk/packages/ocaml-ssl/trunk/debian/changelog
   trunk/packages/ocaml-ssl/trunk/debian/control
   trunk/packages/ocaml-ssl/trunk/debian/rules
   trunk/packages/ocaml-ssl/trunk/debian/watch
Log:
Rebuild with newer findlib + misc improvements.

Modified: trunk/packages/ocaml-ssl/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/changelog	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/changelog	2005-12-09 20:21:38 UTC (rev 2278)
@@ -1,3 +1,11 @@
+ocaml-ssl (0.3.1-3) unstable; urgency=low
+
+  * Rebuild with findlib > 1.1-3 (1.1-3 was buggy), closes: #342291.
+  * Properly handling OCamlABI stuff.
+  * Updated watch file.
+
+ -- Samuel Mimram <smimram at debian.org>  Fri,  9 Dec 2005 00:05:30 +0100
+
 ocaml-ssl (0.3.1-2) unstable; urgency=low
 
   * Rebuild with OCaml 3.09.0.

Modified: trunk/packages/ocaml-ssl/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/control	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/control	2005-12-09 20:21:38 UTC (rev 2278)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.6), ocaml-nox (>= 3.09.0), ocaml-findlib
+Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.6), ocaml-nox (>= 3.09.0), ocaml-findlib (> 1.1-3)
 Standards-Version: 3.6.2
 
 Package: libssl-ocaml

Deleted: trunk/packages/ocaml-ssl/trunk/debian/control.in
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/control.in	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/control.in	2005-12-09 20:21:38 UTC (rev 2278)
@@ -1,26 +0,0 @@
-Source: ocaml-ssl
-Section: devel
-Priority: optional
-Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libssl-dev (>= 0.9.6), ocaml-nox (>= @OCamlABI@), ocaml-findlib
-Standards-Version: 3.6.2
-
-Package: libssl-ocaml
-Section: libs
-Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
-Description: OCaml bindings for OpenSSL
- OCaml library for communicating using SSL/TLS encrypted connections.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libssl-ocaml-dev
-Section: libdevel
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libssl-dev (>= 0.9.6), libssl-ocaml (= ${Source-Version})
-Recommends: ocaml-findlib
-Description: OCaml bindings for OpenSSL
- OCaml library for communicating using SSL/TLS encrypted connections.
- .
- This package contains all the development stuff you need to use
- the ssl OCaml library in your programs.

Deleted: trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml-dev.install	2005-12-09 20:21:38 UTC (rev 2278)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.09.0/ssl/META
-usr/lib/ocaml/3.09.0/ssl/*.a
-usr/lib/ocaml/3.09.0/ssl/*.cm*
-usr/lib/ocaml/3.09.0/ssl/*.ml*

Deleted: trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/libssl-ocaml.install	2005-12-09 20:21:38 UTC (rev 2278)
@@ -1,2 +0,0 @@
-usr/lib/ocaml/3.09.0/ssl/dllssl_stubs.so usr/lib/ocaml/3.09.0/stublibs/
-usr/lib/ocaml/3.09.0/ssl/dllssl_threads_stubs.so usr/lib/ocaml/3.09.0/stublibs/

Modified: trunk/packages/ocaml-ssl/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/rules	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/rules	2005-12-09 20:21:38 UTC (rev 2278)
@@ -7,7 +7,7 @@
 #export DH_VERBOSE=1
 
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 
 DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
 
@@ -29,8 +29,8 @@
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-build: build-stamp
-build-stamp:  config.status
+build: ocamlinit build-stamp
+build-stamp: config.status
 	dh_testdir
 
 	$(MAKE)
@@ -81,4 +81,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit

Modified: trunk/packages/ocaml-ssl/trunk/debian/watch
===================================================================
--- trunk/packages/ocaml-ssl/trunk/debian/watch	2005-12-09 16:46:12 UTC (rev 2277)
+++ trunk/packages/ocaml-ssl/trunk/debian/watch	2005-12-09 20:21:38 UTC (rev 2278)
@@ -1,3 +1,3 @@
-version=2
+version=3
 
-http://heanet.dl.sourceforge.net/sourceforge/savonet/ocaml-ssl-([0-9\.]*)\.tar\.gz debian uupdate
+http://sf.net/savonet/ocaml-ssl-([0-9\.]*)\.tar\.gz debian uupdate