[SCM] audiofile/master: Merge branch 'master.experimental'

[alessio at users.alioth.debian.org]

Update debian/gbp.conf.
Fix typo.
Finalize changelog.
Remove obsolete Conflicts/Replaces on libaudiofile0 (<= 0.2.3-4) from libaudiofile-dev's stanza.
Bump SONAME. Move debugging symbols from libaudiofile0-dbg to unversioned libaudiofile-dbg.
Merge commit 'upstream/0.3.3'
Imported Upstream version 0.3.3
Add pkg-config to libaudiofile-dev's Recommends field.
Finalize changelog.
Add Multi-Arch: same to the -DBG's stanza.
Enable parallel builds.
Update debian/copyright.
Pass --enable-static=no to configure.
Add ${shlibs:Depends} to the -DEV's Depends field.
Fix mistake in the Maintainer's address
Add MultiArch support.
Don't provide static library anymore.
Build-Depends on libasound2-dev to build the example program.
Drop audiofile.m4 as it's no longer provided.
Drop libaudiofile0.symbols, use dh_makeshlibs -V for now.
Remove debian/patches, all patches are obsolete or adopted upstream.
Merge commit 'upstream/0.3.2'
Imported Upstream version 0.3.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ea756dd8eeac5e9ca2befe7e10a785e1916e00f8
X-Git-Newrev: 2a82e22e80332f40822a597c3a0353c13b667ede

The following commit has been merged in the master branch:
commit cd7357a1722746d923d81cee4e6fface7bf518fc
Merge: ea756dd8eeac5e9ca2befe7e10a785e1916e00f8 e9cc4a5f52b6c5c188df2d6a543a38622c077f4f
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 20 11:28:14 2012 +0100

    Merge branch 'master.experimental'

diff --combined debian/changelog
index 37f1bb0,f2da9cc..46c1109
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,33 +1,45 @@@
+ audiofile (0.3.3-1~exp1) experimental; urgency=low
+ 
+   * New upstream release.
+   * SONAME bump.
+   * Add pkg-config to libaudiofile-dev's Recommends field.
+   * Move debugging symbols from libaudiofile0-dbg to unversioned
+     libaudiofile-dbg.
+   * Remove obsolete Conflicts/Replaces on libaudiofile0 (<= 0.2.3-4)
+     from libaudiofile-dev's stanza.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Thu, 12 Jan 2012 10:26:34 +0100
+ 
+ audiofile (0.3.2-1) experimental; urgency=low
+ 
+   * New maintainer, thanks to Daniel Kobras for the great work.
+   * New upstream stable release.
+   * Update debian/watch.
+   * Remove debian/patches, all patches are obsolete or adopted upstream.
+   * Drop libaudiofile0.symbols, use dh_makeshlibs -V for now.
+   * Drop audiofile.m4 as it's no longer provided.
+   * Build-Depends on libasound2-dev to build the example program.
+   * Don't provide static library anymore.
+   * Add MultiArch support. (Closes: #651029) (LP: #900153)
+   * Add ${shlibs:Depends} to the -DEV's Depends field.
+   * Pass --enable-static=no to configure.
+   * Update debian/copyright.
+   * Enable parallel builds.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Thu, 05 Jan 2012 13:03:34 +0100
+ 
 +audiofile (0.2.7-1) unstable; urgency=low
 +
 +  * New maintainer.
 +    Thanks to Daniel Kobras <kobras at debian.org> for the great work done!
 +  * ACK NMU.
 +  * debian/*: wrap-and-sort
 +  * Update debian/watch.
 +  * Introduce Multi-Arch support.
 +  * Add shlibs:Depends to -DEV's Build-Depends field.
 +
 + -- Alessio Treglia <alessio at debian.org>  Sun, 15 Jan 2012 00:07:07 +0100
 +
  audiofile (0.2.7-0.1) unstable; urgency=low
  
    * Non-maintainer upload.
diff --combined debian/control
index 2944167,ed344dd..7399e86
--- a/debian/control
+++ b/debian/control
@@@ -4,7 -4,8 +4,8 @@@ Priority: optiona
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Alessio Treglia <alessio at debian.org>
  Build-Depends: debhelper (>= 8.1.3~),
-  dh-autoreconf
+  dh-autoreconf,
+  libasound2-dev
  Standards-Version: 3.9.2
  Homepage: http://audiofile.68k.org/
  Vcs-Git: git://anonscm.debian.org/pkg-multimedia/audiofile.git
@@@ -15,11 -16,10 +16,10 @@@ Section: libdeve
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
- Depends: libaudiofile0 (= ${binary:Version}),
+ Depends: libaudiofile1 (= ${binary:Version}),
 - ${shlibs:Depends},
 - ${misc:Depends}
 + ${misc:Depends},
 + ${shlibs:Depends}
- Conflicts: libaudiofile0 (<= 0.2.3-4)
- Replaces: libaudiofile0 (<= 0.2.3-4)
+ Recommends: pkg-config
  Description: Open-source version of SGI's audiofile library (header files)
   The audiofile library allows the processing of audio data to and from audio
   files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS,
@@@ -29,7 -29,7 +29,7 @@@
   compile programs using libaudiofile, as well as example programs for
   identifying and converting audio files.
  
- Package: libaudiofile0
+ Package: libaudiofile1
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
@@@ -43,12 -43,12 +43,12 @@@ Description: Open-source version of SGI
   This package contains the library needed to run executables using
   libaudiofile.
  
- Package: libaudiofile0-dbg
+ Package: libaudiofile-dbg
  Section: debug
  Priority: extra
  Architecture: any
  Multi-Arch: same
- Depends: libaudiofile0 (= ${binary:Version}),
+ Depends: libaudiofile1 (= ${binary:Version}),
   ${misc:Depends}
  Description: Open-source version of SGI's audiofile library (debug)
   The audiofile library allows the processing of audio data to and from audio

-- 
audiofile packaging