[SCM] forked-daapd/experimental: Merge branch 'master' into experimental

[rbalint at users.alioth.debian.org]

Reformat build-dependencies
Update standards version to 3.9.6
Ship README.md instead of README
Use system's libavl
Drop obsolete patches
Update changelog for new upstream release
Merge tag 'upstream/22.3+dfsg1'
Imported Upstream version 22.3+dfsg1
Start working on new upload
Finalize changelog
Update patches to match original commits
Fix playing audio locally
Fix compatibility with iTunes 12.1 and fix two segfaults with upstream patches
Start working on next upload
Finalize changelog
Enable last.fm scrobbling
Update changelog for 22.0
Merge tag 'upstream/22.0'
Imported Upstream version 22.0
Build-depend on libgcrypt20-dev instead of libgcrypt11-dev which became a transitional package
Add watch file
Revert "Use pkg-config to determine FFmpeg linker flags"
Start working on next upload
Finalize changelog
Use pkg-config to determine FFmpeg linker flags
Update package description
Start working on next upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: 9ceec6d6073c806722b3a50d225c5525b0a484cb
X-Git-Newrev: 3e8e1214261c45f398b49574bf9ea1bb1c58be55

The following commit has been merged in the experimental branch:
commit 7b5f632a4377deac2227b7002d90bb213602e72d
Merge: 9ceec6d6073c806722b3a50d225c5525b0a484cb a5bf9d379b5ab3d616ab831aa324a75055573567
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Feb 24 06:31:41 2015 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index a6c3bf4,b965122..b54435e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,38 +1,41 @@@
- forked-daapd (21.0-2~exp1) experimental; urgency=medium
 -forked-daapd (22.3+dfsg1-1) UNRELEASED; urgency=medium
++forked-daapd (22.3+dfsg1-1~exp1) experimental; urgency=medium
  
-   * Reformat build-dependencies
+   * New upstream release 22.3
 +  * Build-depend on libevent (>= 2.1.4~)
 +    This enables streaming to multiple clients and support for Shoutcast
 +    metadata.
  
-  -- Balint Reczey <balint at balintreczey.hu>  Wed, 02 Jul 2014 11:35:45 +0200
+  -- Balint Reczey <balint at balintreczey.hu>  Tue, 24 Feb 2015 05:59:21 +0100
+ 
+ forked-daapd (22.0-2) unstable; urgency=medium
+ 
+   * Fix compatibility with iTunes 12.1 (Closes: #778995)
+   * Fix two segfaults with upstream patches (Closes: #778996)
+   * Fix playing audio locally (Closes: #779011)
+ 
+  -- Balint Reczey <balint at balintreczey.hu>  Mon, 23 Feb 2015 11:54:01 +0100
+ 
+ forked-daapd (22.0-1) unstable; urgency=medium
+ 
+   * Revert using pkg-config to determine FFmpeg linker flags
+     See #758337for details.
+   * Add watch file
+   * Build-depend on libgcrypt20-dev instead of libgcrypt11-dev which
+     became a transitional package
+   * New upstream version 22.0
+   * Enable last.fm scrobbling
+ 
+  -- Balint Reczey <balint at balintreczey.hu>  Sat, 18 Oct 2014 00:39:52 +0200
+ 
+ forked-daapd (21.0-2) unstable; urgency=medium
+ 
+   [ Espen Jürgensen ]
+   * Update package description
+ 
+   [ Andreas Cadhalpun ]
+   * Use pkg-config to determine FFmpeg linker flags (Closes: #758337)
+ 
+  -- Balint Reczey <balint at balintreczey.hu>  Sun, 17 Aug 2014 21:00:46 +0200
  
  forked-daapd (21.0-1) unstable; urgency=low
  
diff --combined debian/control
index 62f9cce,88b5d4e..97d070e
--- a/debian/control
+++ b/debian/control
@@@ -15,35 -15,36 +15,36 @@@ Build-Depends: debhelper (>= 9~)
   libavl-dev,
   libmxml-dev,
   libplist-dev (>= 0.16),
-  libgcrypt11-dev,
+  libgcrypt20-dev,
   libgpg-error-dev,
   libasound2-dev [linux-any],
   oss4-dev [kfreebsd-any],
   zlib1g-dev,
   libunistring-dev (>= 0.9.3),
   libtre-dev (>= 0.8.0),
 - libevent-dev (>= 2.0),
 + libevent-dev (>= 2.1.4~),
   libantlr3c-dev (>= 3.2),
   antlr3 (>= 3.2-3),
   gperf,
   autotools-dev,
   dh-autoreconf,
-  lsb-base (>= 3.0-6)
+  lsb-base (>= 3.0-6),
+  libcurl4-gnutls-dev
  Homepage: http://github.com/ejurgensen/forked-daapd
  Vcs-Git: git://git.debian.org/pkg-multimedia/forked-daapd.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/forked-daapd.git
- Standards-Version: 3.9.5
+ Standards-Version: 3.9.6
  
  Package: forked-daapd
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, avahi-daemon (>= 0.6.31-3~), adduser, psmisc
- Description: media server with support for RSP, DAAP, DACP and AirTunes
+ Description: DAAP/DACP (iTunes) server, support for AirPlay and Roku devices
   forked-daapd is an iTunes-compatible media server, originally intended
   as a rewrite of Firefly Media Server (also known as mt-daapd).
   .
   It supports a wide range of audio formats, can stream video to iTunes,
-  FrontRow and other compatible clients, has support for Apple's Remote
-  iPhone/iPod application and can stream music to AirTunes devices like
+  XBMC and other compatible clients, has support for Apple's Remote
+  iPhone/iPod application and can stream music to AirPlay devices like
   the AirPort Express.
   .
   It also features RSP support for Roku's SoundBridge devices.

-- 
forked-daapd packaging