[Pkg-ocaml-maint-commits] [SCM] ocamlgsl packaging branch, master, updated. debian/0.6.0-7

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit ce8962dda4972ddeb39bfdcd93d308710dae406c
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Apr 20 21:59:36 2010 +0200

    Install libmlgsl.a on non-native architectures (Closes: #567060)

diff --git a/debian/changelog b/debian/changelog
index 12254fb..64d39a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocamlgsl (0.6.0-7) unstable; urgency=low
+
+  * Install libmlgsl.a on non-native architectures (Closes: #567060)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 20 Apr 2010 21:55:21 +0200
+
 ocamlgsl (0.6.0-6) unstable; urgency=low
 
   * Update upstream homepage
diff --git a/debian/patches/make_bytecode.dpatch b/debian/patches/make_bytecode.dpatch
index e0c32ab..6d5254c 100755
--- a/debian/patches/make_bytecode.dpatch
+++ b/debian/patches/make_bytecode.dpatch
@@ -23,55 +23,52 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad ocamlgsl-0.5.1~/Makefile ocamlgsl-0.5.1/Makefile
---- ocamlgsl-0.5.1~/Makefile	2006-10-05 13:38:14.000000000 +0200
-+++ ocamlgsl-0.5.1/Makefile	2006-10-12 01:53:15.000000000 +0200
-@@ -119,13 +119,20 @@
+diff -urNad ocamlgsl~/Makefile ocamlgsl/Makefile
+--- ocamlgsl~/Makefile	2010-04-20 21:56:43.000000000 +0200
++++ ocamlgsl/Makefile	2010-04-20 21:57:44.297632550 +0200
+@@ -119,8 +119,10 @@
             $(wildcard test/*.ml) $(wildcard ocamlgsl.info*)
- VERSION := 0.5.1
+ VERSION := 0.6.0
  
 -all : stubs gsl.cma gsl.cmxa $(CMI)
-+all-byte: stubs-byte gsl.cma $(CMI)
+-
++all : all-opt
++all-byte : stubs gsl.cma $(CMI)
++all-opt : all-byte gsl.cmxa
 + 
-+all-opt: all-byte stubs-opt gsl.cmxa $(CMI)
- 
-+all: all-opt
-+ 
-+stubs-opt: libmlgsl.$(A) 
-+stubs-byte:
  STUBS = libmlgsl.$(A)
-+
  ifdef DYNAMIC_LINKING
  STUBS += dllmlgsl.$(D)
-+stubs-byte: dllmlgsl.$(D)
- endif
--stubs : $(STUBS)
- 
- libmlgsl.$(A) : $(SOBJ)
- 	$(call MKLIB,mlgsl,$^)
-@@ -147,7 +154,15 @@
+@@ -147,20 +149,27 @@
  top : libmlgsl.$(A) gsl.cma
  	ocamlmktop -I . -o ocamlgsl$(EXE) bigarray.cma gsl.cma
  
 -install : all
-+install-byte: all-byte
-+	mkdir -p $(DESTDIR)$(INSTALLDIR)
-+	cp dllmlgsl.$(D) gsl.cma \
-+          $(CMI) $(DESTDIR)$(INSTALLDIR)
-+	mkdir -p $(DESTDIR)$(OCAMLDIR)/stublibs
-+	if test -w $(DESTDIR)$(OCAMLDIR)/stublibs ; then \
-+          ln -sf $(INSTALLDIR)/dllmlgsl.$(D) $(DESTDIR)$(OCAMLDIR)/stublibs ; fi
-+
-+install-opt: all-opt
++install : install-opt
++install-opt : all-opt
++	$(MAKE) install-byte
++install-byte : all-byte
  	mkdir -p $(DESTDIR)$(INSTALLDIR)
- 	cp $(STUBS) gsl.cma gsl.cmxa gsl.$(A) \
-           $(CMI) $(MLOPTOBJ) $(DESTDIR)$(INSTALLDIR)
-@@ -162,6 +177,8 @@
+-	cp $(STUBS) gsl.cma gsl.cmxa gsl.$(A) \
+-          $(CMI) $(MLOPTOBJ) $(DESTDIR)$(INSTALLDIR)
++	cp $(STUBS) gsl.cma $(wildcard gsl.cmxa) $(wildcard gsl.$(A)) \
++          $(CMI) $(wildcard $(MLOPTOBJ)) $(DESTDIR)$(INSTALLDIR)
+ 	mkdir -p $(DESTDIR)$(OCAMLDIR)/stublibs
+ 	if test -w $(DESTDIR)$(OCAMLDIR)/stublibs ; then \
+           ln -sf $(INSTALLDIR)/dllmlgsl.$(D) $(DESTDIR)$(OCAMLDIR)/stublibs ; fi
+ 
+-install-findlib : all
++install-findlib: install-findlib-opt
++install-findlib-opt : all-opt
++	$(MAKE) install-findlib-byte
++install-findlib-byte : all-byte
+ 	export FINDLIBDIR=$$($(OCAMLFIND) printconf destdir) ; \
+ 	test -d "$${FINDLIBDIR}/stublibs" && mkdir -p $(DESTDIR)$${FINDLIBDIR}/stublibs ; \
+ 	OCAMLFIND_DESTDIR=$(DESTDIR)$${FINDLIBDIR} \
          $(OCAMLFIND) install gsl META \
-           libmlgsl.$(A) dllmlgsl.$(D) gsl.cma gsl.cmxa gsl.$(A) $(CMI) $(MLOPTOBJ) 
+-          libmlgsl.$(A) dllmlgsl.$(D) gsl.cma gsl.cmxa gsl.$(A) $(CMI) $(MLOPTOBJ) 
++          libmlgsl.$(A) dllmlgsl.$(D) gsl.cma $(wildcard gsl.cmxa) $(wildcard gsl.$(A)) \
++	  $(CMI) $(wildcard $(MLOPTOBJ))
  
-+install: install-opt
-+
  ocamlgsl.odoc : $(MLOBJ) $(CMI)
  	$(OCAMLDOC) -v -dump $@ $(filter-out gsl_misc.%, $(filter %.mli, $(SRC)))
- 

-- 
ocamlgsl packaging