Merge lp:~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app into lp:ubuntu-docviewer-app/trunk

[fcole90]

Removed qmlproject and added proper CMakeLists to enable the development with cmake. Also removed the desktop file which is now created by cmake from a desktop.in.in file.

Removed qmlproject and added proper CMakeLists to enable the development with cmake. Also removed the desktop file which is now created by cmake from a desktop.in.in file.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:31
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app/+merge/234438/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/39/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1979/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/11/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/39/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:31
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/40/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1983/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/12/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Great work Fabio!

Really nice to see the document viewer catching up.

I've reviewed the branch and I've suggested a few changes inline. Additionally, there are a couple of other things I'd like to ask to change:

1. On the debian/control file, could you add the following, just like [1]?

override_dh_auto_configure:
 + dh_auto_configure -- -DCLICK_MODE=OFF

2. On the manifest.json file:

+ "architecture": "@CLICK_ARCH@",

+ "apparmor": "docviewer.apparmor",

3. Then 'bzr rename ubuntu-docviewer-app.json docviewer.apparmor'

Do you think you could address these points, commit the changes and do a new push to the same branch? Once you do the push, the merge proposal will update automatically for you.

[1] https://code.launchpad.net/~zeller-benjamin/ubuntu-terminal-app/sdkcompat/+merge/233747

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:32
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/42/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1985/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/14/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/42/rebuild

review: Needs Fixing (continuous-integration)

[fcole90 (fcole90)]

I've added the changes that you asked me. There are still some problems with the new cmake configuration, I hope to fix them soon.

[fcole90 (fcole90)]

David, can you help me? What does the following mean?
---
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.1.1.
Contents conflict in ubuntu-docviewer-app.qmlproject
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
---

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:34
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/43/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1986/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/15/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/43/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

This is due to trunk having changes made in a file after you branched which you have also changed. As you are removing the file (ubuntu-docviewer-app.qmlproject) you can just ignore the conflict.

$ bzr merge lp:ubuntu-docviewer-app
$ bzr resolve ubuntu-docviewer-app.qmlproject
$ bzr commit -m "Merge of trunk"

And then push that back up, more info can be found here [0] about merge conflicts.

0 - http://doc.bazaar.canonical.com/beta/en/user-guide/resolving_conflicts.html

[fcole90 (fcole90)]

Thank you, hope that works now :)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:35
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/46/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2004/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/18/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/46/rebuild

review: Needs Fixing (continuous-integration)

[fcole90 (fcole90)]

I think that I need to add cmake as a dependence

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:36
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/47/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2008/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/19/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/47/rebuild

review: Needs Fixing (continuous-integration)

[fcole90 (fcole90)]

I'm sorry, I just noticed the inline comments :/

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:38
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/48/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2009/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/20

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:40
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/49/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2010/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2010/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/49/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:41
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/50/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2011/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2011/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/22

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/50/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:42
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/51/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2012/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/23

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:43
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/52/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2013/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/24/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:44
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/53/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2014/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2014/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/25

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/53/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:45
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/54/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2015/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2015/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/26

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:46
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/55/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2016/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2016/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/55/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:47
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/56/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2020/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2020/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/28

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This needs some debian packaging love. I would suggest pinging dholbach for help.

[fcole90 (fcole90)]

Thank you. I'm building some culture about debian packaging, but tomorrow I'm going to follow your suggestion ;)

[Nicholas Skaggs (nskaggs)]

Fabio, Daniel graciously fixed things up -- have a look at his mp and merge it into your branch for this:

https://code.launchpad.net/~dholbach/ubuntu-docviewer-app/packaging-fixes/+merge/235001

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/57/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2030/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/29/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[fcole90 (fcole90)]

I wish to thank you all for the help, I would have spent a century trying to fix that :)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/58/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2031/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2031/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/30

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:51
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/60/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2033
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2033/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/32

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/60/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-autolanding/13/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/361/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-autolanding/5

