[Pkg-ocaml-maint-commits] [SCM] ocaml-mad packaging branch, master, updated. debian/0.3.5-2-5-gadd16b8

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit add16b85e49500e37488f8d258a58c099abc9805
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 00:10:05 2009 +0200

    Add a patch to not link system libraries into cma (Closes: #549761)
    
    * Add a patch to not link system libraries into cma
    * Add quilt to build-dependencies

diff --git a/debian/changelog b/debian/changelog
index 527344e..03c31fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-mad (0.3.5-2) UNRELEASED; urgency=low
+
+  * Add a patch to not link system libraries into cma (Closes: #549761)
+  * Add quilt to build-dependencies
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 00:07:51 +0200
+
 ocaml-mad (0.3.5-2) unstable; urgency=low
 
   * Switch packaging to git
diff --git a/debian/control b/debian/control
index 830ce07..4b26080 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org> 
-Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libmad0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libmad0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml, quilt
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mad.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-mad.git
diff --git a/debian/patches/0001-Do-not-link-system-libraries-into-cma.patch b/debian/patches/0001-Do-not-link-system-libraries-into-cma.patch
new file mode 100644
index 0000000..7937501
--- /dev/null
+++ b/debian/patches/0001-Do-not-link-system-libraries-into-cma.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 6 Oct 2009 00:06:30 +0200
+Subject: [PATCH] Do not link system libraries into cma
+
+---
+ src/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 12cf401..4e8034e 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -28,7 +28,7 @@ RES_CLIB_SUF = _stubs
+ RESULT = mad
+ LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *.a *.so)
+ OCAMLLDFLAGS =
+-LIBS = unix
++LIBS =
+ ACLIBS = @LIBS@ @MAD_LIBS@
+ LDFLAGS = @LDFLAGS@ @MAD_LDFLAGS@
+ CLIBS = $(ACLIBS:-l%=%)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a5928c3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Do-not-link-system-libraries-into-cma.patch
diff --git a/debian/rules b/debian/rules
index 16f597a..b0b24cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.mk

-- 
ocaml-mad packaging