Merge lp:~mandel/ubuntu-download-manager/add-common-lib into lp:ubuntu-download-manager

[Manuel de la Peña]

Add a common library to be used by the client library and the daemon side lib.

Add a common library to be used by the client library and the daemon side lib.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

Looks good

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-10-29 13:42:44 +0000
+++ .bzrignore	2013-12-20 23:43:17 +0000
@@ -8,3 +8,7 @@
 ubuntu-download-manager/ubuntu-download-manager
 ubuntu-download-manager-tests/ubuntu-download-manager-tests
 moc_*
+libubuntudownloadmanager-common/libubuntudownloadmanager-common.so
+libubuntudownloadmanager-common/libubuntudownloadmanager-common.so.1
+libubuntudownloadmanager-common/libubuntudownloadmanager-common.so.1.0
+libubuntudownloadmanager-common/libubuntudownloadmanager-common.so.1.0.0

=== added file 'common-installs-config.pri'
--- common-installs-config.pri	1970-01-01 00:00:00 +0000
+++ common-installs-config.pri	2013-12-20 23:43:17 +0000
@@ -0,0 +1,44 @@
+#-----------------------------------------------------------------------------
+# Common installation configuration for all projects.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# default installation target for applications
+#-----------------------------------------------------------------------------
+contains( TEMPLATE, app ) {
+    target.path  = $${INSTALL_PREFIX}/bin
+    INSTALLS    += target
+    message("====")
+    message("==== INSTALLS += target")
+}
+
+#-----------------------------------------------------------------------------
+# default installation target for libraries
+#-----------------------------------------------------------------------------
+contains( TEMPLATE, lib ) {
+
+    target.path  = $${INSTALL_LIBDIR}
+    INSTALLS    += target
+    message("====")
+    message("==== INSTALLS += target")
+
+    # reset the .pc file's `prefix' variable
+    #include( tools/fix-pc-prefix.pri )
+
+}
+
+#-----------------------------------------------------------------------------
+# target for header files
+#-----------------------------------------------------------------------------
+!isEmpty( headers.files ) {
+    headers.path  = $${INSTALL_PREFIX}/include/ubuntu/download_manager
+    INSTALLS     += headers
+    message("====")
+    message("==== INSTALLS += headers")
+} else {
+    message("====")
+    message("==== NOTE: Remember to add your API headers into `headers.files' for installation!")
+}
+
+
+# End of File

=== added file 'common-pkgconfig.pri'
--- common-pkgconfig.pri	1970-01-01 00:00:00 +0000
+++ common-pkgconfig.pri	2013-12-20 23:43:17 +0000
@@ -0,0 +1,10 @@
+# Include this file after defining the pkgconfig.files variable
+
+!isEmpty(pkgconfig.files) {
+    QMAKE_SUBSTITUTES += $${pkgconfig.files}.in
+    pkgconfig.CONFIG = no_check_exist
+    pkgconfig.path  = $${INSTALL_LIBDIR}/pkgconfig
+    QMAKE_EXTRA_TARGETS += pkgconfig
+
+    QMAKE_CLEAN += $${pkgconfig.files}
+}

