new release, binNMU safe

diff --git a/helm/software/DEVEL/ocaml-http/debian/changelog b/helm/software/DEVEL/ocaml-http/debian/changelog
index 3617ed9e8cf701d9297e12ee93980214fea87133..f885582d810a67fb9e244f0984a67af5aef69da9 100644 (file)
--- a/helm/software/DEVEL/ocaml-http/debian/changelog
+++ b/helm/software/DEVEL/ocaml-http/debian/changelog
@@ -1,3 +1,14 @@
+ocaml-http (0.1.3-2) unstable; urgency=low
+
+  * debian/control.in
+    - file removed, no longer needed
+  * debian/control
+    - bumped dependencies on pcre-ocaml and ocamlnet
+  * debian/rules
+    - binNMU safe substitution of variables in .in files
+
+ -- Stefano Zacchiroli <zack@debian.org>  Fri, 15 Sep 2006 00:29:56 +0200
+
 ocaml-http (0.1.3-1) unstable; urgency=low
 
   * force bash as SHELL in Makefile, since we rely on bashisms

diff --git a/helm/software/DEVEL/ocaml-http/debian/control b/helm/software/DEVEL/ocaml-http/debian/control
index 01ec128a8054f94d3acb6389f9002f0eca462636..4b0e54ed23682680924d69e5b3a2ede956f62a65 100644 (file)
--- a/helm/software/DEVEL/ocaml-http/debian/control
+++ b/helm/software/DEVEL/ocaml-http/debian/control
@@ -2,12 +2,12 @@ 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.10.1-2), libocamlnet-ocaml-dev (>= 1.1-8), cdbs
+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
 Standards-Version: 3.7.2
 
 Package: libhttp-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.10.1-2), libocamlnet-ocaml-dev (>= 1.1-8)
+Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12)
 Description: OCaml library for writing HTTP servers
  OCaml HTTP is a library for the Objective Caml programming language,
  used to build simple HTTP servers, largely inspired to Perl's

diff --git a/helm/software/DEVEL/ocaml-http/debian/control.in b/helm/software/DEVEL/ocaml-http/debian/control.in
deleted file mode 100644 (file)
index 75f2b8e..0000000
--- a/helm/software/DEVEL/ocaml-http/debian/control.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: ocaml-http
-Section: devel
-Priority: optional
-Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.10.1-2), libocamlnet-ocaml-dev (>= 1.1-8), cdbs
-Standards-Version: 3.7.2
-
-Package: libhttp-ocaml-dev
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.10.1-2), libocamlnet-ocaml-dev (>= 1.1-8)
-Description: OCaml library for writing HTTP servers
- OCaml HTTP is a library for the Objective Caml programming language,
- used to build simple HTTP servers, largely inspired to Perl's
- HTTP::Daemon module.
- .
- In order to implement an HTTP servers the programmer has to provide a
- daemon specification which contains, among other parameters, a callback
- function invoked by OCaml HTTP on well formed HTTP requests received.
- HTTP responses could be sent over an out_channel connected with client
- socket, accessible from the callback.
- .
- The library contains also facility functions that helps in creating
- well formed HTTP responses and a tiny HTTP client.

diff --git a/helm/software/DEVEL/ocaml-http/debian/rules b/helm/software/DEVEL/ocaml-http/debian/rules
index b8493ead0adf20924472b18f33f25283e007b5c9..21e48854b779b5dd0bf4365916fc276c2d79e4e5 100755 (executable)
--- a/helm/software/DEVEL/ocaml-http/debian/rules
+++ b/helm/software/DEVEL/ocaml-http/debian/rules
@@ -6,17 +6,15 @@ PKGNAME = libhttp-ocaml-dev
 
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES_ALL := $(patsubst %.in,%,$(shell ls debian/*.in))
-OFILES := $(filter-out debian/rules, $(OFILES_ALL))
+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)"
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
 ocamlinit:
-       for f in $(OFILES_ALL); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-makebuilddir/$(PKGNAME)::
        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)
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::