removed old .cvsignore files

ready for 3.09.3 and ocaml.mk

diff --git a/DEVEL/ocaml-http/.cvsignore b/DEVEL/ocaml-http/.cvsignore
deleted file mode 100644 (file)
index 391f4f5..0000000
--- a/DEVEL/ocaml-http/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.cmi
-*.cmo
-*.cmx
-*.cma
-*.cmxa
-*.o
-*.a
-*.deb

diff --git a/DEVEL/ocaml-http/debian/changelog b/DEVEL/ocaml-http/debian/changelog
index d24f83f6e0c80cab3c0865d3bbc5dad417dc1c0b..d9fb9779bae295d178bef7b5941eb98c68073f33 100644 (file)
--- a/DEVEL/ocaml-http/debian/changelog
+++ b/DEVEL/ocaml-http/debian/changelog
@@ -1,3 +1,13 @@
+ocaml-http (0.1.3-3) UNRELEASED; urgency=low
+
+  * debian/rules
+    - use ocaml.mk
+  * debian/control
+    - bumped build dependency on ocaml-nox to >= 3.09.3, since we now use
+      ocaml.mk
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 17 Sep 2006 16:12:59 +0200
+
 ocaml-http (0.1.3-2) unstable; urgency=low
 
   * debian/control.in

diff --git a/DEVEL/ocaml-http/debian/control b/DEVEL/ocaml-http/debian/control
index 4b0e54ed23682680924d69e5b3a2ede956f62a65..9304f0e07017258f810a55b307b5daaeceb7ae6d 100644 (file)
--- a/DEVEL/ocaml-http/debian/control
+++ b/DEVEL/ocaml-http/debian/control
@@ -2,7 +2,7 @@ Source: ocaml-http
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12), cdbs
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.3), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12), cdbs
 Standards-Version: 3.7.2
 
 Package: libhttp-ocaml-dev

diff --git a/DEVEL/ocaml-http/debian/rules b/DEVEL/ocaml-http/debian/rules
index 21e48854b779b5dd0bf4365916fc276c2d79e4e5..b6652614facd9e71352ede10407cebdf7bde1268 100755 (executable)
--- a/DEVEL/ocaml-http/debian/rules
+++ b/DEVEL/ocaml-http/debian/rules
@@ -1,20 +1,11 @@
 #!/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/class/ocaml.mk
 
 PKGNAME = libhttp-ocaml-dev
 
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
-
-ocamlinit:
-       for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
-
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::

diff --git a/DEVEL/ocaml-http/doc/dot/.cvsignore b/DEVEL/ocaml-http/doc/dot/.cvsignore
deleted file mode 100644 (file)
index 269c660..0000000
--- a/DEVEL/ocaml-http/doc/dot/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.dot
-*.ps

diff --git a/DEVEL/ocaml-http/doc/html/.cvsignore b/DEVEL/ocaml-http/doc/html/.cvsignore
deleted file mode 100644 (file)
index d0098b4..0000000
--- a/DEVEL/ocaml-http/doc/html/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.css
-*.html

diff --git a/DEVEL/ocaml-http/doc/latex/.cvsignore b/DEVEL/ocaml-http/doc/latex/.cvsignore
deleted file mode 100644 (file)
index 01564af..0000000
--- a/DEVEL/ocaml-http/doc/latex/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.tex

diff --git a/DEVEL/ocaml-http/examples/.cvsignore b/DEVEL/ocaml-http/examples/.cvsignore
deleted file mode 100644 (file)
index cf7440d..0000000
--- a/DEVEL/ocaml-http/examples/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-*.cmi
-*.cmo
-*.cmx
-*.cma
-*.cmxa
-always_ok_daemon
-basic_auth
-chdir
-client_address
-damned_recursion
-dont_fork
-dump_args
-highlander
-obj_foo
-oo_daemon
-threads
-timeout
-webfsd

diff --git a/DEVEL/ocaml-http/mt/.cvsignore b/DEVEL/ocaml-http/mt/.cvsignore
deleted file mode 100644 (file)
index 977cc04..0000000
--- a/DEVEL/ocaml-http/mt/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.cmi
-*.cmo
-*.cmx
-*.cma
-*.cmxa
-*.mli

diff --git a/DEVEL/ocaml-http/non_mt/.cvsignore b/DEVEL/ocaml-http/non_mt/.cvsignore
deleted file mode 100644 (file)
index 977cc04..0000000
--- a/DEVEL/ocaml-http/non_mt/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.cmi
-*.cmo
-*.cmx
-*.cma
-*.cmxa
-*.mli