[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.11.2+debian1-1-gebc33f3

Thu Feb 11 00:33:24 UTC 2010

The following commit has been merged in the master branch:
commit ebc33f39cf3ff50d293dbe4e5d6e51c92d7fd1af
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Feb 10 18:36:27 2010 -0600

    Ship a custom ocamlrun

diff --git a/debian/README.Debian b/debian/README.Debian
index 183ff2e..739bbb8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -32,7 +32,7 @@ It is convenient to install those libs directly in /usr/i586-mingw32msvc,
 though not very clean. However, it seems that /usr/i586-mingw32msvc/local is 
 not recognized by the mingw32 cross-compiler.
 
-Additionaly, if your configuration script uses pkg-config
+Additionally, if your configuration script uses pkg-config
 to detect libraries, you may want to set the PKG_CONFIG_PATH
 variable to /usr/i586-mingw32msvc/lib/pkgconfig:
 
diff --git a/debian/changelog b/debian/changelog
index 3bab80d..35ae90c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mingw32-ocaml (3.11.2+debian2) unstable; urgency=low
+
+  * ocamlrun ABI depends on ocaml version. Hence,
+    shipping a local one now. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 10 Feb 2010 17:57:34 -0600
+
 mingw32-ocaml (3.11.2+debian1) unstable; urgency=low
 
   * Updated to ocaml 3.11.2 
diff --git a/debian/mingw32-ocaml.lintian-overrides b/debian/mingw32-ocaml.lintian-overrides
index df3ac04..d3e543d 100644
--- a/debian/mingw32-ocaml.lintian-overrides
+++ b/debian/mingw32-ocaml.lintian-overrides
@@ -1,5 +1,17 @@
 mingw32-ocaml: non-standard-dir-in-usr usr/i586-mingw32msvc/
-mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlc                                                                                                                  
+mingw32-ocaml: ocaml-custom-executable ./usr/i586-mingw32msvc/bin/ocamlrun
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlc (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlcp (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)  
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamldep (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)  
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlmklib (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlopt (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlprof (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/addlabels (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/camlheader (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/extract_crc (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/scrapelabels (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlrun
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlc                                                                                           
 mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlcp                                              
 mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamldep                                             
 mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlmklib                                           
diff --git a/debian/rules b/debian/rules
index 9c337df..893c6ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,7 +151,7 @@ $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/ocamlopt:
 	                                        installopt
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && install -m 0755 ocamlc $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin
 	# Rename all the binaries to target-binary
-	for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do \
+	for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do \
 	  dh_link usr/$(MINGW32_HOST)/bin/$$f usr/bin/$(MINGW32_HOST)-$$f; \
 	done
 
@@ -165,7 +165,7 @@ install/mingw32-ocaml::
 	# in the Debian native package.
 	rm -r $(INSTALL_PATH)/usr/share/man
 	# Symlink manuals for the cross-compiler binaries.
-	for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do \
+	for f in ocamlc ocamlcp ocamldep ocamlrun ocamlmklib ocamlmktop ocamlopt ocamlprof; do \
 	  dh_link usr/share/man/man1/$$f.1.gz usr/share/man/man1/$(MINGW32_HOST)-$$f.1.gz ; \
 	done
 	# Remove ocamlfind binary - we will use the native version.
@@ -186,11 +186,6 @@ install/mingw32-ocaml::
 	  -e 's, at target@,$(MINGW32_HOST),g' \
 	  < debian/ocamlfind.conf.in \
 	  > $(INSTALL_PATH)/etc/$(MINGW32_HOST)-ocamlfind.conf
-	# Don't install ocamlrun, use native one.
-	rm $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/ocamlrun
-	grep -r -l '#!/usr/$(MINGW32_HOST)/bin/ocamlrun' $(INSTALL_PATH) | while read i; do \
-	  sed -e "s,#!/usr/$(MINGW32_HOST)/bin/ocamlrun,#!/usr/bin/ocamlrun,g" \
-	    -i $$i; done
 	# Install flexlink binary
 	mkdir -p $(INSTALL_PATH)/usr/$(MINGW32_HOST)/lib/ocaml/flexdll
 	cd $(DEB_BUILDDIR)/$(FLEXDLL_DIR) && install -m 0755 flexlink.exe flexdll_mingw.o flexdll_initer_mingw.o \
@@ -205,7 +200,7 @@ install/mingw32-ocaml::
 	find $(INSTALL_PATH)/usr/$(MINGW32_HOST)/lib/ocaml -type f -executable | grep -v flexlink.exe | while read i; do \
 	    chmod -x $$i; done
 	# Now make all script with #!/usr/bin/ocamlrun executables
-	grep -r -l '#!/usr/bin/ocamlrun' $(INSTALL_PATH) | while read i; do \
+	grep -r -l '#!/usr/$(MINGW32_HOST)/bin/ocamlrun' $(INSTALL_PATH) | while read i; do \
 	  chmod +x $$i; done
 
 clean::

-- 
mingw32-ocaml packaging