review: Needs Fixing (continuous-integration)

[fcole90 (fcole90)]

What's happening? Is the autolanding based on python3?

review: Needs Information

[Nicholas Skaggs (nskaggs)]

Fabio, we didn't sneak in on time before the jenkins job got updated :(. I was trying to keep your mp a bit simpler.

So, Yep, remember those changes I asked you to 'undo' for python3? We need them now :-) Can you convert this to python3 again and push?

[lp:~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app]

52. By fcole90 on 2014-09-18

Upgraded to python 3

[fcole90 (fcole90)]

Just done ;)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:52
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/61/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/363
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/33

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[fcole90 (fcole90)]

The jourey continues. We need to update the autopilot tests to python3, because ATM they seem to not work. @Nicholas: can you confirm? :)

[lp:~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app]

53. By fcole90 on 2014-09-18

migrating tests to python3

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:53
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/62/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/368
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/34

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/62/rebuild

review: Approve (continuous-integration)

[lp:~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app]

54. By fcole90 on 2014-09-18

Make the tests follow the python* environment

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:54
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/63/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/369/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/369/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/35

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

rev 54 is really weird Fabio. I would leave things @ rev 53. The __init__.py has other changes we can and will do to bring it in line with the other apps. Let's push this for now and start on it.

[lp:~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app]

55. By fcole90 on 2014-09-18

Reverted to 53

[fcole90 (fcole90)]

That's a strange effect. Anyway, just reverted ;-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:55
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/64/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/370
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/370/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/36

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/64/rebuild

