Merge lp:~sil2100/ubuntu-download-manager/fix_deps into lp:ubuntu-download-manager

[Łukasz Zemczak]

Fix dependencies for the -dev packages, and then fix some minor packaging issues

Fix dependencies for the -dev packages, and then fix some minor packaging issues

[Didier Roche-Tolomelli (didrocks)]

looks good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/245

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/356/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-02-10 20:49:03 +0000
+++ debian/control	2014-02-14 17:39:12 +0000
@@ -10,7 +10,7 @@
                libqt5sql5-sqlite,
                libnih-dbus-dev,
                libgoogle-glog-dev,
-               dbus-test-runner
+               dbus-test-runner,
 Maintainer: Manuel de la Peña <[e-mail]>
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/ubuntu-system-image
@@ -29,19 +29,21 @@
 Description: Ubuntu Download Manager - shared common library
  Ubuntu Download Manager performs downloads from a centralized location.
  .
- This package includes the common shared library between the client lib and and the service lib.
+ This package includes the common shared library between the client lib and the
+ service lib.
 
 Package: libubuntu-download-manager-common-dev
 Section: libdevel
 Architecture: any
 Depends: libubuntu-download-manager-common0 (= ${binary:Version}),
+         qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
 Breaks: ubuntu-download-manager-common-dev
 Replaces: ubuntu-download-manager-common-dev
 Description: QT library for Ubuntu Download Manager - development files
- .
- This package contains the common headers shared between the client library and the daemon library.
+ This package contains the common headers shared between the client library and
+ the daemon library.
 
 Package: libubuntu-download-manager-priv0
 Section: libs
@@ -51,7 +53,7 @@
          libubuntu-download-manager-common0 (= ${binary:Version}),
 Breaks: ubuntu-download-manager-priv1
 Replaces: ubuntu-download-manager-priv1
-Description: Ubuntu Download Manager - shared library
+Description: Ubuntu Download Manager - shared private library
  Ubuntu Download Manager performs downloads from a centralized location.
  .
  This package includes the private shared library.
@@ -64,7 +66,7 @@
          libubuntu-download-manager-common0 (= ${binary:Version}),
 Breaks: ubuntu-download-manager-client1
 Replaces: ubuntu-download-manager-client1
-Description: Ubuntu Download Manager - shared library
+Description: Ubuntu Download Manager - shared public library
  Ubuntu Download Manager performs downloads from a centralized location.
  .
  This package includes the public shared library.
@@ -74,13 +76,14 @@
 Architecture: any
 Depends: libubuntu-download-manager-common-dev (= ${binary:Version}),
          libubuntu-download-manager-client0 (= ${binary:Version}),
+         qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
 Breaks: ubuntu-download-manager-client-dev
 Replaces: ubuntu-download-manager-client-dev
 Description: QT library for Ubuntu Download Manager - development files
- .
- This package contains the header that can be used to allow an application use the Ubuntu Download Manager client library.
+ This package contains the header that can be used to allow an application use
+ the Ubuntu Download Manager client library.
 
 Package: ubuntu-download-manager
 Section: net

=== modified file 'debian/rules'
--- debian/rules	2013-07-19 13:45:16 +0000
+++ debian/rules	2014-02-14 17:39:12 +0000
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 dh_auto_install: