Bug#611529: Update to build with soundtouch 1.5

[Alessio Treglia <alessio@debian.org>]

Package: ocaml-soundtouch
Severity: normal
Tags: patch

Hi,

your package does no longer build with the soundtouch 1.5 available in experimental.

I'm going to apply the following patch to the Ubuntu Natty's version of
ocaml-soundtouch in order to make it able to build against the newest release of
the SoundTouch library.

You find the patch attached, I thought you might be interested in doing the same.

Thanks in advance.

-- System Information:
Debian Release: squeeze/sid
  APT prefers maverick-updates
  APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500, 'maverick')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.35-25-generic (SMP w/4 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u ocaml-soundtouch-0.1.5/debian/control ocaml-soundtouch-0.1.5/debian/control
--- ocaml-soundtouch-0.1.5/debian/control
+++ ocaml-soundtouch-0.1.5/debian/control
@@ -1,10 +1,12 @@
 Source: ocaml-soundtouch
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Samuel Mimram <smimram@debian.org>, Romain Beauxis <toots@rastageeks.org>
-Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9), 
-               libsoundtouch1-dev, ocaml-findlib (>= 1.2.4), pkg-config
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9),
+               quilt,
+               libsoundtouch0-dev, ocaml-findlib (>= 1.2.4), pkg-config
 Standards-Version: 3.8.3
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-soundtouch.git
@@ -23,7 +25,7 @@
 
 Package: libsoundtouch-ocaml-dev
 Architecture: any
-Depends: ${ocaml:Depends}, libsoundtouch1-dev, libsoundtouch-ocaml (= ${binary:Version}), 
+Depends: ${ocaml:Depends}, libsoundtouch0-dev, libsoundtouch-ocaml (= ${binary:Version}), 
          ocaml-findlib, ${misc:Depends}
 Provides: ${ocaml:Provides}
 Description: OCaml bindings for the sound stretching library
diff -u ocaml-soundtouch-0.1.5/debian/rules ocaml-soundtouch-0.1.5/debian/rules
--- ocaml-soundtouch-0.1.5/debian/rules
+++ ocaml-soundtouch-0.1.5/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.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
only in patch2:
unchanged:
--- ocaml-soundtouch-0.1.5.orig/debian/patches/series
+++ ocaml-soundtouch-0.1.5/debian/patches/series
@@ -0,0 +1 @@
+0001-soundtouch_1.5.patch
only in patch2:
unchanged:
--- ocaml-soundtouch-0.1.5.orig/debian/patches/0001-soundtouch_1.5.patch
+++ ocaml-soundtouch-0.1.5/debian/patches/0001-soundtouch_1.5.patch
@@ -0,0 +1,43 @@
+Description: Update buildsystem to build with soundtouch-1.5.
+ Don't link against libBPM anymore.
+Author: Alessio Treglia <alessio@debian.org>
+Forwarded:
+---
+ configure       |    2 +-
+ configure.ac    |    2 +-
+ src/Makefile.in |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- ocaml-soundtouch-0.1.5.orig/configure
++++ ocaml-soundtouch-0.1.5/configure
+@@ -3322,7 +3322,7 @@ $as_echo "no" >&6; }
+ fi
+ #PKG_CHECK_MODULES(SOUNDTOUCH,libSoundTouch,,[AC_MSG_ERROR(libsoundtouch not found.)])
+ # PKG_CHECK_MODULES loses when you need --libs-only-[lL]
+-SOUNDTOUCH_PKG="soundtouch-1.0"
++SOUNDTOUCH_PKG="soundtouch"
+ if ! $PKG_CONFIG --exists $SOUNDTOUCH_PKG; then
+   if ! $PKG_CONFIG --exists libSoundTouch; then
+         as_fn_error "soundtouch not found" "$LINENO" 5
+--- ocaml-soundtouch-0.1.5.orig/configure.ac
++++ ocaml-soundtouch-0.1.5/configure.ac
+@@ -113,7 +113,7 @@ AC_PROG_CXX()
+ PKG_PROG_PKG_CONFIG()
+ #PKG_CHECK_MODULES(SOUNDTOUCH,libSoundTouch,,[AC_MSG_ERROR(libsoundtouch not found.)])
+ # PKG_CHECK_MODULES loses when you need --libs-only-[lL]
+-SOUNDTOUCH_PKG="soundtouch-1.0"
++SOUNDTOUCH_PKG="soundtouch"
+ if ! $PKG_CONFIG --exists $SOUNDTOUCH_PKG; then
+   if ! $PKG_CONFIG --exists libSoundTouch; then
+         AC_MSG_ERROR([soundtouch not found])
+--- ocaml-soundtouch-0.1.5.orig/src/Makefile.in
++++ ocaml-soundtouch-0.1.5/src/Makefile.in
+@@ -27,7 +27,7 @@ SOURCES = soundtouch.ml soundtouch_stubs
+ RESULT = soundtouch
+ OCAMLDOCFLAGS = -stars
+ LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *.a *.so)
+-ACLIBS = @LIBS@ @soundtouch_LIBS@ -lBPM
++ACLIBS = @LIBS@ @soundtouch_LIBS@
+ LDFLAGS = @LDFLAGS@ @soundtouch_LDFLAGS@
+ CLIBS = $(ACLIBS:-l%=%)
+ LIBDIRS = $(LDFLAGS:-L%=%)