[Pkg-ocaml-maint-commits] r2397 - trunk/packages/ocamlagrep/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2006-01-07 12:19:01 +0000 (Sat, 07 Jan 2006)
New Revision: 2397

Modified:
   trunk/packages/ocamlagrep/trunk/debian/changelog
   trunk/packages/ocamlagrep/trunk/debian/control
   trunk/packages/ocamlagrep/trunk/debian/rules
   trunk/packages/ocamlagrep/trunk/debian/watch
Log:
Rebuild with OCaml 3.09.1.

Modified: trunk/packages/ocamlagrep/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/changelog	2006-01-07 12:13:48 UTC (rev 2396)
+++ trunk/packages/ocamlagrep/trunk/debian/changelog	2006-01-07 12:19:01 UTC (rev 2397)
@@ -1,9 +1,14 @@
 ocamlagrep (1.0-6) unstable; urgency=low
 
-  * Stop hardcoding the ocaml version number in the package.
+  [ Julien Cristau ]
+  * Stop hardcoding the OCaml version number in the package.
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 17 Nov 2005 07:23:31 +0100
+  [ Samuel Mimram ]
+  * Updated watch file.
+  * Rebuild with OCaml 3.09.1.
 
+ -- Samuel Mimram <smimram at debian.org>  Sat,  7 Jan 2006 13:18:00 +0100
+
 ocamlagrep (1.0-5) unstable; urgency=low
 
   * Updated to OCaml 3.09.0.

Modified: trunk/packages/ocamlagrep/trunk/debian/control
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/control	2006-01-07 12:13:48 UTC (rev 2396)
+++ trunk/packages/ocamlagrep/trunk/debian/control	2006-01-07 12:19:01 UTC (rev 2397)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0)
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.1)
 Standards-Version: 3.6.2
 
 Package: libagrep-ocaml-dev

Modified: trunk/packages/ocamlagrep/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/rules	2006-01-07 12:13:48 UTC (rev 2396)
+++ trunk/packages/ocamlagrep/trunk/debian/rules	2006-01-07 12:19:01 UTC (rev 2397)
@@ -3,6 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14,19 +17,17 @@
 	INSTALL_PROGRAM += -s
 endif
 
-OCAMLABI = $(shell ocamlc -version)
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/#OCamlABI#/$(OCAMLABI)/g' $$f.in > $$f; done
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	for t in debian/*.in; do sed -e 's/#OCamlABI#/$(OCAMLABI)/g' \
-		$$t > $${t%.in}; done
-
 	touch configure-stamp
 
-build: build-stamp
-build-stamp: configure-stamp 
+build: ocamlinit build-stamp
+build-stamp: configure-stamp
 	dh_testdir
 
 	$(MAKE) libagrep.a agrep.cma
@@ -37,17 +38,18 @@
 clean:
 	dh_testdir
 	dh_testroot
+
 	rm -f build-stamp configure-stamp
 	rm -f libagrep-ocaml-dev.install libagrep-ocaml.install dirs
 	-$(MAKE) clean
 	rm -rf debian/doc
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	mkdir -p debian/tmp
@@ -64,7 +66,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp --list-missing
@@ -81,4 +83,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit

Modified: trunk/packages/ocamlagrep/trunk/debian/watch
===================================================================
--- trunk/packages/ocamlagrep/trunk/debian/watch	2006-01-07 12:13:48 UTC (rev 2396)
+++ trunk/packages/ocamlagrep/trunk/debian/watch	2006-01-07 12:19:01 UTC (rev 2397)
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://pauillac.inria.fr/~xleroy/software.html (?:.*/)?ocamlagrep-([0-9\.]*)\.tar\.gz debian uupdate