[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=2c78854

The following commit has been merged in the experimental branch:
commit 2c78854076fb229ac123b9f1b90316ca95a894f2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 28 23:59:27 2014 -0300

    Fix merge problems.
---
 debian/changelog | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2e9a78..eb1b580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 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
@@ -15,30 +14,11 @@ qtmultimedia-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * 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