[Pkg-ocaml-maint-commits] [SCM] ocaml-soundtouch packaging branch, master, updated. debian/0.1.5-4-4-ge325123

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 11eb4b077eda7fa636799fdbaa7c739a5d887457
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Thu Mar 10 15:20:59 2011 -0600

    Prepared 0.1.6-1..

diff --git a/debian/changelog b/debian/changelog
index f8df810..c20988c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ocaml-soundtouch (0.1.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixes FTBFS for -lBPM
+  * Fixes FTBFS for -lstdc++
+  * Dropped patch for soundtouch's pkg-config: fixed upstream.
+  * Bumped standards version to 3.9.1
+
+ -- Romain Beauxis <toots at rastageeks.org>  Thu, 10 Mar 2011 15:18:55 -0600
+
 ocaml-soundtouch (0.1.5-4) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 0dee70b..9f4a857 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  libsoundtouch-dev (>= 1.5.0),
  ocaml-findlib (>= 1.2.4),
  pkg-config
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-soundtouch.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-soundtouch.git
diff --git a/debian/control.in b/debian/control.in
index e242655..2debf8e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends:
  libsoundtouch-dev (>= 1.5.0),
  ocaml-findlib (>= 1.2.4),
  pkg-config
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-soundtouch.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-soundtouch.git
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
deleted file mode 100644
index 6afd1b0..0000000
--- a/debian/patches/0001-Update-buildsystem-to-build-with-soundtouch-1.5.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 502ffa2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Update-buildsystem-to-build-with-soundtouch-1.5.patch

-- 
ocaml-soundtouch packaging