[Pkg-ocaml-maint-commits] r2126 - trunk/packages/netclient/trunk/debian

Sat Nov 26 10:06:57 UTC 2005

Author: zack
Date: 2005-11-26 10:06:56 +0000 (Sat, 26 Nov 2005)
New Revision: 2126

Added:
   trunk/packages/netclient/trunk/debian/control.in
   trunk/packages/netclient/trunk/debian/dirs.in
Modified:
   trunk/packages/netclient/trunk/debian/changelog
   trunk/packages/netclient/trunk/debian/control
   trunk/packages/netclient/trunk/debian/dirs
   trunk/packages/netclient/trunk/debian/rules
Log:
ocaml 3.09 transition


Modified: trunk/packages/netclient/trunk/debian/changelog
===================================================================

--- trunk/packages/netclient/trunk/debian/changelog	2005-11-26 09:57:02 UTC (rev 2125)
+++ trunk/packages/netclient/trunk/debian/changelog	2005-11-26 10:06:56 UTC (rev 2126)
@@ -1,3 +1,11 @@
+netclient (0.91-2) unstable; urgency=low
+
+  * rebuilt with ocaml 3.09
+  * debian/*
+    - no longer hard coding of ocaml abi anywhere
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 10 Nov 2005 13:25:01 +0100
+
 netclient (0.91-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/netclient/trunk/debian/control
===================================================================
--- trunk/packages/netclient/trunk/debian/control	2005-11-26 09:57:02 UTC (rev 2125)
+++ trunk/packages/netclient/trunk/debian/control	2005-11-26 10:06:56 UTC (rev 2126)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, ocaml-findlib, libocamlnet-ocaml-dev (>= 1.1-1), libxstr-ocaml-dev (>= 0.2.1-10), libequeue-ocaml-dev (>= 2.1-2), dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-1), libxstr-ocaml-dev (>= 0.2.1-11), libequeue-ocaml-dev (>= 2.1.3-3), dpatch
 Standards-Version: 3.6.2
 
 Package: libnetclient-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, libocamlnet-ocaml-dev (>= 1.1-1), libxstr-ocaml-dev (>= 0.2.1-10), libequeue-ocaml-dev (>= 2.1-2), ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 1.1-1), libxstr-ocaml-dev (>= 0.2.1-11), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1)
 Description: OCaml HTTP/1.1, Telnet, and FTP clients library
  OCaml library that implements various client side behaviours for
  (ISO/OSI 7th level) network protocols.

Copied: trunk/packages/netclient/trunk/debian/control.in (from rev 1919, trunk/packages/netclient/trunk/debian/control)
===================================================================
--- trunk/packages/netclient/trunk/debian/control	2005-11-04 16:21:23 UTC (rev 1919)
+++ trunk/packages/netclient/trunk/debian/control.in	2005-11-26 10:06:56 UTC (rev 2126)
@@ -0,0 +1,16 @@
+Source: netclient
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-1), libxstr-ocaml-dev (>= 0.2.1-11), libequeue-ocaml-dev (>= 2.1.3-3), dpatch
+Standards-Version: 3.6.2
+
+Package: libnetclient-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 1.1-1), libxstr-ocaml-dev (>= 0.2.1-11), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1)
+Description: OCaml HTTP/1.1, Telnet, and FTP clients library
+ OCaml library that implements various client side behaviours for
+ (ISO/OSI 7th level) network protocols.
+ .
+ HTTP/1.1, Telnet, and FTP are currently supported.

Modified: trunk/packages/netclient/trunk/debian/dirs
===================================================================
--- trunk/packages/netclient/trunk/debian/dirs	2005-11-26 09:57:02 UTC (rev 2125)
+++ trunk/packages/netclient/trunk/debian/dirs	2005-11-26 10:06:56 UTC (rev 2126)
@@ -1,2 +1,2 @@
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.09.0
 usr/share/doc/libnetclient-ocaml-dev/html/

Copied: trunk/packages/netclient/trunk/debian/dirs.in (from rev 1919, trunk/packages/netclient/trunk/debian/dirs)
===================================================================
--- trunk/packages/netclient/trunk/debian/dirs	2005-11-04 16:21:23 UTC (rev 1919)
+++ trunk/packages/netclient/trunk/debian/dirs.in	2005-11-26 10:06:56 UTC (rev 2126)
@@ -0,0 +1,2 @@
+usr/lib/ocaml/@OCamlABI@
+usr/share/doc/libnetclient-ocaml-dev/html/

Modified: trunk/packages/netclient/trunk/debian/rules
===================================================================
--- trunk/packages/netclient/trunk/debian/rules	2005-11-26 09:57:02 UTC (rev 2125)
+++ trunk/packages/netclient/trunk/debian/rules	2005-11-26 10:06:56 UTC (rev 2126)
@@ -1,57 +1,24 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+OCAMLABI := $(shell ocamlc -version)
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+PKGNAME = libnetclient-ocaml-dev
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
-include /usr/share/dpatch/dpatch.make
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
-TARGETDIR = $(CURDIR)/debian/libnetclient-ocaml-dev
-OCAML_LIB_DIR = $(shell ocamlc -where)
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+	$(MAKE) opt
+endif
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
+# work around cdbs' bug
+unpatch: deapply-dpatches
 
-	$(MAKE) all
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; else true; fi
-
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	-$(MAKE) clean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installdocs
-	dh_installexamples
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install