=== added file 'common-project-config.pri'
--- common-project-config.pri	1970-01-01 00:00:00 +0000
+++ common-project-config.pri	2013-12-20 23:43:17 +0000
@@ -0,0 +1,47 @@
+#-----------------------------------------------------------------------------
+# Common configuration for all projects.
+#-----------------------------------------------------------------------------
+
+QT             -= gui
+CONFIG         += link_pkgconfig
+
+TOP_SRC_DIR     = $$PWD
+TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$${BUILD_DIR}
+QMAKE_LIBDIR   += $${TOP_BUILD_DIR}
+INCLUDEPATH    += $${TOP_SRC_DIR}
+QMAKE_CXXFLAGS +=  -std=c++11 -Werror
+
+#-----------------------------------------------------------------------------
+# setup the installation prefix
+#-----------------------------------------------------------------------------
+INSTALL_PREFIX = /usr  # default installation prefix
+
+# default prefix can be overriden by defining PREFIX when running qmake
+isEmpty( PREFIX ) {
+    message("====")
+    message("==== NOTE: To override the installation path run: `qmake PREFIX=/custom/path'")
+    message("==== (current installation path is `$${INSTALL_PREFIX}')")
+} else {
+    INSTALL_PREFIX = $${PREFIX}
+    message("====")
+    message("==== install prefix set to `$${INSTALL_PREFIX}'")
+}
+
+INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
+
+# default library directory can be overriden by defining LIBDIR when
+# running qmake
+isEmpty( LIBDIR ) {
+    message("====")
+    message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'")
+    message("==== (current installation path is `$${INSTALL_LIBDIR}')")
+} else {
+    INSTALL_LIBDIR = $${LIBDIR}
+    message("====")
+    message("==== library install path set to `$${INSTALL_LIBDIR}'")
+}
+
+include( coverage.pri )
+
+# End of File
+

=== added file 'common-vars.pri'
--- common-vars.pri	1970-01-01 00:00:00 +0000
+++ common-vars.pri	2013-12-20 23:43:17 +0000
@@ -0,0 +1,21 @@
+#-----------------------------------------------------------------------------
+# Common variables for all projects.
+#-----------------------------------------------------------------------------
+DEFINES += BUILDING_UBUNTU_DOWNLOAD_MANAGER
+
+
+#-----------------------------------------------------------------------------
+# Project name (used e.g. in include file and doc install path).
+#-----------------------------------------------------------------------------
+PROJECT_NAME = ubuntu-download-manager
+
+
+#-----------------------------------------------------------------------------
+# Project version
+#-----------------------------------------------------------------------------
+PROJECT_VERSION = 0.3
+
+#-----------------------------------------------------------------------------
+# Library version
+#-----------------------------------------------------------------------------
+VERSION = 0.3

=== modified file 'debian/control'
--- debian/control	2013-09-23 11:22:48 +0000
+++ debian/control	2013-12-20 23:43:17 +0000
@@ -17,11 +17,22 @@
 # upstream branch
 Vcs-Bzr: lp:ubuntu-download-manager
 
-Package: libubuntudownloadmanager1
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Package: ubuntu-download-manager-common1
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+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.
+
+Package: ubuntu-download-manager-priv1
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ubuntu-download-manager-common1 (= ${binary:Version}),
 Description: Ubuntu Download Manager - shared library
  Ubuntu Download Manager performs downloads from a centralized location.
  .
@@ -32,7 +43,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libubuntudownloadmanager1 (= ${binary:Version}),
+         ubuntu-download-manager-priv1 (= ${binary:Version}),
 Description: Ubuntu Download Manager - daemon
  Ubuntu Download Manager performs downloads from a centralized location.
  .

=== added file 'debian/ubuntu-download-manager-common-dev.install'
--- debian/ubuntu-download-manager-common-dev.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-download-manager-common-dev.install	2013-12-20 23:43:17 +0000
@@ -0,0 +1,5 @@
+usr/include/ubuntu/download_manager/metatypes.h
+usr/include/ubuntu/download_manager/download_struct.h
+usr/include/ubuntu/download_manager/group_download_struct.h
+usr/lib/*/libubuntu-download-manager-common.so
+usr/lib/*/pkgconfig/ubuntu-download-manager-common.pc

=== added file 'debian/ubuntu-download-manager-common1.install'
--- debian/ubuntu-download-manager-common1.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-download-manager-common1.install	2013-12-20 23:43:17 +0000
@@ -0,0 +1,1 @@
+usr/lib/libubuntu-download-manager-common.so.*

=== renamed file 'debian/libubuntudownloadmanager1.install' => 'debian/ubuntu-download-manager-priv1.install'
--- debian/libubuntudownloadmanager1.install	2013-07-18 19:56:30 +0000
+++ debian/ubuntu-download-manager-priv1.install	2013-12-20 23:43:17 +0000
@@ -1,1 +1,1 @@
-usr/lib/libubuntudownloadmanager.so.*
+usr/lib/libubuntu-download-manager-priv.so.*

