Merge lp:~robru/qtmir/packaging into lp:qtmir

[Robert Bruce Park]

CI Train packaging cleanup.

Minor packaging cleanup for CI Train standards.

[Gerry Boland (gerboland)]

LGTM!

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2014-07-02 22:52:23 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True 

=== modified file 'debian/control'
--- debian/control	2014-07-02 21:54:56 +0000
+++ debian/control	2014-07-02 22:52:23 +0000
@@ -3,34 +3,35 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
-               pkg-config,
                google-mock (>= 1.6.0+svn437),
                libboost-system-dev,
                libfontconfig1-dev,
                libglib2.0-dev,
-               libqt5sensors5-dev,
+               libmirclient-dev (>= 0.4.0),
                libmirserver-dev (>= 0.4.0),
-               libmirclient-dev (>= 0.4.0),
                libprocess-cpp-dev,
-               libunity-api-dev (>= 7.80.6),
+               libqt5sensors5-dev,
                libubuntu-app-launch2-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
+               libunity-api-dev (>= 7.80.6),
                liburl-dispatcher1-dev,
+               libxkbcommon-dev,
                libxrender-dev,
-               libxkbcommon-dev,
                mircommon-dev,
+               pkg-config,
+               protobuf-compiler,
                qt5-default,
                qtbase5-dev,
                qtbase5-private-dev,
                qtdeclarative5-dev,
                qtdeclarative5-private-dev,
-               protobuf-compiler,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: https://launchpad.net/qtmir
-# If you aren't a member of ~mir-team but need to upload packaging changes,
-# just go ahead. ~mir-team will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~mir-team/qtmir/trunk
+# if you don't have have commit access to this branch but would like to upload
+# directly to Ubuntu, don't worry: your changes will be merged back into the
+# upstream branch
+Vcs-Bzr: lp:qtmir
 Vcs-Browser: http://bazaar.launchpad.net/~mir-team/unity-mir/trunk/files
 
 Package: libqtmir
@@ -45,5 +46,5 @@
           unity-application-impl,
           unity-application-impl-2,
 Description: Qt plugins for Unity specific Mir APIs
- QtMir provides Qt bindings for Mir features that are not exposed 
+ QtMir provides Qt bindings for Mir features that are not exposed
  through the QtUbuntu QPA plugins but needed for shell functionality.

=== modified file 'debian/copyright'
--- debian/copyright	2014-05-16 10:29:58 +0000
+++ debian/copyright	2014-07-02 22:52:23 +0000
@@ -29,7 +29,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  .
  On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'. 
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
 License: GPL-3
  This program is free software: you can redistribute it and/or modify

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2014-05-16 10:29:58 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1.0