[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.2.1-3-17-g2c78854

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=10b6969

The following commit has been merged in the experimental branch:
commit 10b69697936e63d296268bfa9c83d3b1edade38f
Merge: 7765ae41b52a3661c412e6bcdce2700cda8004c4 9948d05fc932956310e7371a47e7385dba8dc4ba
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 28 23:58:14 2014 -0300

    Merge branch 'experimental' of git+ssh://git.debian.org/git/pkg-kde/qt/qtmultimedia into experimental

 debian/changelog | 21 +++++++++++++++++++++
 debian/copyright |  4 ++++
 2 files changed, 25 insertions(+)

diff --cc debian/changelog
index 64a4acf,65b4d95..d2e9a78
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,23 +1,44 @@@
  qtmultimedia-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
  
++<<<<<<<
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * New upstream release.
 +  * Add config.tests/mmrenderer/* to debian/copyright. Thanks Scott Kitterman
 +    for noticing!
 +  * Bump Qt build dependencies.
 +  * Move headers to their new multi arch path. Mark development package as
 +    Multi-Arch: same.
 +  * Remove transitional packages, they are no longer needed.
 +  * Fix path for removing private headers.
 +  * Do not override dh_builddeb, xz is now the default method.
 +  * Remove gstreamer_cleanup_system_includes.patch, applied upstream.
 +  * Do not install private stuff.
 +  * Fix install file with new headers.
 +  * Update symbols files with current build log.
 +
 +  [ Pino Toscano ]
 +  * Enable RPATH in the spectrum example also on kFreeBSD and Hurd; patch
 +    rpath_nonlinux.diff. (Closes: #748816)
++=======
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * New upstream release.
+   * Add config.tests/mmrenderer/* to debian/copyright. Thanks Scott Kitterman
+     for noticing!
+   * Bump Qt build dependencies.
+   * Move headers to their new multi arch path. Mark development package as
+     Multi-Arch: same.
+   * Remove transitional packages, they are no longer needed.
+   * Fix path for removing private headers.
+   * Do not override dh_builddeb, xz is now the default method.
+   * Remove gstreamer_cleanup_system_includes.patch, applied upstream.
+   * Do not install private stuff.
+   * Fix install file with new headers.
+   * Update debian/copyright.
+ 
+   [ Pino Toscano ]
+   * Enable RPATH in the spectrum example also on kFreeBSD and Hurd; patch
+     rpath_nonlinux.diff. (Closes: #748816)
++>>>>>>>
  
   -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Apr 2014 15:14:16 -0300
  

-- 
qtmultimedia packaging