[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.3-1-5-g2636a1a

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=2636a1a

The following commit has been merged in the master branch:
commit 2636a1a62b728e57976ea29111ed1cf6ef256286
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Aug 28 18:33:52 2015 +0200

    Correctly display the recommended backend in phonon4qt5-backend-null debconf warning.
---
 debian/changelog                         | 2 ++
 debian/phonon4qt5-backend-null.templates | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94bb8ed..0fa3be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ phonon (4:4.8.3-2) UNRELEASED; urgency=medium
   * Make some symbols in libphonon4qt5 create a dependency on phonon4qt5
     similar to libphonon4.
   * Fix dependency of phonon4qt5: phonon-backend -> phonon4qt5-backend
+  * Correctly display the recommended backend in phonon4qt5-backend-null
+    debconf warning.
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 17 Aug 2015 18:43:26 +0200
 
diff --git a/debian/phonon4qt5-backend-null.templates b/debian/phonon4qt5-backend-null.templates
index 7dd0432..b003332 100644
--- a/debian/phonon4qt5-backend-null.templates
+++ b/debian/phonon4qt5-backend-null.templates
@@ -15,4 +15,4 @@ _Description: Missing back-end for Phonon4Qt5
  To restore full Phonon4Qt5 multimedia capabilities, install one of the real
  Phonon4Qt5 back-end packages which are currently available for this system:
  .
- ${recommended_backend} (recommended)${other_backends}
+ ${recommended4qt5_backend} (recommended)${other_backends}

-- 
Phonon Multimedia Framework packaging