[Pkg-ocaml-maint-commits] [SCM] ocaml-soundtouch packaging branch, master, updated. debian/0.1.5-1-5-g2770fee

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9ff174797dac49923932e7c67f1245f57d8c8547
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Feb 27 09:57:03 2011 +0100

    Add patch and update dependencies according to #611529

diff --git a/debian/control b/debian/control
index 60759fd..49b1481 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,14 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at 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),
+ libsoundtouch-dev (>= 1.5.0),
+ 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,8 +29,12 @@ Description: OCaml bindings for the sound stretching library
 
 Package: libsoundtouch-ocaml-dev
 Architecture: any
-Depends: ${ocaml:Depends}, libsoundtouch1-dev, libsoundtouch-ocaml (= ${binary:Version}), 
-         ocaml-findlib, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ libsoundtouch1-dev,
+ libsoundtouch-ocaml (= ${binary:Version}),
+ ocaml-findlib,
+ ${misc:Depends}
 Provides: ${ocaml:Provides}
 Description: OCaml bindings for the sound stretching library
  Libsoundtouch is a library that can be used to change pitch and time
diff --git a/debian/patches/0001-Update-buildsystem-to-build-with-soundtouch-1.5.patch b/debian/patches/0001-Update-buildsystem-to-build-with-soundtouch-1.5.patch
new file mode 100644
index 0000000..6afd1b0
--- /dev/null
+++ b/debian/patches/0001-Update-buildsystem-to-build-with-soundtouch-1.5.patch
@@ -0,0 +1,53 @@
+From: Alessio Treglia <alessio at debian.org>
+Date: Sun, 27 Feb 2011 09:53:19 +0100
+Subject: [PATCH] Update buildsystem to build with soundtouch-1.5
+
+Do not link against libBPM anymore.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611529
+---
+ configure       |    2 +-
+ configure.ac    |    2 +-
+ src/Makefile.in |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 0710309..2ab2e4c 100755
+--- a/configure
++++ b/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
+diff --git a/configure.ac b/configure.ac
+index 5ed84e9..a311712 100644
+--- a/configure.ac
++++ b/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])
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 1548a0f..3859075 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -27,7 +27,7 @@ SOURCES = soundtouch.ml soundtouch_stubs.cc
+ 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%=%)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..502ffa2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Update-buildsystem-to-build-with-soundtouch-1.5.patch

-- 
ocaml-soundtouch packaging