[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0.0-1+exp1-3-g387d4a0

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit 387d4a06548d0e4590bfb58cf2cac8b36708eca8
Merge: d9aa096d232ba9094ce3fbb51ae9e416985c59a5 e6b849d0bf459088a6619b5ace29f6b559055d0e
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Wed May 2 11:50:35 2012 +0300

    Merge remote-tracking branch 'origin/experimental'

 debian/changelog                         |   19 +++++++++++++++++++
 debian/control                           |   17 ++++++++++++-----
 debian/libphonon-dev.install             |   14 +++++++-------
 debian/libphonon4.install                |    4 ++--
 debian/libphononexperimental-dev.install |    2 +-
 debian/libphononexperimental4.install    |    4 ++--
 debian/patches/no_rpath.patch            |   13 +++++++------
 debian/phonon-backend-null.dc-config.in  |    3 ++-
 debian/rules                             |    4 +++-
 9 files changed, 55 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index e92b7c0,046c43b..cd49c13
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,29 @@@
 +phonon (4:4.6.0.0-2) UNRELEASED; urgency=low
 +
 +  [ Debconf translation updates ]
 +  * Polish (Michał Kułach). (Closes: #670645)
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 27 Apr 2012 18:11:46 +0200
 +
+ phonon (4:4.6.0.0-1+exp1) experimental; urgency=low
+ 
+   * Team upload.
+ 
+   [ Felix Geyer ]
+   * Convert for multiarch.
+     - Bump Build-Depends on Qt to >= 4.8.
+     - Bump Build-Depends on debhelper to >= 8.1.3~.
+     - Install libraries to multiarch paths.
+     - Mark libraries Multi-Arch:same.
+     - Change phonon and phonon-backend-null to arch:any and Multi-Arch:same.
+     - Update no_rpath.patch to include multiarch lib paths.
+     - Fix debconf prompt to cope with multi-arch:same packages.
+ 
+   [ Didier Raboud ]
+   * Bump Standards-Version to 3.9.3 without changes needed.
+ 
+  -- Didier Raboud <odyx at debian.org>  Tue, 24 Apr 2012 17:15:50 +0200
+ 
  phonon (4:4.6.0.0-1) unstable; urgency=low
  
    * New upstream release (4.6.0):

-- 
Phonon Multimedia Framework packaging