Merge lp:~sil2100/unity-mir/fix_packaging into lp:unity-mir

[Łukasz Zemczak]

Some packaging changes noted by distro: no need for a manual -dbg package, fix stylistic issues, add missing stanza and remove the explicit depends to libmir*1 - shlibs is enough

Some packaging changes noted by distro: no need for a manual -dbg package, fix stylistic issues, add missing stanza and remove the explicit depends to libmir*1 - shlibs is enough

[Didier Roche-Tolomelli (didrocks)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-autolanding/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-autolanding/7/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/15/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-08-14 14:11:21 +0000
+++ debian/control	2013-08-19 07:47:29 +0000
@@ -19,40 +19,23 @@
 Vcs-Browser: http://bazaar.launchpad.net/~mir-team/unity-mir/trunk/files
 
 Package: libunity-mir1
-Section: libs
-Replaces: unity-mir
-Conflicts: unity-mir
-Provides: unity-mir
-Architecture: i386 amd64 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libmirserver1,
-         libmirclient1,
-         libubuntu-application-api-mirserver1,
-         libubuntu-application-api-mirclient1,
-         libqt5core5,
+Replaces: unity-mir,
+Conflicts: unity-mir,
+Provides: unity-mir,
 Description: Qt plugins for Unity specific Mir APIs
  Unity-Mir provides Qt bindings for Mir features that are not exposed 
  through the QtUbuntu QPA plugins but needed for shell functionality.
 
-Package: libunity-mir1-dbg
-Section: debug
-Architecture: i386 amd64 armhf
-Priority: extra
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libunity-mir1 (= ${binary:Version}),
-Description: Qt plugins for Unity specific Mir APIs - debugging symbols
- Unity-Mir provides Qt bindings for Mir features that are not exposed 
- through the QtUbuntu QPA plugins but needed for shell functionality.
- .
- This package provides the debugging symbols for libunity-mir1.
-
 Package: libunity-mir-dev
 Section: libdevel
-Architecture: i386 amd64 armhf
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libunity-mir1 (= ${binary:Version}),

=== modified file 'debian/rules'
--- debian/rules	2013-07-25 13:24:00 +0000
+++ debian/rules	2013-08-19 07:47:29 +0000
@@ -9,7 +9,3 @@
 # Force the build to generate debug symbols, so we can have -dbgsym packages
 override_dh_auto_configure:
 	dh_auto_configure -- QMAKE_CXXFLAGS=-g
-
-.PHONY: override_dh_strip
-override_dh_strip:
-	dh_strip --dbg-package=libunity-mir1-dbg