Merge lp:~phablet-team/qtubuntu-camera/version-bump into lp:qtubuntu-camera/stable

[Jim Hodapp]

No change rebuild and version bump.

No change rebuild and version bump.

[lp:~phablet-team/qtubuntu-camera/version-bump]

150. By Jim Hodapp on 2015-08-10

Update dependency version requirement for libqtubuntu-media-signals

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[lp:~phablet-team/qtubuntu-camera/version-bump]

151. By Jim Hodapp on 2015-08-28

Merge with stable branch and resolved merge conflict

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-21 20:46:38 +0000
+++ debian/changelog	2015-08-28 13:50:58 +0000
@@ -1,3 +1,20 @@
+qtubuntu-camera (0.3.3+15.04.20150710-0ubuntu2) UNRELEASED; urgency=medium
+
+  * No change rebuild since qtubuntu-media-signals was rebuilt 
+
+ -- Jim Hodapp <[e-mail]>  Mon, 10 Aug 2015 09:30:48 -0400
+
+qtubuntu-camera (0.3.3+15.04.20150710-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Jim Hodapp ]
+  * Update the required version of qtubuntu-media-signals and relink
+    qtubuntu-camera so that it doesn't break the camera-app.
+
+ -- CI Train Bot <[e-mail]>  Fri, 10 Jul 2015 18:12:33 +0000
+
 qtubuntu-camera (0.3.3+15.04.20150821.3-0ubuntu1) vivid; urgency=medium
 
   * New rebuild forced.

=== modified file 'debian/control'
--- debian/control	2015-08-21 19:32:17 +0000
+++ debian/control	2015-08-28 13:50:58 +0000
@@ -8,7 +8,7 @@
                libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu34),
                libpulse-dev,
                libqt5opengl5-dev,
-               libqtubuntu-media-signals-dev (>=0.3+15.04.20141104-0ubuntu1),
+               libqtubuntu-media-signals-dev (>=0.3+15.04.20150618.1-0ubuntu1),
                pkg-config,
                qt5-default,
                qtmultimedia5-dev,