[Pkg-ocaml-maint-commits] [SCM] ocaml-tools packaging branch, master, updated. debian/20120103-1-1-gece9894

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit ece9894dd97bc8a8e1d95ce930746231a1ebabd6
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jan 18 15:28:53 2012 +0100

    Fix debian/rules targets to call install before binary-indep (Closes: #656330)

diff --git a/debian/changelog b/debian/changelog
index 45dde58..5e06180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-tools (20120103-2) unstable; urgency=low
+
+  * Fix debian/rules targets to call install before binary-indep
+    (Closes: #656330)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 18 Jan 2012 15:28:07 +0100
+
 ocaml-tools (20120103-1) unstable; urgency=low
 
   [ Ralf Treinen ]
diff --git a/debian/rules b/debian/rules
index f177510..0e0764a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ build-indep:
 	cp ocaml-autoconf/README ocaml-autoconf/README.ocaml-autoconf
 	cd omlet-* && (cp README README.omlet ; cp ChangeLog changelog.omlet)
 	cp ocamldot/README README.ocamldot
-	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/ocaml-tools.substvars
 
 build: build-arch build-indep
 
@@ -44,10 +43,11 @@ install:
 	dh_clean -k
 	dh_installdirs
 	BASE=$(DESTDIR)/$(VIMDIR) make -C $(OMLETSRC) install-aux
+	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/ocaml-tools.substvars
 
 binary-arch: build-arch
 
-binary-indep: build-indep
+binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
 	dh_install
@@ -63,6 +63,6 @@ binary-indep: build-indep
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-arch binary-indep install
+binary: binary-arch binary-indep
 
 .PHONY: build clean binary-indep binary-arch binary install

-- 
ocaml-tools packaging