[SCM] soundtouch/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/soundtouch

[alessio at users.alioth.debian.org]

Add myself as uploader.
Fix FTBFS when using debhelper 7 and not building the lib32 packages.
Override dh_prep only when it's actually needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 25be14ea872a2cba0d240d38fbf9aad00bd59f20
X-Git-Newrev: 598160bc2be7810d9842658e9f4225b77ddb7f17

The following commit has been merged in the master branch:
commit 598160bc2be7810d9842658e9f4225b77ddb7f17
Merge: ae704d7444ef8b8bc76ecc345a1a4c5791afd96d 25be14ea872a2cba0d240d38fbf9aad00bd59f20
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 16 15:48:47 2011 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/soundtouch

diff --combined debian/control
index 504bbad,5752b69..38fb037
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,8 +2,8 @@@ Source: soundtouc
  Priority: optional
  Section: libs
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
- Uploaders: Alessio Treglia <alessio at debian.org>
+ Uploaders: Alessio Treglia <alessio at debian.org>,
+  Miguel Colon <debian.micove at gmail.com>
  Build-Depends: debhelper (>= 7.0.50~),
   dh-autoreconf,
   g++-multilib [amd64]
@@@ -11,14 -12,14 +12,14 @@@ Homepage: http://www.surina.net/soundto
  Vcs-Git: git://git.debian.org/pkg-multimedia/soundtouch.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/soundtouch.git
  
 -Package: libsoundtouch0-dev
 +Package: libsoundtouch-dev
  Section: libdevel
  Architecture: any
  Depends: libsoundtouch0 (= ${binary:Version}),
   ${misc:Depends}
  Replaces: libsoundtouch1-dev
  Conflicts: libsoundtouch1-dev
 -Provides: libsoundtouch-dev
 +Provides: libsoundtouch0-dev
  Description: Development files for the sound stretching library
   SoundTouch is a library that can be used to change pitch and time of
   soundfiles independently.

-- 
soundtouch packaging