=== modified file 'download-manager.pro'
--- download-manager.pro	2013-07-03 11:02:59 +0000
+++ download-manager.pro	2013-12-20 23:43:17 +0000
@@ -4,10 +4,13 @@
 CONFIG += ordered
 
 SUBDIRS += \
-    libubuntudownloadmanager \
+    ubuntu-download-manager-common \
+    ubuntu-download-manager-priv \
     ubuntu-download-manager \
     ubuntu-download-manager-tests
 
-ubuntu-download-manager.depends = libubuntudownloadmanager
-
-ubuntu-download-manager-tests.depends = libubuntudownloadmanager
+ubuntu-download-manager-priv.depends = ubuntu-download-manager-common
+
+ubuntu-download-manager.depends = ubuntu-download-manager-priv
+
+ubuntu-download-manager-tests.depends = ubuntu-download-manager-priv

=== added directory 'ubuntu-download-manager-common'
=== added directory 'ubuntu-download-manager-common/ubuntu'
=== added file 'ubuntu-download-manager-common/ubuntu-download-manager-common.pc.in'
--- ubuntu-download-manager-common/ubuntu-download-manager-common.pc.in	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-common/ubuntu-download-manager-common.pc.in	2013-12-20 23:43:17 +0000
@@ -0,0 +1,12 @@
+prefix=$$INSTALL_PREFIX
+exec_prefix=${prefix}
+libdir=$$INSTALL_LIBDIR
+includedir=${prefix}/include/ubuntu/download_manager
+
+Name: ubuntu-download-manager-common
+Description: Common Ubuntu Download Manager lib
+Version: $$PROJECT_VERSION
+Libs: -L${libdir} -lubuntu-download-manager-common
+Requires: Qt5Core Qt5DBus
+Cflags:  -I${includedir}
+

=== added file 'ubuntu-download-manager-common/ubuntu-download-manager-common.pro'
--- ubuntu-download-manager-common/ubuntu-download-manager-common.pro	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-common/ubuntu-download-manager-common.pro	2013-12-20 23:43:17 +0000
@@ -0,0 +1,39 @@
+include( ../common-project-config.pri )
+include( ../common-vars.pri )
+
+QT       += dbus
+QT       -= gui
+
+TARGET = ubuntu-download-manager-common
+TEMPLATE = lib
+
+DEFINES += LIBUBUNTUDOWNLOADMANAGERCOMMON_LIBRARY
+
+SOURCES += \
+    ubuntu/download_manager/download_struct.cpp \
+    ubuntu/download_manager/group_download_struct.cpp \
+    ubuntu/download_manager/system/hash_algorithm.cpp
+
+public_headers = \
+    ubuntu/download_manager/metatypes.h \
+    ubuntu/download_manager/download_struct.h \
+    ubuntu/download_manager/group_download_struct.h
+
+private_headers = \
+    ubuntu_download_manager_common_global.h \
+    ubuntu/download_manager/system/hash_algorithm.h
+
+HEADERS +=\
+    $$public_headers \
+    $$private_headers
+
+headers.files = $$public_headers
+
+include(../common-installs-config.pri)
+
+pkgconfig.files = ubuntu-download-manager-common.pc
+include(../common-pkgconfig.pri)
+INSTALLS += pkgconfig
+
+OTHER_FILES += \
+    ubuntu-download-manager-common.pc.in

