[Pkg-ocaml-maint-commits] r3033 - in /trunk/packages/ocamlweb/trunk/debian: changelog control control.in rules

[treinen at users.alioth.debian.org]

Author: treinen
Date: Sun Aug 27 13:56:23 2006
New Revision: 3033

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3033
Log:
ocamlweb-1.37-4

Removed:
    trunk/packages/ocamlweb/trunk/debian/control.in
Modified:
    trunk/packages/ocamlweb/trunk/debian/changelog
    trunk/packages/ocamlweb/trunk/debian/control
    trunk/packages/ocamlweb/trunk/debian/rules

Modified: trunk/packages/ocamlweb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/changelog?rev=3033&op=diff
==============================================================================
--- trunk/packages/ocamlweb/trunk/debian/changelog (original)
+++ trunk/packages/ocamlweb/trunk/debian/changelog Sun Aug 27 13:56:23 2006
@@ -1,3 +1,13 @@
+ocamlweb (1.37-4) unstable; urgency=low
+
+  * Removed mechanism to build debian/control from debian/control.in
+    since we do not need it anymore. Use dh_gencontrol to fill in the
+    version of the ocaml runtime system.
+  * Allow cooperation with texlive: depends tetex-extra | texlive-latex-extra"
+    (closes: Bug#381471)
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 27 Aug 2006 15:42:57 +0200
+
 ocamlweb (1.37-3) unstable; urgency=low
 
   * Standards-Version 3.7.2 (no change)

Modified: trunk/packages/ocamlweb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/control?rev=3033&op=diff
==============================================================================
--- trunk/packages/ocamlweb/trunk/debian/control (original)
+++ trunk/packages/ocamlweb/trunk/debian/control Sun Aug 27 13:56:23 2006
@@ -4,12 +4,12 @@
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>
 Standards-Version: 3.7.2
-Build-Depends-Indep: ocaml-nox-3.09.2
+Build-Depends-Indep: ocaml-nox (>= 3.07)
 Build-Depends: debhelper (>= 4.0), dpatch
 
 Package: ocamlweb
 Architecture: all
-Depends: tetex-base, tetex-bin, tetex-extra, ocaml-base-nox-${OCamlABI}
+Depends: tetex-extra | texlive-latex-extra, ocaml-base-nox-${F:OCamlABI}
 Suggests: hevea
 Enhances: ocaml
 Description: Literate programming tool for Objective Caml

Modified: trunk/packages/ocamlweb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/rules?rev=3033&op=diff
==============================================================================
--- trunk/packages/ocamlweb/trunk/debian/rules (original)
+++ trunk/packages/ocamlweb/trunk/debian/rules Sun Aug 27 13:56:23 2006
@@ -6,11 +6,6 @@
 include /usr/share/dpatch/dpatch.make
 
 OCAMLABI = $(shell ocamlc -version)
-
-# for package maintainers only - target not used in build process!
-OCAMLABI := $(shell ocamlc -version)
-debian/control:
-	sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in >$@
 
 configure: Makefile
 Makefile: patch
@@ -50,10 +45,10 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VOCamlABI=$(OCAMLABI)
+	dh_gencontrol -- -VF:OCamlABI=$(OCAMLABI)
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch debian/control
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch