[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.12.0+debian2-4-g0512d0d

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 0512d0d6dff67cd4f17dbf402a7f7d641eed5490
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Sun Oct 9 15:01:17 2011 +0200

    Fixed lintian warnings.

diff --git a/debian/mingw-ocaml.lintian-overrides b/debian/mingw-ocaml.lintian-overrides
index e9ef596..9a0b65f 100644
--- a/debian/mingw-ocaml.lintian-overrides
+++ b/debian/mingw-ocaml.lintian-overrides
@@ -1,15 +1,14 @@
 mingw-ocaml: non-standard-dir-in-usr usr/i686-w64-mingw32/
 mingw-ocaml: binary-without-manpage usr/bin/flexlink
-mingw-ocaml: ocaml-custom-executable ./usr/bin/i686-w64-mingw-ocamlrun
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamlc (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamlcp (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)  
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamldep (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)  
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamlmklib (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamlopt (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamlprof (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
-mingw-ocaml: wrong-path-for-interpreter ./usr/i686-w64-mingw32/lib/ocaml/camlheader (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
-mingw-ocaml: wrong-path-for-interpreter ./usr/i686-w64-mingw32/lib/ocaml/extract_crc (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
-mingw-ocaml: wrong-path-for-interpreter ./usr/bin/i686-w64-mingw-ocamlobjinfo (#!/usr/bin/i686-w64-mingw-ocamlrun != /usr/bin/ocamlrun)
+mingw-ocaml: ocaml-custom-executable usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/bin/i686-w64-mingw32-ocamlc #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/bin/i686-w64-mingw32-ocamlcp #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/bin/i686-w64-mingw32-ocamldep #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/bin/i686-w64-mingw32-ocamlmklib #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/bin/i686-w64-mingw32-ocamlopt #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/bin/i686-w64-mingw32-ocamlprof #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/i686-w64-mingw32/lib/ocaml/camlheader #!/usr/bin/i686-w64-mingw32-ocamlrun
+mingw-ocaml: unusual-interpreter usr/i686-w64-mingw32/lib/ocaml/extract_crc #!/usr/bin/i686-w64-mingw32-ocamlrun
 mingw-ocaml: file-in-unusual-dir usr/bin/i686-w64-mingw32-camlp4
 mingw-ocaml: file-in-unusual-dir usr/bin/i686-w64-mingw32-camlp4o
 mingw-ocaml: file-in-unusual-dir usr/bin/i686-w64-mingw32-camlp4r
diff --git a/debian/rules b/debian/rules
index 0bf76ff..3046d43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -162,7 +162,6 @@ $(INSTALL_PATH)/usr/bin/$(MINGW_HOST)-ocamlopt:
 	for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do \
 	  mv $(INSTALL_PATH)/usr/$(MINGW_HOST)/bin/$$f $(INSTALL_PATH)/usr/bin/$(MINGW_HOST)-$$f; \
 	done
-	rm -rf $(INSTALL_PATH)/usr/$(MINGW_HOST)/bin
 
 install/mingw-ocaml::
 	# Install findlib
@@ -211,6 +210,8 @@ install/mingw-ocaml::
 	grep -r -l '#!/usr/$(MINGW_HOST)/bin/ocamlrun' $(INSTALL_PATH) | while read i; do \
 	  sed -e 's|#!/usr/$(MINGW_HOST)/bin/ocamlrun|#!/usr/bin/$(MINGW_HOST)-ocamlrun|' -i $$i; \
 	  chmod +x $$i; done
+	# Remove rm -rf $(INSTALL_PATH)/usr/$(MINGW_HOST)/bin: all binaries should be prefixed and living in /usr/bin..
+	rm -rf $(INSTALL_PATH)/usr/$(MINGW_HOST)/bin
 
 clean::
 	rm -f *.cdbs-config_list stamp-build-flexdll stamp-build-ocamlcore \

-- 
mingw32-ocaml packaging