review: Approve (continuous-integration)

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-09-18 18:07:33 +0000
@@ -0,0 +1,77 @@
+project(com.ubuntu.docviewer)
+cmake_minimum_required(VERSION 2.8.9)
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
+
+# Standard install paths
+include(GNUInstallDirs)
+
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Installs to a contained location" on)
+
+set(APP_NAME docviewer)
+set(DESKTOP_FILE "ubuntu-docviewer-app.desktop")
+#set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
+set(MAIN_QML ubuntu-docviewer-app.qml)
+set(ICON_FILE [e-mail])
+set(AUTOPILOT_DIR ubuntu_docviewer_app)
+set(APP_HARDCODE docviewer-app)
+set(UBUNTU_MANIFEST_PATH "manifest.json" CACHE INTERNAL "Relative path to the manifest file")
+
+if(CLICK_MODE)
+    if(NOT DEFINED BZR_SOURCE)
+		set(BZR_SOURCE "lp:ubuntu-${APP_HARDCODE}")
+		message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+    endif(NOT DEFINED BZR_SOURCE)
+    set(CMAKE_INSTALL_PREFIX /)
+    set(CMAKE_INSTALL_BINDIR /)
+	set(DATA_DIR /)
+	set (ICON ${ICON_FILE})
+	set(EXEC "qmlscene %u ${MAIN_QML}")
+	set(DESKTOP_DIR ${DATA_DIR})
+	set(URLS_DIR ${DATA_DIR})
+else(CLICK_MODE)
+	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/ubuntu-${APP_HARDCODE})
+	set(EXEC ${APP_HARDCODE})
+	set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
+	configure_file(${APP_HARDCODE}.in
+		${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
+	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
+		DESTINATION ${CMAKE_INSTALL_BINDIR})
+	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+	set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
+endif(CLICK_MODE)
+
+file(GLOB_RECURSE I18N_SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
+     *.qml *.js)
+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
+list(SORT I18N_SRC_FILES)
+message("Found ${I18N_SRC_FILES}")
+
+file(GLOB SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.qml *.js)
+add_custom_target(ubuntu-docviewer-app_QMlFiles ALL SOURCES ${SRC_FILES})
+
+file(GLOB RESOURCE_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.png *.svg)
+install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
+
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
+
+add_custom_target(${DESKTOP_FILE} ALL
+  COMMENT "Merging translations into ${DESKTOP_FILE}"
+  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
+ 
+#install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
+
+# Tests
+enable_testing()
+
+
+add_subdirectory(tests)

=== modified file 'debian/control'
--- debian/control	2013-10-05 22:31:30 +0000
+++ debian/control	2014-09-18 18:07:33 +0000
@@ -1,23 +1,27 @@
 Source: ubuntu-docviewer-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9), 
-		 qt5-default,
-		 qtdeclarative5-dev
+Build-Depends: cmake,
+               debhelper (>= 9),
+               intltool,
+               python3,
+               qt5-default,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-test-plugin
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-docviewer-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk
 
 Package: ubuntu-docviewer-app
-Section: misc
 Architecture: any
-Depends: ${misc:Depends},
+Depends: file-qml-plugin,
          qmlscene,
+         qtdeclarative5-poppler-qml-plugin,
+         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-poppler-qml-plugin,
-         file-qml-plugin
+         ${misc:Depends}
 Description: Document Viewer application
  Core Document Viewer application
 
@@ -25,7 +29,8 @@
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
-         ubuntu-docviewer-app (= ${source:Version}),
+         ubuntu-docviewer-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
+         ${misc:Depends}
 Description: Autopilot tests for Document Viewer Application
  This package contains the autopilot tests for the Document Viewer

=== modified file 'debian/rules'
--- debian/rules	2013-04-11 20:58:07 +0000
+++ debian/rules	2014-09-18 18:07:33 +0000
@@ -7,5 +7,8 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCLICK_MODE=OFF
+
 override_dh_install:
 	dh_install --fail-missing

=== modified file 'debian/ubuntu-docviewer-app-autopilot.install'
--- debian/ubuntu-docviewer-app-autopilot.install	2013-05-31 12:25:45 +0000
+++ debian/ubuntu-docviewer-app-autopilot.install	2014-09-18 18:07:33 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/ubuntu_docviewer_app/* usr/lib/python2.7/dist-packages/ubuntu_docviewer_app/
+usr/lib/*/dist-packages/ubuntu_docviewer_app/*

=== modified file 'debian/ubuntu-docviewer-app.install'
--- debian/ubuntu-docviewer-app.install	2013-09-26 14:01:54 +0000
+++ debian/ubuntu-docviewer-app.install	2014-09-18 18:07:33 +0000
@@ -1,4 +1,3 @@
-ubuntu-docviewer-app.desktop usr/share/applications/
-*.qml usr/share/ubuntu-docviewer-app/
-*.png usr/share/ubuntu-docviewer-app/
-*.js usr/share/ubuntu-docviewer-app/
+usr/share/ubuntu-docviewer-app
+usr/share/applications
+usr/bin/docviewer-app

=== added file 'docviewer-app.in'
--- docviewer-app.in	1970-01-01 00:00:00 +0000
+++ docviewer-app.in	2014-09-18 18:07:33 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+export QT_SELECT=qt5
+exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

=== renamed file 'ubuntu-docviewer-app.json' => 'docviewer.apparmor'
--- ubuntu-docviewer-app.json	2014-03-13 18:11:54 +0000
+++ docviewer.apparmor	2014-09-18 18:07:33 +0000
@@ -1,5 +1,4 @@
 {
-    "policy_groups": [
-    ],
-    "policy_version": 1
+    "policy_groups": [],
+    "policy_version": 1.2
 }

=== modified file 'manifest.json'
--- manifest.json	2013-10-14 16:50:23 +0000
+++ manifest.json	2014-09-18 18:07:33 +0000
@@ -1,9 +1,10 @@
 {
     "description": "Document Viewer application for Ubuntu devices",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "@CLICK_ARCH@",
     "hooks": {
         "ubuntu-docviewer-app": {
-            "apparmor": "ubuntu-docviewer-app.json",
+            "apparmor": "docviewer.apparmor",
             "desktop": "ubuntu-docviewer-app.desktop"
         }
     },

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2014-09-18 18:07:33 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(autopilot)

=== added file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/CMakeLists.txt	2014-09-18 18:07:33 +0000
@@ -0,0 +1,10 @@
+if(INSTALL_TESTS)
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(DIRECTORY ${AUTOPILOT_DIR}
+    DESTINATION ${PYTHON_PACKAGE_DIR}
+    )
+endif(INSTALL_TESTS)
+
+add_subdirectory(ubuntu_docviewer_app)

=== added file 'tests/autopilot/ubuntu_docviewer_app/CMakeLists.txt'
--- tests/autopilot/ubuntu_docviewer_app/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_docviewer_app/CMakeLists.txt	2014-09-18 18:07:33 +0000
@@ -0,0 +1,9 @@
+add_subdirectory(tests)
+#add_subdirectory(files)
+
+# make the emulator files visible on qtcreator
+file(GLOB PYTHON_EMULATOR_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.py)
+
+add_custom_target(com_ubuntu_docviewer_PYTHONEMULATORFiles ALL SOURCES ${PYTHON_EMULATOR_FILES})

=== added file 'tests/autopilot/ubuntu_docviewer_app/tests/CMakeLists.txt'
--- tests/autopilot/ubuntu_docviewer_app/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_docviewer_app/tests/CMakeLists.txt	2014-09-18 18:07:33 +0000
@@ -0,0 +1,6 @@
+# make the test files visible on qtcreator
+file(GLOB PYTHON_TEST_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.py)
+
+add_custom_target(com_ubuntu_docviewer_PYTHONTESTFiles ALL SOURCES ${PYTHON_TEST_FILES})

=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/__init__.py'
--- tests/autopilot/ubuntu_docviewer_app/tests/__init__.py	2014-09-11 11:49:23 +0000
+++ tests/autopilot/ubuntu_docviewer_app/tests/__init__.py	2014-09-18 18:07:33 +0000
@@ -27,7 +27,7 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../ubuntu-docviewer-app.qml"
-    sample_dir = "/usr/lib/python2.7/dist-packages/"
+    sample_dir = "/usr/lib/python3/dist-packages/"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())

=== removed file 'ubuntu-docviewer-app.desktop'
--- ubuntu-docviewer-app.desktop	2014-09-13 16:12:14 +0000
+++ ubuntu-docviewer-app.desktop	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=qmlscene %f ubuntu-docviewer-app.qml
-Icon=[e-mail]
-Name=Document Viewer
-MimeType=text/plain;image/png;image/jpeg;image/svg+xml;application/pdf
-Path=/usr/share/ubuntu-docviewer-app
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage

=== added file 'ubuntu-docviewer-app.desktop.in.in'
--- ubuntu-docviewer-app.desktop.in.in	1970-01-01 00:00:00 +0000
+++ ubuntu-docviewer-app.desktop.in.in	2014-09-18 18:07:33 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@EXEC@
+Icon=@ICON@
+Name=Document Viewer
+MimeType=text/plain;image/png;image/jpeg;image/svg+xml;application/pdf
+Path=/usr/share/ubuntu-docviewer-app
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage

=== removed file 'ubuntu-docviewer-app.qmlproject'
--- ubuntu-docviewer-app.qmlproject	2014-09-11 11:49:23 +0000
+++ ubuntu-docviewer-app.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/* File generated by Qt Creator, version 2.6.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "ubuntu-docviewer-app.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* Shows the README files in the project view */
-    Files {
-        filter: "README*"
-    }
-    /* Shows the autopilot files in the project view */
-    Files {
-        filter: "*.py"
-    }
-    /* Shows the translation files and the .pro file used to generate the .pot template */
-    Files {
-        filter: "*.po*"
-    }
-    Files {
-        filter: "*.pro"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
-}