From 592dca18b8f2bd19c3020bc1bb1f0270188e347a Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Sun, 17 Sep 2006 14:22:05 +0000 Subject: [PATCH] removed old .cvsignore files ready for 3.09.3 and ocaml.mk --- helm/software/DEVEL/ocaml-http/.cvsignore | 8 -------- .../software/DEVEL/ocaml-http/debian/changelog | 10 ++++++++++ helm/software/DEVEL/ocaml-http/debian/control | 2 +- helm/software/DEVEL/ocaml-http/debian/rules | 13 ++----------- .../DEVEL/ocaml-http/doc/dot/.cvsignore | 2 -- .../DEVEL/ocaml-http/doc/html/.cvsignore | 2 -- .../DEVEL/ocaml-http/doc/latex/.cvsignore | 1 - .../DEVEL/ocaml-http/examples/.cvsignore | 18 ------------------ helm/software/DEVEL/ocaml-http/mt/.cvsignore | 6 ------ .../DEVEL/ocaml-http/non_mt/.cvsignore | 6 ------ 10 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 helm/software/DEVEL/ocaml-http/.cvsignore delete mode 100644 helm/software/DEVEL/ocaml-http/doc/dot/.cvsignore delete mode 100644 helm/software/DEVEL/ocaml-http/doc/html/.cvsignore delete mode 100644 helm/software/DEVEL/ocaml-http/doc/latex/.cvsignore delete mode 100644 helm/software/DEVEL/ocaml-http/examples/.cvsignore delete mode 100644 helm/software/DEVEL/ocaml-http/mt/.cvsignore delete mode 100644 helm/software/DEVEL/ocaml-http/non_mt/.cvsignore diff --git a/helm/software/DEVEL/ocaml-http/.cvsignore b/helm/software/DEVEL/ocaml-http/.cvsignore deleted file mode 100644 index 391f4f58e..000000000 --- a/helm/software/DEVEL/ocaml-http/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -*.cmi -*.cmo -*.cmx -*.cma -*.cmxa -*.o -*.a -*.deb diff --git a/helm/software/DEVEL/ocaml-http/debian/changelog b/helm/software/DEVEL/ocaml-http/debian/changelog index d24f83f6e..d9fb9779b 100644 --- a/helm/software/DEVEL/ocaml-http/debian/changelog +++ b/helm/software/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 Sun, 17 Sep 2006 16:12:59 +0200 + ocaml-http (0.1.3-2) unstable; urgency=low * debian/control.in diff --git a/helm/software/DEVEL/ocaml-http/debian/control b/helm/software/DEVEL/ocaml-http/debian/control index 4b0e54ed2..9304f0e07 100644 --- a/helm/software/DEVEL/ocaml-http/debian/control +++ b/helm/software/DEVEL/ocaml-http/debian/control @@ -2,7 +2,7 @@ Source: ocaml-http Section: devel Priority: optional Maintainer: Stefano Zacchiroli -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/helm/software/DEVEL/ocaml-http/debian/rules b/helm/software/DEVEL/ocaml-http/debian/rules index 21e48854b..b6652614f 100755 --- a/helm/software/DEVEL/ocaml-http/debian/rules +++ b/helm/software/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/helm/software/DEVEL/ocaml-http/doc/dot/.cvsignore b/helm/software/DEVEL/ocaml-http/doc/dot/.cvsignore deleted file mode 100644 index 269c66077..000000000 --- a/helm/software/DEVEL/ocaml-http/doc/dot/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -*.dot -*.ps diff --git a/helm/software/DEVEL/ocaml-http/doc/html/.cvsignore b/helm/software/DEVEL/ocaml-http/doc/html/.cvsignore deleted file mode 100644 index d0098b437..000000000 --- a/helm/software/DEVEL/ocaml-http/doc/html/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -*.css -*.html diff --git a/helm/software/DEVEL/ocaml-http/doc/latex/.cvsignore b/helm/software/DEVEL/ocaml-http/doc/latex/.cvsignore deleted file mode 100644 index 01564af35..000000000 --- a/helm/software/DEVEL/ocaml-http/doc/latex/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.tex diff --git a/helm/software/DEVEL/ocaml-http/examples/.cvsignore b/helm/software/DEVEL/ocaml-http/examples/.cvsignore deleted file mode 100644 index cf7440d52..000000000 --- a/helm/software/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/helm/software/DEVEL/ocaml-http/mt/.cvsignore b/helm/software/DEVEL/ocaml-http/mt/.cvsignore deleted file mode 100644 index 977cc04b5..000000000 --- a/helm/software/DEVEL/ocaml-http/mt/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.cmi -*.cmo -*.cmx -*.cma -*.cmxa -*.mli diff --git a/helm/software/DEVEL/ocaml-http/non_mt/.cvsignore b/helm/software/DEVEL/ocaml-http/non_mt/.cvsignore deleted file mode 100644 index 977cc04b5..000000000 --- a/helm/software/DEVEL/ocaml-http/non_mt/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.cmi -*.cmo -*.cmx -*.cma -*.cmxa -*.mli -- 2.39.2