Merge lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src_5.0.2 into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

[Dimitri John Ledkov]

[Timo Jyrinki (timo-jyrinki)]

This merge request does not make sense, as the main branch is the 5.1.1 packaging branch.

lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src_5.0.2 is ready to be sponsored as is (with the existing orig tarball).

review: Disapprove

[Timo Jyrinki (timo-jyrinki)]

You can branch the ubuntu branch and copy the contents of the 5.0.2 branch on top of that to update its packaging.

Unmerged revisions

49. By Timo Jyrinki on 2013-10-11

Drop Qt Audio Engine for now to not bring OpenAL dependency

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-02 12:53:00 +0000
+++ debian/changelog	2013-10-24 18:47:30 +0000
@@ -3,12 +3,16 @@
   * New upstream release
   * Update *.install
   * Add libqt5multimedia5-plugins dependency to QML plugin (LP: #1202996)
+<<<<<<< TREE
   * Merge Debian packaging 5.1.1-1, remaining changes:
     - Keep package transition provide/conflicts/replaces for upgrades
     - Keep the private headers package 
   * Update amd64 symbols
+=======
+  * Drop Qt Audio Engine for now to not bring OpenAL dependency
+>>>>>>> MERGE-SOURCE
 
- -- Timo Jyrinki <[e-mail]>  Mon, 05 Aug 2013 11:48:22 +0300
+ -- Timo Jyrinki <[e-mail]>  Fri, 11 Oct 2013 08:13:50 +0300
 
 qtmultimedia-opensource-src (5.1.1-1) unstable; urgency=low
 
 
=== modified file 'debian/control'
=== modified file 'debian/qtmultimedia5-examples.install'
--- debian/qtmultimedia5-examples.install	2013-10-24 06:12:52 +0000
+++ debian/qtmultimedia5-examples.install	2013-10-24 18:47:30 +0000
@@ -9,6 +9,10 @@
 usr/lib/*/qt5/examples/multimedia/audiodevices/audiodevices.pro
 usr/lib/*/qt5/examples/multimedia/audiodevices/audiodevicesbase.ui
 usr/lib/*/qt5/examples/multimedia/audiodevices/main.cpp
+<<<<<<< TREE
+=======
+usr/lib/*/qt5/examples/multimedia/audioinput/audioinput
+>>>>>>> MERGE-SOURCE
 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.cpp
 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.h
 usr/lib/*/qt5/examples/multimedia/audioinput/audioinput.pro