ocamlgsl (0.6.0-7) debian-dir only changes

Summary

 debian/README.source                           |    5 
 debian/changelog                               |  223 +++++++++++++++++++++++++
 debian/compat                                  |    1 
 debian/control                                 |   39 ++++
 debian/copyright                               |   63 +++++++
 debian/gbp.conf                                |    2 
 debian/libocamlgsl-ocaml-dev.doc-base          |    8 
 debian/libocamlgsl-ocaml-dev.docs              |    2 
 debian/libocamlgsl-ocaml-dev.examples          |    1 
 debian/libocamlgsl-ocaml-dev.install.in        |    3 
 debian/libocamlgsl-ocaml.dirs.in               |    1 
 debian/patches/00list                          |    3 
 debian/patches/02_correct_examples.dpatch      |   39 ++++
 debian/patches/cdf_handle_int_arguments.dpatch |   63 +++++++
 debian/patches/make_bytecode.dpatch            |   74 ++++++++
 debian/patches/match_gcc_4_2.dpatch            |   19 ++
 debian/rules                                   |   52 +++++
 debian/watch                                   |    2 
 18 files changed, 600 insertions(+)

    
download this patch

Patch contents

--- ocamlgsl-0.6.0.orig/debian/watch
+++ ocamlgsl-0.6.0/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://oandrieu.nerim.net/ocaml/gsl/ocamlgsl-([0-9].*)\.tar\.gz
--- ocamlgsl-0.6.0.orig/debian/libocamlgsl-ocaml-dev.install.in
+++ ocamlgsl-0.6.0/debian/libocamlgsl-ocaml-dev.install.in
@@ -0,0 +1,3 @@
+doc/*   /usr/share/doc/libocamlgsl-ocaml-dev/html/api/
+*.mli   @OCamlStdlibDir@/gsl/
+META    @OCamlStdlibDir@/gsl/
--- ocamlgsl-0.6.0.orig/debian/control
+++ ocamlgsl-0.6.0/debian/control
@@ -0,0 +1,39 @@
+Source: ocamlgsl
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor@debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), 
+ debhelper (>= 5), 
+ dpatch, 
+ ocaml-nox (>= 3.10.0-9), 
+ ocaml-findlib (>= 1.1.2pl1-4), 
+ libgsl0-dev, 
+ chrpath, 
+ gawk, 
+ camlp4 (>= 3.10.0),
+ dh-ocaml (>= 0.9.1)
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlgsl.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlgsl.git
+Homepage: http://code.google.com/p/ocamlgsl/
+
+Package: libocamlgsl-ocaml-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${ocaml:Depends}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: GNU scientific library for OCaml
+ This is an interface to GSL (GNU scientific library), for the
+ Objective Caml language.
+ .
+ See the libgsl0 package for more details.
+
+Package: libocamlgsl-ocaml
+Architecture: any
+Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: GNU scientific library for OCaml
+ This is an interface to GSL (GNU scientific library), for the
+ Objective Caml language.
+ .
+ See the libgsl0 package for more details.
--- ocamlgsl-0.6.0.orig/debian/libocamlgsl-ocaml-dev.doc-base
+++ ocamlgsl-0.6.0/debian/libocamlgsl-ocaml-dev.doc-base
@@ -0,0 +1,8 @@
+Document: libocamlgsl-ocaml-dev-ocamldoc-api-reference
+Title: libocamlgsl-ocaml-dev OCamldoc API Reference
+Abstract: API reference manual for libocamlgsl-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libocamlgsl-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libocamlgsl-ocaml-dev/html/api/*
--- ocamlgsl-0.6.0.orig/debian/libocamlgsl-ocaml-dev.docs
+++ ocamlgsl-0.6.0/debian/libocamlgsl-ocaml-dev.docs
@@ -0,0 +1,2 @@
+README
+NOTES
--- ocamlgsl-0.6.0.orig/debian/README.source
+++ ocamlgsl-0.6.0/debian/README.source
@@ -0,0 +1,5 @@
+This package use dpatch for patching the source. 
+
+Please consider reading dpatch manpage to patch the source.
+
+ -- Sylvain Le Gall <gildor@debian.org>  Sun, 22 Jun 2008 23:26:52 +0200
--- ocamlgsl-0.6.0.orig/debian/copyright
+++ ocamlgsl-0.6.0/debian/copyright
@@ -0,0 +1,63 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Olivier Andrieu <oandrieu@nerim.net>
+Packaged-By: Sylvain Le Gall <gildor@debian.org>
+Packaged-Date: Fri, 9 Jan 2004 16:45:39 +0200.
+Original-Source-Location: http://oandrieu.nerim.net/ocaml/gsl/
+
+Files: *
+Copyright: © 2002-2005 Olivier Andrieu
+License: GPL-2
+
+Files: gsl_bspline.ml, gsl_bspline.mli, mlgsl_bspline.c
+Copyright: © 2007 Olivier Andrieu
+
+Files: gsl_complex.ml, gsl_complex.mli
+Copyright: © 2002-2005, 2003 Olivier Andrieu
+           © 2002-2005, 2003 Paul Pelzl 
+License: GPL-2
+
+Files: gsl_sf.mli.q
+Copyright: © 2002-2005 Olivier Andrieu
+License: GPL-2
+
+Files: mlgsl_complex.c
+Copyright: © 2003 Paul Pelzl
+License: GPL-2
+
+Files: mlgsl_sort.c, mlgsl_wavelet.c
+Copyright: © 2005 Olivier Andrieu
+License: GPL-2
+
+Ocamlgsl is distributed under the terms the GPL v2 license, which can be found
+in the /usr/share/common-licenses/GPL-2 file on debian systems.
+
+Files: io.h
+Copyright: © 1996 Institut National de Recherche en Informatique et Automatique
+License: GPL-any | other
+
+This file is extracted from ocaml source package and refer to "the special
+exception on linking". Here is this exception from OCaml copyright.
+
+As a special exception to the GNU Library General Public License, you
+may link, statically or dynamically, a "work that uses the Library"
+with a publicly distributed version of the Library to produce an
+executable file containing portions of the Library, and distribute
+that executable file under terms of your choice, without any of the
+additional requirements listed in clause 6 of the GNU Library General
+Public License.  By "a publicly distributed version of the Library",
+we mean either the unmodified Library as distributed by INRIA, or a
+modified version of the Library that is distributed under the
+conditions defined in clause 3 of the GNU Library General Public
+License.  This exception does not however invalidate any other reasons
+why the executable file might be covered by the GNU Library General
+Public License.
+
+OCaml copyright information could be found in file
+/usr/share/doc/ocaml/copyright on Debian system.
+
+Files: debian/*
+Copyright: © 2006 Sylvain Le Gall 
+License: GPL-2+
+
+On Debian system GNU General Public License can be found in
+/usr/share/common-licenses/GPL.
--- ocamlgsl-0.6.0.orig/debian/compat
+++ ocamlgsl-0.6.0/debian/compat
@@ -0,0 +1 @@
+5
--- ocamlgsl-0.6.0.orig/debian/changelog
+++ ocamlgsl-0.6.0/debian/changelog
@@ -0,0 +1,223 @@
+ocamlgsl (0.6.0-7) unstable; urgency=low
+
+  * Install libmlgsl.a on non-native architectures (Closes: #567060)
+
+ -- Sylvain Le Gall <gildor@debian.org>  Tue, 20 Apr 2010 21:55:21 +0200
+
+ocamlgsl (0.6.0-6) unstable; urgency=low
+
+  * Update upstream homepage
+  * Restore .depend in clean target
+  * Use dh-ocaml features
+  * Upgrade Standards-version to 3.8.3 (section ocaml)
+
+ -- Sylvain Le Gall <gildor@debian.org>  Mon, 14 Dec 2009 23:44:52 +0000
+
+ocamlgsl (0.6.0-5) unstable; urgency=low
+
+  * Really add a build-dependency on dh-ocaml
+
+ -- Sylvain Le Gall <gildor@debian.org>  Mon, 09 Mar 2009 10:42:25 +0100
+
+ocamlgsl (0.6.0-4) unstable; urgency=low
+
+  * Switch packaging to git
+  * Set maintainer to Debian OCaml Maintainers
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Add ${misc:Depends} to dependencies
+
+ -- Sylvain Le Gall <gildor@debian.org>  Thu, 05 Mar 2009 11:05:09 +0100
+
+ocamlgsl (0.6.0-3) unstable; urgency=low
+
+  * Setting arch to any, package on some arches will probably have
+    performance issue because of data alignement but no real bugs
+    (Closes: #490901)
+  * Revamp debian/copyright
+  * Upgrade Standards-Version to 3.8.0:
+    * Add debian/REAME.source
+    * Remove dpkg-dev Build-Deps
+    * Add Homepage field
+
+ -- Sylvain Le Gall <gildor@debian.org>  Tue, 15 Jul 2008 23:01:13 +0200
+
+ocamlgsl (0.6.0-2) unstable; urgency=low
+
+  [ Stefano Zacchiroli ]
+  * fix vcs-svn field to point just above the debian/ dir
+
+  [ Sylvain Le Gall ]
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+  * Modify gcc matching to help recognize gcc-4.2 as gcc 
+    (Closes: #482920)
+  * Add hurd-i386 to arch (Closes: #482906)
+
+ -- Sylvain Le Gall <gildor@debian.org>  Mon, 26 May 2008 12:15:49 +0200
+
+ocamlgsl (0.6.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Change email address to gildor@debian.org everywhere
+  * Rebuild for ocaml 3.10.0
+  * Move documentation to html/api
+  * Use more debian/*.in file to take advantage of substitution of
+    OCamlDllDir/OCamlStdlibDir
+  * Use CDBS ocaml.mk
+
+ -- Sylvain Le Gall <gildor@debian.org>  Wed, 05 Sep 2007 22:09:30 +0200
+
+ocamlgsl (0.5.2-2) unstable; urgency=low
+
+  * Revert changes on the build system
+
+ -- Sylvain Le Gall <gildor@debian.org>  Sun, 21 Jan 2007 18:06:07 +0100
+
+ocamlgsl (0.5.2-1) unstable; urgency=low
+
+  * New upstream release:
+    * Fix Gsl_sf.legendre_array_size (Closes: #406711)
+  * Upgrade debian/watch version to 3,
+  * Use ocaml.mk
+
+ -- Sylvain Le Gall <gildor@debian.org>  Thu,  9 Nov 2006 23:39:55 +0100
+
+ocamlgsl (0.5.1-3) unstable; urgency=low
+
+  * Correct a typo OCAML_HAVE_OPT -> OCAML_HAVE_OCAMLOPT 
+    (Closes: #393442)
+
+ -- Sylvain Le Gall <gildor@debian.org>  Thu, 26 Oct 2006 01:17:00 +0200
+
+ocamlgsl (0.5.1-2) unstable; urgency=low
+
+  * Add versionned dependency on dpkg-dev
+
+ -- Sylvain Le Gall <gildor@debian.org>  Sun, 15 Oct 2006 18:25:55 +0200
+
+ocamlgsl (0.5.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #392361),
+  * Use CDBS for debian/rules,
+  * Upgrade debhelper debian/compat to 5,
+  * Real NUM acknowledgement (Closes: #361583, #361635),
+  * Rebuild against ocaml 3.09.2 (Closes: #368773),
+  * Patch cdf_handle_int_arguments.dpatch applied upstream,
+
+ -- Sylvain Le Gall <gildor@debian.org>  Thu, 12 Oct 2006 01:37:11 +0200
+
+ocamlgsl (0.4.0-5) unstable; urgency=low
+
+  * Acknowledge NMU (thanks to Samuel Mimram)
+  * Change my email address to gildor@debian.org,
+  * Made debian/control a PHONY target,
+  * Upgrade standards version to 3.7.2 (no change),
+
+ -- Sylvain Le Gall <gildor@debian.org>  Wed, 14 Jun 2006 21:34:58 +0200
+
+ocamlgsl (0.4.0-4.1) unstable; urgency=low
+
+  * NMU.
+  * Added a patch (cdf_handle_int_arguments.dpatch) to solve the FTBFS by
+    properly handling functions with "const unsigned int" arguments (thanks
+    Julien Cristau), closes: #361583.
+  * Added kfreebsd-amd64 to the list of supported archs, closes: #361635.
+  * Updated Standards-Version to 3.7.0, no changes needed.
+
+ -- Samuel Mimram <smimram@debian.org>  Thu,  4 May 2006 20:31:48 +0000
+
+ocamlgsl (0.4.0-4) unstable; urgency=low
+
+  * Rebuild for OCaml 3.09.1
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Wed, 11 Jan 2006 00:12:16 +0100
+
+ocamlgsl (0.4.0-3) unstable; urgency=low
+
+  * Use Apps/Programming for doc-base
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Sat,  3 Dec 2005 01:13:01 +0100
+
+ocamlgsl (0.4.0-2) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+  * Remove hardcoded OCaml ABI
+  * Transition to svn-buildpackage
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Fri,  2 Dec 2005 23:08:34 +0100
+
+ocamlgsl (0.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Added kfreebsd-i386 to the list of arch
+    (Closes: #314703)
+  * Migration to Standards-Version 3.6.2.0 (no change)
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Thu, 21 Jul 2005 23:34:51 +0200
+
+ocamlgsl (0.3.5-3) unstable; urgency=high
+
+  * Add dependency on libgsl0-dev (Closes: #309844)
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Sat, 21 May 2005 01:21:11 +0200
+
+ocamlgsl (0.3.5-2) unstable; urgency=medium
+
+  * Transition to ocaml 3.08.3 : depends on ocaml-nox-3.08.3
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Wed, 23 Mar 2005 23:37:47 +0100
+
+ocamlgsl (0.3.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Wed,  8 Dec 2004 00:51:07 +0100
+
+ocamlgsl (0.3.4-2) unstable; urgency=low
+
+  * Transition to ocaml-3.08. Files modified :
+    - control
+    - rules
+    - libocamlgsl-ocaml-dev.dirs
+    - libocamlgsl-ocaml.dirs
+
+ -- Sylvain LE GALL <sylvain.le-gall@polytechnique.org>  Wed, 28 Jul 2004 00:51:41 +0200
+
+ocamlgsl (0.3.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Add amd64 to the build arch list
+
+ -- Sylvain LE GALL <sylvain.le-gall@polytechnique.org>  Mon,  7 Jun 2004 22:38:14 +0200
+
+ocamlgsl (0.3.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sylvain LE GALL <sylvain.le-gall@polytechnique.org>  Sat, 22 May 2004 00:20:44 +0200
+
+ocamlgsl (0.3.2-3) unstable; urgency=low
+
+  * Correct the override disparity : devel -> libdevel
+
+ -- Sylvain LE GALL <sylvain.le-gall@polytechnique.org>  Thu,  6 May 2004 00:42:26 +0200
+
+ocamlgsl (0.3.2-2) unstable; urgency=low
+
+  * Modified the arch, because ocamlgsl won't build on double aligned
+    arch ( ie not sparc, nor hppa )
+
+ -- Sylvain LE GALL <sylvain.le-gall@polytechnique.org>  Tue,  4 May 2004 00:29:45 +0200
+
+ocamlgsl (0.3.2-1) unstable; urgency=low
+
+  * Initial upload
+  * New upstream release
+  * Correct the byte installation with patch make_bytecode
+  * The name of the package in the archive will be libocamlgsl-ocaml-dev
+    following the ocaml policy convention
+  * Added a watch file
+  * Corrected my own META, because there were errors
+  * Choose to let the build system use the default dir ( ie .../gsl )
+    rather than forcing it to .../ocamlgsl
+
+ -- Sylvain LE GALL <sylvain.le-gall@polytechnique.org>  Tue, 20 Apr 2004 00:05:29 +0200
--- ocamlgsl-0.6.0.orig/debian/rules
+++ ocamlgsl-0.6.0/debian/rules
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# debian/rules for ocamlgsl package
+# Copyright (C) 2006 Sylvain Le Gall <gildor@debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+DEB_MAKE_CLEAN_TARGET    := clean
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    := all-opt
+DEB_MAKE_INSTALL_TARGET  := install-opt
+else
+DEB_MAKE_BUILD_TARGET    := all-byte
+DEB_MAKE_INSTALL_TARGET  := install-byte
+endif
+
+PACKAGE_DEV := libocamlgsl-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+
+PACKAGE := libocamlgsl-ocaml
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
+
+DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
+
+pre-build::
+	cp .depend .depend.save
+
+clean::
+	-mv .depend.save .depend
+
+install/libocamlgsl-ocaml-dev::
+	$(RM) -r '$(DESTDIR_DEV)/$(OCAML_DLL_DIR)'
+	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
+	 '$(DESTDIR)/$(OCAML_DLL_DIR)'
+	chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so
--- ocamlgsl-0.6.0.orig/debian/gbp.conf
+++ ocamlgsl-0.6.0/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
--- ocamlgsl-0.6.0.orig/debian/libocamlgsl-ocaml-dev.examples
+++ ocamlgsl-0.6.0/debian/libocamlgsl-ocaml-dev.examples
@@ -0,0 +1 @@
+examples/*
--- ocamlgsl-0.6.0.orig/debian/libocamlgsl-ocaml.dirs.in
+++ ocamlgsl-0.6.0/debian/libocamlgsl-ocaml.dirs.in
@@ -0,0 +1 @@
+@OCamlDllDir@
--- ocamlgsl-0.6.0.orig/debian/patches/00list
+++ ocamlgsl-0.6.0/debian/patches/00list
@@ -0,0 +1,3 @@
+make_bytecode
+02_correct_examples
+match_gcc_4_2
--- ocamlgsl-0.6.0.orig/debian/patches/cdf_handle_int_arguments.dpatch
+++ ocamlgsl-0.6.0/debian/patches/cdf_handle_int_arguments.dpatch
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cdf_handle_int_arguments.dpatch by  <julien.cristau@ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: gsl_cdf.h contains functions with const unsigned int arguments, so we 
+## DP: can handle them as well as const double.
+
+@DPATCH@
+
+--- ocamlgsl-0.4.0.orig/do_cdf.ml	2005-01-05 00:05:03.000000000 +0100
++++ ocamlgsl-0.4.0/do_cdf.ml	2006-04-21 03:00:13.000000000 +0200
+@@ -1,7 +1,10 @@
++type arg_type = Double of string | Int of string
+ 
+ let parse = 
+   let regexp_full = Str.regexp "double gsl_cdf_\\([^ ]+\\) (\\([^)]+\\));" in
+-  let regexp_arg  = Str.regexp "const double \\([a-zA-Z0-9_]+\\)" in
++  let regexp_arg = Str.regexp "const" in
++  let regexp_double  = Str.regexp "const double \\([a-zA-Z0-9_]+\\)" in
++  let regexp_uint = Str.regexp "const unsigned int \\([a-zA-z0-9_]+\\)" in
+   fun s ->
+     if Str.string_match regexp_full s 0
+     then
+@@ -11,8 +14,11 @@
+ 	  let acc = ref [] in
+ 	  let i = ref (Str.group_beginning 2) in
+ 	  begin try while true do
+-	    let _ = Str.search_forward regexp_arg s !i in
+-	    acc := (Str.matched_group 1 s) :: !acc ;
++	    let j = Str.search_forward regexp_arg s !i in
++            if Str.string_match regexp_double s j then
++              acc := (Double (Str.matched_group 1 s)) :: !acc
++            else if Str.string_match regexp_uint s j then
++              acc := (Int (Str.matched_group 1 s)) :: !acc;
+ 	    i := Str.match_end ()
+ 	  done
+ 	  with Not_found -> () end ;
+@@ -26,14 +32,23 @@
+   | None -> ()
+   | Some v -> f v
+ 
++                
++let trans_ml = function
++    Double s -> (String.lowercase s) ^ ":float"
++  | Int s -> (String.lowercase s) ^ ":int"
++
++let trans_c = function
++    Double _ -> print_string "Double_val, "
++  | Int _ -> print_string "Int_val, "
++                
+ let print_ml (fun_name, args) =
+   Printf.printf "external %s : " fun_name ;
+-  List.iter (fun arg -> Printf.printf "%s:float -> " (String.lowercase arg)) args ;
++  List.iter (fun arg -> Printf.printf "%s -> " (trans_ml arg)) args ;
+   Printf.printf "float = \"ml_gsl_cdf_%s\" \"gsl_cdf_%s\" \"float\"\n" fun_name fun_name
+ 
+ let print_c (fun_name, args) =
+   Printf.printf "ML%d(gsl_cdf_%s, " (List.length args) fun_name ;
+-  List.iter (fun arg -> print_string "Double_val, ") args ;
++  List.iter trans_c args ;
+   print_string "copy_double)\n" ;
+   print_newline ()
+
--- ocamlgsl-0.6.0.orig/debian/patches/match_gcc_4_2.dpatch
+++ ocamlgsl-0.6.0/debian/patches/match_gcc_4_2.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## match_gcc_4_2.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad ocamlgsl-0.6.0~/Makefile ocamlgsl-0.6.0/Makefile
+--- ocamlgsl-0.6.0~/Makefile	2008-05-26 12:12:17.000000000 +0200
++++ ocamlgsl-0.6.0/Makefile	2008-05-26 12:12:26.000000000 +0200
+@@ -21,7 +21,7 @@
+ OCAML_BACKEND := mingw
+ endif
+ 
+-OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 { print \$$2 }")
++OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 && /\+ gcc-.*/ { print \"gcc\"; next; } NR==1 { print \$$2 }")
+ OCAML_VERSION ?= $(shell $(OCAMLC) -version)
+ 
+ OCAMLBCFLAGS := -g 
--- ocamlgsl-0.6.0.orig/debian/patches/make_bytecode.dpatch
+++ ocamlgsl-0.6.0/debian/patches/make_bytecode.dpatch
@@ -0,0 +1,74 @@
+#!/bin/sh -e
+## make_bytecode.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+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.6.0
+ 
+-all : stubs gsl.cma gsl.cmxa $(CMI)
+-
++all : all-opt
++all-byte : stubs gsl.cma $(CMI)
++all-opt : all-byte gsl.cmxa
++ 
+ STUBS = libmlgsl.$(A)
+ ifdef DYNAMIC_LINKING
+ STUBS += dllmlgsl.$(D)
+@@ -147,20 +149,27 @@
+ top : libmlgsl.$(A) gsl.cma
+ 	ocamlmktop -I . -o ocamlgsl$(EXE) bigarray.cma gsl.cma
+ 
+-install : all
++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)
++	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 $(wildcard gsl.cmxa) $(wildcard gsl.$(A)) \
++	  $(CMI) $(wildcard $(MLOPTOBJ))
+ 
+ ocamlgsl.odoc : $(MLOBJ) $(CMI)
+ 	$(OCAMLDOC) -v -dump $@ $(filter-out gsl_misc.%, $(filter %.mli, $(SRC)))
--- ocamlgsl-0.6.0.orig/debian/patches/02_correct_examples.dpatch
+++ ocamlgsl-0.6.0/debian/patches/02_correct_examples.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+## 02_correct_examples.dpatch by Sylvain Le Gall <gildor@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/ocamlgsl/ocamlgsl-0.3.3/examples/Makefile ocamlgsl-0.3.3/examples/Makefile
+--- /mnt/nfs0/gildor/deb/ocaml-package/ocamlgsl/ocamlgsl-0.3.3/examples/Makefile	2002-12-30 20:53:22.000000000 +0100
++++ ocamlgsl-0.3.3/examples/Makefile	2004-05-22 00:26:39.000000000 +0200
+@@ -1,7 +1,7 @@
+ 
+-OCAMLC   := ocamlc.opt
+-OCAMLOPT := ocamlopt.opt
+-CAMLP4O  := camlp4o.opt
++OCAMLC   := ocamlc
++OCAMLOPT := ocamlopt
++CAMLP4O  := camlp4o
+ 
+ OCAMLBCFLAGS := -g
+ OCAMLNCFLAGS := -unsafe