[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-4-4-g62d582b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 62d582bb0d0be7506e58d98386ee91b8b1532118
Merge: 3bc74b56d5efab69dc66ab96e2cf1cc1bf4d31bf e91e40be2fba582d5159aa82d05a0562e4960cb1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 10 10:09:44 2015 -0300

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  8 +++++
 .../patches/do_not_assume_existing_backend.patch   | 40 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++
 3 files changed, 51 insertions(+)

diff --cc debian/changelog
index 7fb54f0,df8fa09..e09adec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,22 @@@
 +phonon (4:4.8.0-4) UNRELEASED; urgency=medium
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Add myself to Uploaders.
 +
 +  [ Rohan Garg ]
 +  * Update phonon_is_not_forced_in_KDE.diff so that the
 +    new include path is properly exported.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Oct 2014 14:03:01 -0300
 +
+ phonon (4:4.8.0-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add do_not_assume_existing_backend.patch to solve a crash when running
+     without a backend (Closes: #771138).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 27 Nov 2014 10:33:03 -0300
+ 
  phonon (4:4.8.0-3) unstable; urgency=medium
  
    * Remove debian/installgen, no longer used.

-- 
Phonon Multimedia Framework packaging