[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.6+debian-1-1-gb4a1652

Stephane Glondu steph at glondu.net
Sat Feb 12 22:25:13 UTC 2011


The following commit has been merged in the master branch:
commit b4a165275a3b946b775ac1881b63d88624388aaf
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Feb 12 23:05:52 2011 +0100

    Revert "Work around bug #613023"
    
    The bug was due to wrong time on my NFS server. See #613023 bug log.
    
    This reverts commit 3bf43895fb11b788dde1d430fd833a2f9a325496.

diff --git a/debian/rules b/debian/rules
index a30d5ee..d8f0594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,8 @@ include /usr/share/ocaml/ocamlvars.mk
 %:
 	dh $@ --with ocaml
 
-# Work around a strange bug on some fs where dpkg-source doesn't
-# update modification time of patched files, triggering an infinite
-# loop calling ocamldep in make (see bug #613023).
-.PHONY: quilt-bug-workaround
-quilt-bug-workaround:
-	touch src/findlib/findlib.ml src/findlib/findlib_config.mlp
-
 .PHONY: override_dh_auto_configure
-override_dh_auto_configure: quilt-bug-workaround
+override_dh_auto_configure:
 	./configure \
 		-config /etc/ocamlfind.conf \
 		-bindir /usr/bin \
@@ -57,7 +50,7 @@ override_dh_strip:
 endif
 
 .PHONY: override_dh_auto_clean
-override_dh_auto_clean: quilt-bug-workaround
+override_dh_auto_clean:
 	if [ -f Makefile.config ]; then $(MAKE) clean; fi
 	ln -sf doc/README README
 	-find . -name META -delete

-- 
findlib packaging



More information about the Pkg-ocaml-maint-commits mailing list