[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-1-26-g7489c32

[Diane Trout]

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

The following commit has been merged in the master branch:
commit ff997f20e7e3fabf2fe3f9ba2808d1f76b15dd4a
Merge: 26d80d9feae895a0b0774e80687a0ee472bee43a a292ad6bf6a6be3d73a1b227363c5475677e35e1
Author: Diane Trout <diane at ghic.org>
Date:   Wed Sep 17 22:35:31 2014 -0700

    Merge branch 'experimental' into merged
    
    Maximiliano released a version while I was still working on this
    branch.
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  25 +
 debian/control                                     | 117 +++-
 debian/{expand_vars.awk => expand4qt5_vars.awk}    |   2 +-
 debian/libphonon4qt5-4.install                     |   2 +
 debian/libphonon4qt5-4.symbols                     | 717 +++++++++++++++++++++
 debian/libphonon4qt5-dev.install                   | 171 +++++
 debian/libphonon4qt5experimental-dev.install       |   9 +
 debian/libphonon4qt5experimental4.install          |   2 +
 debian/libphonon4qt5experimental4.symbols          | 191 ++++++
 debian/phonon4qt5-backend-null.README.Debian       |  19 +
 debian/phonon4qt5-backend-null.config              |   7 +
 debian/phonon4qt5-backend-null.dc-config.in        |  50 ++
 ...l.postinst => phonon4qt5-backend-null.postinst} |   0
 debian/phonon4qt5-backend-null.postrm              |  18 +
 debian/phonon4qt5-backend-null.templates           |  18 +
 debian/rules                                       |  41 +-
 16 files changed, 1377 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index eec50cf,9683876..fcb3815
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,29 +1,37 @@@
 -phonon (4:4.8.0-1) UNRELEASED; urgency=medium
++phonon (4:4.8.0-2) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Provide Qt 5 versions of the packages (Closes: #731936).
+     - Modify debian/rules to allow the double build.
+ 
+   [ Diane Trout]
+   * New upstream release
+   * add libqt5opengl5-dev to build dependencies.
+   * update SO versions to 4.8.0 for libphonon4qt5*.install
+   * Add myself to upoaders.
 -  * Update libphonon4.symbols
+   * phonon4qt5-backend-null should only conflict with other
+     phonon4qt5-backends.
+   * update libphonon4qt5-dev.install package
+   * Add symbols files for libphonon4qt5 and libphonon4qt5experimental4
+   * Add override_dh_strip target to correctly build libphonon-dbg (qt4)
+     and libphonon4qt5-dbg (qt5) debug packages.
+   * Add qttools5-dev to build qt5 phononwidgets designer support
+     library.
+   * Merge in changes from Kubuntu to support Qt5 debconf warning. 
+     (Done by jriddel)
+   * Rename libphonon4qt5 library to libphonon4qt5-4 to match soname
+ 
+  -- Diane Trout <diane at ghic.org>  Tue, 09 Sep 2014 10:55:34 -0700
+ 
 +phonon (4:4.8.0-1) unstable; urgency=medium
 +
 +  * Team upload.
 +
 +  * New upstream release (4.8.0).
 +  * Update symbols file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 17:15:34 +0200
 +
  phonon (4:4.7.2-1) unstable; urgency=low
  
    * Team upload.
diff --cc debian/control
index a4fbbcf,6bfbb5c..bf49b8f
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,11 +2,11 @@@ Source: phono
  Section: sound
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>
+ Uploaders: Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>,
+            Diane Trout <diane at ghic.org>
  Build-Depends: automoc,
                 cmake (>= 2.8.7),
 -               debhelper (>= 8.1.3~),
 +               debhelper (>= 9),
                 dpkg-dev (>= 1.15.5),
                 libglib2.0-dev,
                 libpulse-dev (>= 0.9.21),

-- 
Phonon Multimedia Framework packaging