[Pkg-ocaml-maint-commits] r2109 - in
trunk/packages/ocamlnet/trunk/debian: . patches
Stefano Zacchiroli
zack at costa.debian.org
Wed Nov 23 09:43:52 UTC 2005
Author: zack
Date: 2005-11-23 09:43:51 +0000 (Wed, 23 Nov 2005)
New Revision: 2109
Added:
trunk/packages/ocamlnet/trunk/debian/control.in
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
Removed:
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs
trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt
Modified:
trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch
trunk/packages/ocamlnet/trunk/debian/rules
Log:
ocaml 3.09 transition
Modified: trunk/packages/ocamlnet/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/changelog 2005-11-23 09:43:51 UTC (rev 2109)
@@ -1,3 +1,11 @@
+ocamlnet (1.1-6) unstable; urgency=low
+
+ * rebuilt with ocaml 3.09
+ * debian/*
+ - no longer hard coding of ocaml abi anywhere
+
+ -- Stefano Zacchiroli <zack at debian.org> Wed, 23 Nov 2005 09:42:01 +0000
+
ocamlnet (1.1-5) unstable; urgency=low
* debian/rules
Modified: trunk/packages/ocamlnet/trunk/debian/control
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/control 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/control 2005-11-23 09:43:51 UTC (rev 2109)
@@ -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, libpcre-ocaml-dev (>= 5.10), libequeue-ocaml-dev (>= 2.1.3), ocaml-findlib, dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), dpatch, cdbs
Standards-Version: 3.6.2
Package: libocamlnet-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-3.08.3, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10), libequeue-ocaml-dev (>= 2.1.3), ocaml-findlib, ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), ${misc:Depends}
Description: OCaml application-level Internet protocols and conventions library
Collection of modules for the Objective Caml language which
focus on application-level Internet protocols and conventions.
@@ -37,7 +37,7 @@
Package: libocamlnet-ocaml
Architecture: any
Section: libs
-Depends: ocaml-base-nox-3.08.3, libpcre-ocaml, libequeue-ocaml, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml, libequeue-ocaml, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml application-level Internet protocols and conventions library
Collection of modules for the Objective Caml language which
focus on application-level Internet protocols and conventions.
Added: trunk/packages/ocamlnet/trunk/debian/control.in
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/control.in 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/control.in 2005-11-23 09:43:51 UTC (rev 2109)
@@ -0,0 +1,64 @@
+Source: ocamlnet
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), dpatch, cdbs
+Standards-Version: 3.6.2
+
+Package: libocamlnet-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), ${misc:Depends}
+Description: OCaml application-level Internet protocols and conventions library
+ Collection of modules for the Objective Caml language which
+ focus on application-level Internet protocols and conventions.
+ .
+ The current distribution contains:
+ * a mature implementation of the CGI protocol;
+ * an implementation of the JSERV protocol (AJP-1.2), can be
+ used with mod_jserv (Apache JServ) and mod_jk (Jakarta
+ connector) to connect application servers written in O'Caml
+ with web servers
+ * an implementation of the FastCGI protocol, for the same
+ purpose
+ * an HTTP daemon, for substituting the web server completely
+ * a POP3 client
+ * an SMTP client
+ * a library of string processing functions related to Internet
+ protocols (formerly known as "netstring" and distributed
+ separately): MIME encoding/decoding, Date/time parsing,
+ Character encoding conversion, HTML parsing and printing, URL
+ parsing and printing, OO-representation of channels, and a
+ lot more.
+ .
+ This package contains all the development stuff you need to use
+ Ocamlnet in your programs.
+
+Package: libocamlnet-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml, libequeue-ocaml, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml application-level Internet protocols and conventions library
+ Collection of modules for the Objective Caml language which
+ focus on application-level Internet protocols and conventions.
+ .
+ The current distribution contains:
+ * a mature implementation of the CGI protocol;
+ * an implementation of the JSERV protocol (AJP-1.2), can be
+ used with mod_jserv (Apache JServ) and mod_jk (Jakarta
+ connector) to connect application servers written in O'Caml
+ with web servers
+ * an implementation of the FastCGI protocol, for the same
+ purpose
+ * an HTTP daemon, for substituting the web server completely
+ * a POP3 client
+ * an SMTP client
+ * a library of string processing functions related to Internet
+ protocols (formerly known as "netstring" and distributed
+ separately): MIME encoding/decoding, Date/time parsing,
+ Character encoding conversion, HTML parsing and printing, URL
+ parsing and printing, OO-representation of channels, and a
+ lot more.
+ .
+ This package contains only the shared runtime stub libraries.
+
Deleted: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs 2005-11-23 09:43:51 UTC (rev 2109)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3
Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install 2005-11-23 09:43:51 UTC (rev 2109)
@@ -0,0 +1,5 @@
+debian/tmp/cgi/ usr/lib/ocaml/3.09.0/
+debian/tmp/nethttpd/ usr/lib/ocaml/3.09.0/
+debian/tmp/netstring/ usr/lib/ocaml/3.09.0/
+debian/tmp/pop/ usr/lib/ocaml/3.09.0/
+debian/tmp/smtp/ usr/lib/ocaml/3.09.0/
Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in 2005-11-23 09:43:51 UTC (rev 2109)
@@ -0,0 +1,5 @@
+debian/tmp/cgi/ usr/lib/ocaml/@OCamlABI@/
+debian/tmp/nethttpd/ usr/lib/ocaml/@OCamlABI@/
+debian/tmp/netstring/ usr/lib/ocaml/@OCamlABI@/
+debian/tmp/pop/ usr/lib/ocaml/@OCamlABI@/
+debian/tmp/smtp/ usr/lib/ocaml/@OCamlABI@/
Deleted: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs 2005-11-23 09:43:51 UTC (rev 2109)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs
Modified: trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch 2005-11-23 09:43:51 UTC (rev 2109)
@@ -1,13 +1,13 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by <zack at muletto.takhisis.invalid>
+## 01_build.dpatch by <zack at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile.rules /tmp/dpep-work.poQzFQ/trunk/src/Makefile.rules
---- ./src/Makefile.rules 2005-07-30 13:32:37.000000000 +0200
-+++ /tmp/dpep-work.poQzFQ/trunk/src/Makefile.rules 2005-07-30 13:32:38.000000000 +0200
+diff -urNad trunk~/src/Makefile.rules trunk/src/Makefile.rules
+--- trunk~/src/Makefile.rules 2005-07-25 22:43:34.000000000 +0000
++++ trunk/src/Makefile.rules 2005-11-18 10:14:49.000000000 +0000
@@ -7,7 +7,7 @@
# How to invoke compilers and tools:
# (May be moved to Makefile.conf if necessary)
@@ -17,17 +17,16 @@
OCAMLOPT = $(USE_OCAMLFIND) ocamlopt -inline 10 $(OCAMLOPT_OPTIONS) $(INCLUDES) $(PP_OPTIONS)
OCAMLDEP = $(USE_OCAMLFIND) ocamldep $(OCAMLDEP_OPTIONS) $(PP_OPTIONS)
OCAMLFIND = ocamlfind
-@@ -19,6 +19,9 @@
+@@ -19,6 +19,8 @@
TOOLS_DIR = $(TOP_DIR)/tools
COLLECT_FILES = $(TOOLS_DIR)/collect_files
+DESTDIR =
-+NETDBDESTDIR =
+
# Note: In Makefile.conf, we have either
# PP_OPTIONS=$(PP_OPTIONS_FINDLIB) or
# PP_OPTIONS=$(PP_OPTIONS_NON_FINDLIB).
-@@ -93,7 +96,7 @@
+@@ -93,7 +95,7 @@
.PHONY: install-findlib
install-findlib:
files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a META $(INSTALL_EXTRA)` && \
@@ -36,9 +35,9 @@
.PHONY: uninstall-findlib
uninstall-findlib:
-diff -urNad --exclude=CVS --exclude=.svn ./src/netstring/Makefile /tmp/dpep-work.poQzFQ/trunk/src/netstring/Makefile
---- ./src/netstring/Makefile 2005-07-30 13:32:37.000000000 +0200
-+++ /tmp/dpep-work.poQzFQ/trunk/src/netstring/Makefile 2005-07-30 13:33:29.000000000 +0200
+diff -urNad trunk~/src/netstring/Makefile trunk/src/netstring/Makefile
+--- trunk~/src/netstring/Makefile 2005-07-25 22:43:34.000000000 +0000
++++ trunk/src/netstring/Makefile 2005-11-18 10:15:19.000000000 +0000
@@ -172,9 +172,9 @@
.PHONY: install-netdb
Deleted: trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt 2005-11-23 09:43:51 UTC (rev 2109)
@@ -1,12 +0,0 @@
-src/netstring/depend
-src/netstring/dllnetaccel_c.so
-src/netstring/META
-src/netstring/netdb.cmi
-src/netstring/netdb.ml
-src/netstring/netdb-packlist
-src/netstring/netmappings_jp.ml
-src/netstring/tools_done
-src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml
-src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cmi
-src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cmo
-src/tmp/
Modified: trunk/packages/ocamlnet/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules 2005-11-23 07:58:27 UTC (rev 2108)
+++ trunk/packages/ocamlnet/trunk/debian/rules 2005-11-23 09:43:51 UTC (rev 2109)
@@ -1,74 +1,35 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
+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/dpatch/dpatch.make
-
PKGNAME = libocamlnet-ocaml-dev
-TARGETDIR = $(CURDIR)/debian/$(PKGNAME)
-OCAML_LIB_DIR = $(shell ocamlc -where)
-STUBSDIR= $(OCAML_LIB_DIR)/stublibs
-NETDBDESTDIR = $(OCAML_LIB_DIR)/netstring
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
+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")
+NETDBDESTDIR = $(OCAMLLIBDIR)/netstring
+DEB_SRCDIR = $(CURDIR)/src
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp NETDBDESTDIR=$(CURDIR)/debian/tmp/netstring
- cd src/; ./configure \
- -enable-compatcgi \
- -datadir $(NETDBDESTDIR)
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
- touch configure-stamp
+configure/$(PKGNAME)::
+ cd src/ && ./configure -enable-compatcgi -datadir $(NETDBDESTDIR)
+ find src -name depend -exec rm -f {} \;
-build: configure-stamp build-stamp
-build-stamp: configure-stamp
- dh_testdir
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+ $(MAKE) -C $(DEB_SRCDIR) opt
+endif
+build/$(PKGNAME)::
+ mkdir -p debian/tmp
- $(MAKE) -C src/netstring/tools/unimap_to_ocaml/
- $(MAKE) -C src/ all
- if [ -x /usr/bin/ocamlopt ]; then $(MAKE) -C src/ opt; else true; fi
+# work around cdbs' bug
+unpatch: deapply-dpatches
- touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
- dh_testdir
- dh_testroot
- rm -f configure-stamp build-stamp
-
- $(MAKE) -C src/netstring/tools/unimap_to_ocaml/ clean distclean
- $(MAKE) -C src/ clean distclean
- rm -rf `cat debian/rm_on_clean.txt`
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) -C src/ install \
- NETDBDESTDIR=$(TARGETDIR)$(NETDBDESTDIR) \
- DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
- mv $(TARGETDIR)$(OCAML_LIB_DIR)/netstring/*.so \
- debian/libocamlnet-ocaml$(STUBSDIR)/
-
-binary-arch: build install
- dh_testdir
- dh_testroot -s
- dh_installdocs -s
- dh_installexamples -s
- dh_installchangelogs -s CHANGES
- dh_link -s
- dh_strip -s
- dh_compress -s
- dh_fixperms -s
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install configure
-
+# mv $(TARGETDIR)$(OCAML_LIB_DIR)/netstring/*.so \
+# debian/libocamlnet-ocaml$(STUBSDIR)/
More information about the Pkg-ocaml-maint-commits
mailing list