[Pkg-ocaml-maint-commits] r2160 - trunk/packages/ocurl/trunk/debian

Enrico Tassi gares-guest at costa.debian.org
Sun Nov 27 13:25:36 UTC 2005


Author: gares-guest
Date: 2005-11-27 13:25:33 +0000 (Sun, 27 Nov 2005)
New Revision: 2160

Added:
   trunk/packages/ocurl/trunk/debian/control.in
   trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.dirs.in
   trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install.in
   trunk/packages/ocurl/trunk/debian/libcurl-ocaml.dirs.in
   trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install.in
Modified:
   trunk/packages/ocurl/trunk/debian/control
   trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install
   trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install
   trunk/packages/ocurl/trunk/debian/rules
Log:
moved to cdbs


Modified: trunk/packages/ocurl/trunk/debian/control
===================================================================
--- trunk/packages/ocurl/trunk/debian/control	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/control	2005-11-27 13:25:33 UTC (rev 2160)
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Enrico Tassi <gareuselesinge at users.sourceforge.net>
-Build-Depends: debhelper (>= 4.0.0), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox-3.09.0, dpatch, ocaml-findlib, libkrb5-dev
+Build-Depends: debhelper (>= 4.0.0), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox (>= 3.09.0), dpatch, ocaml-findlib (>= 1.1), libkrb5-dev, cdbs
 Standards-Version: 3.6.2.0
 
 Package: libcurl-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: libcurl-ocaml (= ${Source-Version}), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox-3.09.0, ocaml-findlib
+Depends: libcurl-ocaml (= ${Source-Version}), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1)
 Description: ocaml libcurl bindings
  This Objective Caml library provides multi-protocol file transfer
  facilities based on the curl library.
@@ -18,7 +18,7 @@
 Package: libcurl-ocaml
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.09.0
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
 Description: ocaml curl bindings 
  This Objective Caml library provides multi-protocol file transfer
  facilities based on the curl library.

Added: trunk/packages/ocurl/trunk/debian/control.in
===================================================================
--- trunk/packages/ocurl/trunk/debian/control.in	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/control.in	2005-11-27 13:25:33 UTC (rev 2160)
@@ -0,0 +1,27 @@
+Source: ocurl
+Section: libdevel
+Priority: optional
+Maintainer: Enrico Tassi <gareuselesinge at users.sourceforge.net>
+Build-Depends: debhelper (>= 4.0.0), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox (>= @OCamlABI@), dpatch, ocaml-findlib (>= 1.1), libkrb5-dev, cdbs
+Standards-Version: 3.6.2.0
+
+Package: libcurl-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: libcurl-ocaml (= ${Source-Version}), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1)
+Description: ocaml libcurl bindings
+ This Objective Caml library provides multi-protocol file transfer
+ facilities based on the curl library.
+ .
+ This package contains the developpment part of the ocaml curl package. 
+
+Package: libcurl-ocaml
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Description: ocaml curl bindings 
+ This Objective Caml library provides multi-protocol file transfer
+ facilities based on the curl library.
+ .
+ This package contains only the shared runtime stub libraries.
+

Added: trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.dirs.in
===================================================================
--- trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.dirs.in	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.dirs.in	2005-11-27 13:25:33 UTC (rev 2160)
@@ -0,0 +1 @@
+/usr/lib/ocaml/@OCamlABI@/curl

Modified: trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install
===================================================================
--- trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install	2005-11-27 13:25:33 UTC (rev 2160)
@@ -1 +1,4 @@
-usr/lib/ocaml/3.09.0/curl/
+debian/tmp/usr/lib/ocaml/3.09.0/curl/META
+debian/tmp/usr/lib/ocaml/3.09.0/curl/lib*helper.a
+debian/tmp/usr/lib/ocaml/3.09.0/curl/*.cm*
+debian/tmp/usr/lib/ocaml/3.09.0/curl/*.ml*

Added: trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install.in
===================================================================
--- trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install.in	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/libcurl-ocaml-dev.install.in	2005-11-27 13:25:33 UTC (rev 2160)
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/curl/META
+debian/tmp/usr/lib/ocaml/@OCamlABI@/curl/lib*helper.a
+debian/tmp/usr/lib/ocaml/@OCamlABI@/curl/*.cm*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/curl/*.ml*

Added: trunk/packages/ocurl/trunk/debian/libcurl-ocaml.dirs.in
===================================================================
--- trunk/packages/ocurl/trunk/debian/libcurl-ocaml.dirs.in	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/libcurl-ocaml.dirs.in	2005-11-27 13:25:33 UTC (rev 2160)
@@ -0,0 +1 @@
+/usr/lib/ocaml/@OCamlABI@/stublibs

Modified: trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install
===================================================================
--- trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install	2005-11-27 13:25:33 UTC (rev 2160)
@@ -1 +1 @@
-usr/lib/ocaml/3.09.0/stublibs/*.so
+debian/tmp/usr/lib/ocaml/3.09.0/curl/dll*helper.so usr/lib/ocaml/3.09.0/stublibs/

Added: trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install.in
===================================================================
--- trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install.in	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/libcurl-ocaml.install.in	2005-11-27 13:25:33 UTC (rev 2160)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/curl/dll*helper.so usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocurl/trunk/debian/rules
===================================================================
--- trunk/packages/ocurl/trunk/debian/rules	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocurl/trunk/debian/rules	2005-11-27 13:25:33 UTC (rev 2160)
@@ -1,94 +1,28 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+PKGNAME = libcurl-ocaml-dev
 
-TARGETDIR = $(CURDIR)/debian/tmp
-OCAML_LIB_DIR = $(shell ocamlc -where)
+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")
+DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
+DEB_CONFIGURE_EXTRA_FLAGS = 
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ocamlinit:
+	for f in $(OFILES); do \
+		sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; \
+	done
+	
+build/$(PKGNAME)::
+	mkdir -p $(DESTDIR)
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./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: patch-stamp config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp config.status 
-	rm -rf $(TARGETDIR)$(OCAML_LIB_DIR)
-
-	-$(MAKE) clean
-	rm -f Makefile config.log examples/Makefile config.h
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	mkdir -p $(TARGETDIR)$(OCAML_LIB_DIR)
-	mkdir -p $(TARGETDIR)$(OCAML_LIB_DIR)/stublibs
-	$(MAKE) install DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
-	dh_install --sourcedir=debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+# work around cdbs' bug
+unpatch: deapply-dpatches




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