=== added directory 'ubuntu-download-manager-common/ubuntu/download_manager'
=== renamed file 'libubuntudownloadmanager/downloads/download_struct.cpp' => 'ubuntu-download-manager-common/ubuntu/download_manager/download_struct.cpp'
--- libubuntudownloadmanager/downloads/download_struct.cpp	2013-10-25 11:44:53 +0000
+++ ubuntu-download-manager-common/ubuntu/download_manager/download_struct.cpp	2013-12-20 23:43:17 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "downloads/download_struct.h"
+#include "download_struct.h"
 
 namespace Ubuntu {
 

=== renamed file 'libubuntudownloadmanager/downloads/download_struct.h' => 'ubuntu-download-manager-common/ubuntu/download_manager/download_struct.h'
=== renamed file 'libubuntudownloadmanager/downloads/group_download_struct.cpp' => 'ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.cpp'
--- libubuntudownloadmanager/downloads/group_download_struct.cpp	2013-10-25 11:44:53 +0000
+++ ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.cpp	2013-12-20 23:43:17 +0000
@@ -17,7 +17,7 @@
  */
 
 #include <QDBusMetaType>
-#include "downloads/group_download_struct.h"
+#include "group_download_struct.h"
 #include "system/hash_algorithm.h"
 
 namespace Ubuntu {

=== renamed file 'libubuntudownloadmanager/downloads/group_download_struct.h' => 'ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.h'
=== renamed file 'libubuntudownloadmanager/metatypes.h' => 'ubuntu-download-manager-common/ubuntu/download_manager/metatypes.h'
--- libubuntudownloadmanager/metatypes.h	2013-12-13 13:23:18 +0000
+++ ubuntu-download-manager-common/ubuntu/download_manager/metatypes.h	2013-12-20 23:43:17 +0000
@@ -21,8 +21,8 @@
 
 #include <QMap>
 #include <QList>
-#include "downloads/group_download_struct.h"
-#include "downloads/download_struct.h"
+#include "group_download_struct.h"
+#include "download_struct.h"
 
 using namespace Ubuntu::DownloadManager;
 

=== added directory 'ubuntu-download-manager-common/ubuntu/download_manager/system'
=== renamed file 'libubuntudownloadmanager/system/hash_algorithm.cpp' => 'ubuntu-download-manager-common/ubuntu/download_manager/system/hash_algorithm.cpp'
=== renamed file 'libubuntudownloadmanager/system/hash_algorithm.h' => 'ubuntu-download-manager-common/ubuntu/download_manager/system/hash_algorithm.h'
=== added file 'ubuntu-download-manager-common/ubuntu_download_manager_common_global.h'
--- ubuntu-download-manager-common/ubuntu_download_manager_common_global.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-common/ubuntu_download_manager_common_global.h	2013-12-20 23:43:17 +0000
@@ -0,0 +1,12 @@
+#ifndef LIBUBUNTUDOWNLOADMANAGERCOMMON_GLOBAL_H
+#define LIBUBUNTUDOWNLOADMANAGERCOMMON_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(LIBUBUNTUDOWNLOADMANAGERCOMMON_LIBRARY)
+#  define LIBUBUNTUDOWNLOADMANAGERCOMMONSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define LIBUBUNTUDOWNLOADMANAGERCOMMONSHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // LIBUBUNTUDOWNLOADMANAGERCOMMON_GLOBAL_H

=== renamed directory 'libubuntudownloadmanager' => 'ubuntu-download-manager-priv'
=== modified file 'ubuntu-download-manager-priv/downloads/download_adaptor.h'
--- libubuntudownloadmanager/downloads/download_adaptor.h	2013-11-07 00:35:48 +0000
+++ ubuntu-download-manager-priv/downloads/download_adaptor.h	2013-12-20 23:43:17 +0000
@@ -14,7 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
-#include "metatypes.h"
+#include <ubuntu/download_manager/metatypes.h>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;

=== modified file 'ubuntu-download-manager-priv/downloads/download_manager_adaptor.h'
--- libubuntudownloadmanager/downloads/download_manager_adaptor.h	2013-10-25 11:44:53 +0000
+++ ubuntu-download-manager-priv/downloads/download_manager_adaptor.h	2013-12-20 23:43:17 +0000
@@ -14,7 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
-#include "metatypes.h"
+#include <ubuntu/download_manager/metatypes.h>
 QT_BEGIN_NAMESPACE
 class QByteArray;
 template<class T> class QList;

=== modified file 'ubuntu-download-manager-priv/downloads/downloads_db.cpp'
--- libubuntudownloadmanager/downloads/downloads_db.cpp	2013-12-17 15:57:52 +0000
+++ ubuntu-download-manager-priv/downloads/downloads_db.cpp	2013-12-20 23:43:17 +0000
@@ -25,8 +25,8 @@
 #include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QSqlError>
+#include <ubuntu/download_manager/system/hash_algorithm.h>
 #include "downloads/downloads_db.h"
-#include "system/hash_algorithm.h"
 #include "system/logger.h"
 
 #define SINGLE_DOWNLOAD_TABLE "CREATE TABLE SingleDownload("\
@@ -125,7 +125,11 @@
 DownloadsDb::init() {
     TRACE;
     // create the required tables
-    qDebug() << "open the db" << _db.open();
+    bool opened = _db.open();
+    if (!opened) {
+        qCritical() << _db.lastError();
+        return false;
+    }
 
     _db.transaction();
 
@@ -190,8 +194,8 @@
 
 QString
 DownloadsDb::metadataToString(const QVariantMap& metadata) {
-    QJsonDocument json = QJsonDocument::fromVariant(QVariant(metadata));
-    return QString(json.toJson());
+    QJsonDocument jsonDoc = QJsonDocument::fromVariant(QVariant(metadata));
+    return QString(jsonDoc.toJson());
 }
 
 QString
@@ -200,15 +204,20 @@
     foreach(const QString& key, headers.keys()) {
         headersVariant[key] = headers[key];
     }
-    QJsonDocument json = QJsonDocument::fromVariant(
+    QJsonDocument jsonDoc = QJsonDocument::fromVariant(
         QVariant(headersVariant));
-    return QString(json.toJson());
+    return QString(jsonDoc.toJson());
 }
 
 bool
 DownloadsDb::storeSingleDownload(FileDownload* download) {
     // decide if we store it as a new download or update an existing one
-    _db.open();
+    bool opened = _db.open();
+
+    if (!opened) {
+        qCritical() << _db.lastError();
+        return false;
+    }
 
     QSqlQuery query;
     query.prepare(PRESENT_SINGLE_DOWNLOAD);

=== modified file 'ubuntu-download-manager-priv/downloads/factory.h'
--- libubuntudownloadmanager/downloads/factory.h	2013-11-28 15:31:10 +0000
+++ ubuntu-download-manager-priv/downloads/factory.h	2013-12-20 23:43:17 +0000
@@ -20,7 +20,7 @@
 #define DOWNLOADER_LIB_DOWNLOAD_FACTORY_H
 
 #include <QObject>
-#include "metatypes.h"
+#include <ubuntu/download_manager/metatypes.h>
 #include "downloads/download.h"
 #include "system/apparmor.h"
 #include "system/system_network_info.h"

=== modified file 'ubuntu-download-manager-priv/downloads/file_download.cpp'
--- libubuntudownloadmanager/downloads/file_download.cpp	2013-12-19 13:09:05 +0000
+++ ubuntu-download-manager-priv/downloads/file_download.cpp	2013-12-20 23:43:17 +0000
@@ -24,8 +24,8 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QSslError>
+#include <ubuntu/download_manager/system/hash_algorithm.h>
 #include "downloads/file_download.h"
-#include "system/hash_algorithm.h"
 #include "system/logger.h"
 #include "system/network_reply.h"
 
@@ -234,7 +234,6 @@
     if (!flushFile()) {
         return;
     }
-
     qulonglong received = _currentData->size();
 
     if (bytesTotal == -1) {

=== modified file 'ubuntu-download-manager-priv/downloads/file_download.h'
--- libubuntudownloadmanager/downloads/file_download.h	2013-12-19 13:09:05 +0000
+++ ubuntu-download-manager-priv/downloads/file_download.h	2013-12-20 23:43:17 +0000
@@ -19,6 +19,7 @@
 #ifndef DOWNLOADER_LIB_SINGLE_DOWNLOAD_H
 #define DOWNLOADER_LIB_SINGLE_DOWNLOAD_H
 
+#include <QFile>
 #include <QNetworkReply>
 #include <QProcess>
 #include <QSharedPointer>

=== modified file 'ubuntu-download-manager-priv/downloads/group_download.cpp'
--- libubuntudownloadmanager/downloads/group_download.cpp	2013-12-02 11:05:31 +0000
+++ ubuntu-download-manager-priv/downloads/group_download.cpp	2013-12-20 23:43:17 +0000
@@ -17,10 +17,10 @@
  */
 
 #include <QDebug>
+#include <ubuntu/download_manager/system/hash_algorithm.h>
 #include "downloads/download_adaptor.h"
 #include "downloads/file_download.h"
 #include "downloads/group_download.h"
-#include "system/hash_algorithm.h"
 #include "system/logger.h"
 #include "system/uuid_factory.h"
 

=== modified file 'ubuntu-download-manager-priv/downloads/group_download.h'
--- libubuntudownloadmanager/downloads/group_download.h	2013-11-28 11:46:34 +0000
+++ ubuntu-download-manager-priv/downloads/group_download.h	2013-12-20 23:43:17 +0000
@@ -23,10 +23,10 @@
 #include <QList>
 #include <QObject>
 #include <QSharedPointer>
+#include <ubuntu/download_manager/group_download_struct.h>
 #include "downloads/download.h"
 #include "downloads/factory.h"
 #include "downloads/file_download.h"
-#include "downloads/group_download_struct.h"
 #include "system/file_manager.h"
 
 namespace Ubuntu {

=== modified file 'ubuntu-download-manager-priv/downloads/group_download_adaptor.h'
--- libubuntudownloadmanager/downloads/group_download_adaptor.h	2013-11-07 00:42:08 +0000
+++ ubuntu-download-manager-priv/downloads/group_download_adaptor.h	2013-12-20 23:43:17 +0000
@@ -14,7 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
-#include "metatypes.h"
+#include <ubuntu/download_manager/metatypes.h>
 QT_BEGIN_NAMESPACE
 class QByteArray;
 template<class T> class QList;

=== modified file 'ubuntu-download-manager-priv/downloads/manager.h'
--- libubuntudownloadmanager/downloads/manager.h	2013-11-29 11:44:07 +0000
+++ ubuntu-download-manager-priv/downloads/manager.h	2013-12-20 23:43:17 +0000
@@ -24,7 +24,7 @@
 #include <QtDBus/QDBusObjectPath>
 #include <QtDBus/QDBusContext>
 #include <QSslCertificate>
-#include "metatypes.h"
+#include <ubuntu/download_manager/metatypes.h>
 #include "downloads/download.h"
 #include "downloads/queue.h"
 #include "downloads/factory.h"

=== modified file 'ubuntu-download-manager-priv/system/dbus_proxy.h'
--- libubuntudownloadmanager/system/dbus_proxy.h	2013-10-24 12:39:46 +0000
+++ ubuntu-download-manager-priv/system/dbus_proxy.h	2013-12-20 23:43:17 +0000
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include "metatypes.h"
+#include <ubuntu/download_manager/metatypes.h>
 
 /*
  * Proxy class for interface org.freedesktop.DBus

=== renamed file 'libubuntudownloadmanager/libubuntudownloadmanager.pro' => 'ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro'
--- libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-11-11 16:30:03 +0000
+++ ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2013-12-20 23:43:17 +0000
@@ -1,8 +1,10 @@
+include(../common-project-config.pri)
+include(../common-vars.pri)
+
 QT       += network dbus systeminfo sql
 QT       -= gui
 
-TARGET = ubuntudownloadmanager
-QMAKE_CXXFLAGS += -std=c++0x -Werror
+TARGET = ubuntu-download-manager-priv
 TEMPLATE = lib
 
 DEFINES += APPDOWNLOADERLIB_LIBRARY
@@ -18,14 +20,11 @@
     downloads/manager.cpp \
     downloads/download_manager_adaptor.cpp \
     downloads/queue.cpp \
-    downloads/download_struct.cpp \
     downloads/group_download.cpp \
-    downloads/group_download_struct.cpp \
     downloads/group_download_adaptor.cpp \
     downloads/file_download.cpp \
     downloads/sm_file_download.cpp \
     downloads/state_machines/download_sm.cpp \
-    system/hash_algorithm.cpp \
     system/uuid_utils.cpp \
     system/uuid_factory.cpp \
     system/timer.cpp \
@@ -53,14 +52,11 @@
     downloads/manager.h \
     downloads/download_manager_adaptor.h \
     downloads/queue.h \
-    downloads/download_struct.h \
     downloads/group_download.h \
-    downloads/group_download_struct.h \
     downloads/group_download_adaptor.h \
     downloads/file_download.h \
     downloads/sm_file_download.h \
     downloads/state_machines/download_sm.h \
-    system/hash_algorithm.h \
     system/uuid_utils.h \
     system/uuid_factory.h \
     system/timer.h \
@@ -75,7 +71,6 @@
     system/apparmor.h \
     system/network_reply.h \
     system/dbus_proxy.h \
-    metatypes.h \
     downloads/state_machines/state.h \
     downloads/state_machines/final_state.h
 
@@ -90,11 +85,14 @@
     downloads/com.canonical.applications.download.xml \
     downloads/generate_adaptors.sh
 
-target.path = /usr/lib/
-INSTALLS += target
+include(../common-installs-config.pri)
 
 LIBS += -lnih-dbus
 
-CONFIG += link_pkgconfig
 PKGCONFIG += dbus-1
 
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
+DEPENDPATH += $$PWD/../ubuntu-download-manager-common

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_download.cpp	2013-12-19 13:09:05 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.cpp	2013-12-20 23:43:17 +0000
@@ -20,7 +20,7 @@
 #include <QNetworkRequest>
 #include <QSignalSpy>
 #include <QSslError>
-#include <system/hash_algorithm.h>
+#include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <system/uuid_utils.h>
 #include "fakes/fake_network_reply.h"
 #include "fakes/fake_process.h"

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.h'
--- ubuntu-download-manager-tests/downloads/test_download.h	2013-12-19 13:09:05 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.h	2013-12-20 23:43:17 +0000
@@ -22,7 +22,7 @@
 #include <QDir>
 #include <QObject>
 #include <downloads/file_download.h>
-#include <metatypes.h>
+#include <ubuntu/download_manager/metatypes.h>
 #include "fakes/fake_system_network_info.h"
 #include "fakes/fake_request_factory.h"
 #include "fakes/fake_process_factory.h"

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2013-12-02 11:05:31 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2013-12-20 23:43:17 +0000
@@ -17,8 +17,8 @@
  */
 
 #include <downloads/file_download.h>
+#include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <system/file_manager.h>
-#include <system/hash_algorithm.h>
 #include <system/uuid_utils.h>
 #include "test_download_factory.h"
 

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-12-02 11:05:31 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-12-20 23:43:17 +0000
@@ -18,7 +18,7 @@
 
 #include <QSignalSpy>
 #include <downloads/factory.h>
-#include <downloads/download_struct.h>
+#include <ubuntu/download_manager/download_struct.h>
 #include <system/uuid_utils.h>
 #include "fakes/fake_process_factory.h"
 #include "fakes/fake_system_network_info.h"

=== modified file 'ubuntu-download-manager-tests/downloads/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2013-12-02 11:05:31 +0000
+++ ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2013-12-20 23:43:17 +0000
@@ -22,8 +22,8 @@
 #include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QSqlError>
-#include <metatypes.h>
-#include <system/hash_algorithm.h>
+#include <ubuntu/download_manager/metatypes.h>
+#include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <system/uuid_utils.h>
 #include "fakes/fake_download.h"
 #include "fakes/fake_system_network_info.h"

=== modified file 'ubuntu-download-manager-tests/fakes/fake_download.h'
--- ubuntu-download-manager-tests/fakes/fake_download.h	2013-11-27 13:29:03 +0000
+++ ubuntu-download-manager-tests/fakes/fake_download.h	2013-12-20 23:43:17 +0000
@@ -21,7 +21,7 @@
 #include <QSharedPointer>
 #include <downloads/file_download.h>
 #include <system/system_network_info.h>
-#include <metatypes.h>
+#include <ubuntu/download_manager/metatypes.h>
 #include "fake.h"
 
 using namespace Ubuntu::DownloadManager;

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-12-02 11:34:17 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-12-20 23:43:17 +0000
@@ -1,15 +1,11 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-06-17T13:18:37
-#
-#-------------------------------------------------
+include( ../common-project-config.pri )
+include( ../common-vars.pri )
 
 QT       += network core testlib dbus systeminfo sql
 
 QT       -= gui
 
 TARGET = ubuntu-download-manager-tests
-QMAKE_CXXFLAGS += -std=c++0x -Werror
 CONFIG   += console
 CONFIG   -= app_bundle
 
@@ -87,12 +83,16 @@
     downloads/state_machines/test_final_state.h \
     downloads/state_machines/test_file_download_sm.h
 
-LIBS += -L$$OUT_PWD/../libubuntudownloadmanager/ -lubuntudownloadmanager
-
-INCLUDEPATH += $$PWD/../libubuntudownloadmanager
-DEPENDPATH += $$PWD/../libubuntudownloadmanager
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-priv/ -lubuntu-download-manager-priv
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-priv
+DEPENDPATH += $$PWD/../ubuntu-download-manager-priv
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
+DEPENDPATH += $$PWD/../ubuntu-udownload-manager-common
 
 check.depends = $${TARGET}
-check.commands = LD_LIBRARY_PATH=$$OUT_PWD/../libubuntudownloadmanager ./$${TARGET}
+check.commands = LD_LIBRARY_PATH=$$OUT_PWD/../ubuntu-download-manager-common:$$OUT_PWD/../ubuntu-download-manager-priv ./$${TARGET}
 QMAKE_EXTRA_TARGETS += check
-

=== modified file 'ubuntu-download-manager/ubuntu-download-manager.pro'
--- ubuntu-download-manager/ubuntu-download-manager.pro	2013-09-20 12:51:26 +0000
+++ ubuntu-download-manager/ubuntu-download-manager.pro	2013-12-20 23:43:17 +0000
@@ -1,15 +1,11 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-06-12T13:03:54
-#
-#-------------------------------------------------
+include( ../common-project-config.pri )
+include( ../common-vars.pri )
 
 QT       += core systeminfo
 
 QT       -= gui
 
 TARGET = ubuntu-download-manager
-QMAKE_CXXFLAGS += -std=c++0x -Werror
 CONFIG   += console
 CONFIG   -= app_bundle
 
@@ -30,14 +26,18 @@
 dbus_system_conf.files = com.canonical.applications.Downloader.conf
 INSTALLS += dbus_system_conf
 
-target.path = /usr/bin/
-INSTALLS += target
-
-LIBS += -L$$OUT_PWD/../libubuntudownloadmanager/ -lubuntudownloadmanager
-
-INCLUDEPATH += $$PWD/../libubuntudownloadmanager
-DEPENDPATH += $$PWD/../libubuntudownloadmanager
+include( ../common-installs-config.pri )
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-priv/ -lubuntu-download-manager-priv
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-priv
+DEPENDPATH += $$PWD/../ubuntu-download-manager-priv
 
 OTHER_FILES += \
     ubuntu-download-manager.service \
     com.canonical.applications.Downloader.conf
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
+DEPENDPATH += $$PWD/../ubuntu-download-manager-common