[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.0-2-1-g4811b58

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 4811b583d613c28efebb50cf372ead6894c94ed0
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue May 19 22:44:08 2009 +1100

    Prepared new upload..

diff --git a/debian/changelog b/debian/changelog
index 37deaef..90938c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+liquidsoap (0.9.0-3) unstable; urgency=low
+
+  * Fixed math.h usage in src/rgb_c.c
+  * Rebuild against fixed modules.
+  Closes: #528857 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Tue, 19 May 2009 22:40:22 +1100
+
 liquidsoap (0.9.0-2) unstable; urgency=low
 
   * Enabled new bindings. 
diff --git a/debian/control b/debian/control
index 6b0714a..3a1bce0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 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), debhelper (>= 7.0.1), 
+Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), 
   ocaml-nox, ocaml-findlib, libshout-ocaml-dev, 
   libogg-ocaml-dev (>= 0.3.0), libvorbis-ocaml-dev (>= 0.5.0), 
   libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev,
@@ -12,8 +12,8 @@ Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7.0.1),
   libalsa-ocaml-dev (>= 0.1.2) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64], 
   libpcre-ocaml-dev, libxml-light-ocaml-dev, libladspa-ocaml-dev, 
   libsoundtouch-ocaml-dev, liblastfm-ocaml-dev, sox,
-  libspeex-ocaml-dev, libgavl-ocaml-dev, libtheora-ocaml-dev, 
-  libportaudio-ocaml-dev, libpulse-ocaml-dev, libsamplerate-ocaml-dev,
+  libspeex-ocaml-dev (>= 0.1.1-2), libgavl-ocaml-dev (>= 0.1.1-2), libtheora-ocaml-dev (>= 0.1.1-2), 
+  libportaudio-ocaml-dev, libpulse-ocaml-dev (>= 0.1.0-3), libsamplerate-ocaml-dev,
   libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
diff --git a/debian/patches/fix_math_h_usage.patch b/debian/patches/fix_math_h_usage.patch
new file mode 100644
index 0000000..d57e33a
--- /dev/null
+++ b/debian/patches/fix_math_h_usage.patch
@@ -0,0 +1,26 @@
+Index: liquidsoap/src/stream/rgb_c.c
+===================================================================
+--- liquidsoap.orig/src/stream/rgb_c.c	2009-05-19 22:39:54.000000000 +1100
++++ liquidsoap/src/stream/rgb_c.c	2009-05-19 22:40:09.000000000 +1100
+@@ -612,10 +612,10 @@
+     for (i = ox; i < dst.width - ox; i++)
+     {
+       dx = (i - ox) / ax;
+-      i2 = floorl(dx);
++      i2 = floor(dx);
+       dx -= i2;
+       dy = (j - oy) / ay;
+-      j2 = floorl(dy);
++      j2 = floor(dy);
+       dy -= j2;
+       for (c = 0; c < Rgb_elems_per_pixel; c++)
+         Color(&dst, c, i, j) =
+@@ -940,7 +940,7 @@
+   for (j = 0; j < rgb.height; j++)
+     for (i = 0; i < rgb.width; i++)
+     {
+-      r = sqrtl((i - x) * (i - x) + (j - y) * (j - y));
++      r = sqrt((i - x) * (i - x) + (j - y) * (j - y));
+       if (r > radius)
+         Alpha(&rgb, i, j) = 0;
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d93d7ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_math_h_usage.patch
diff --git a/debian/rules b/debian/rules
index dd70487..30d6100 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # In order to regenerate 'debian/control' :
 #   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean

-- 
liquidsoap packaging