Merge lp:~mhall119/ubuntu-docviewer-app/package-fixes into lp:ubuntu-docviewer-app/trunk

[Michael Hall]

Updates packaging for a better install

Updates packaging for a better install

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

PASSED: Continuous integration, rev:3
http://91.189.93.125:8080/job/ubuntu-docviewer-app-ci/1/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-docviewer-app-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-docviewer-app-raring-amd64-ci/1

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

review: Approve (continuous-integration)

[Anthony Granger (chocanto)]

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	2013-04-11 21:07:24 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-04-11 21:07:24 +0000
@@ -0,0 +1,6 @@
+*.qmlproject.user
+
+debian/files
+debian/app-template/
+debian/*.debhelper.log
+debian/*.substvars

=== modified file 'debian/compat'
--- debian/compat	2013-02-12 16:18:48 +0000
+++ debian/compat	2013-04-11 21:07:24 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2013-02-12 16:28:32 +0000
+++ debian/control	2013-04-11 21:07:24 +0000
@@ -1,18 +1,18 @@
 Source: ubuntu-docviewer-app
 Priority: extra
-Maintainer: Ugo Riboni <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0), 
-Standards-Version: 3.9.3
+Maintainer: Ubuntu App Cats <[e-mail]>
+Build-Depends: debhelper (>= 9), 
+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: ${shlibs:Depends}, ${misc:Depends},
+Architecture: all
+Depends: ${misc:Depends},
          qmlscene,
-         qt-components-ubuntu,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-qtquick2-plugin
 Description: Document Viewer application
  Core Document Viewer application
-

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-12 16:28:32 +0000
+++ debian/copyright	2013-04-11 21:07:24 +0000
@@ -1,16 +1,16 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ubuntu-docviewer-app
 Source:
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+License: GPL-3
 
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
-License: LGPL-3.0
+License: LGPL-3
 
-License: GPL-3.0
+License: GPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public
  License as published by the Free Software Foundation; either
@@ -27,7 +27,7 @@
  On Debian systems, the complete text of the GNU General
  Public License can be found in "/usr/share/common-licenses/GPL-3".
 
-License: LGPL-3.0
+License: LGPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either

=== removed file 'debian/docs'
=== modified file 'debian/rules'
--- debian/rules	2013-02-12 16:28:32 +0000
+++ debian/rules	2013-04-11 21:07:24 +0000
@@ -1,29 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Work-around for some machines where INSTALL_ROOT is not set properly by
-# dh_auto_install
-override_dh_auto_install:
-	dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
-
-# Workaround a bug in that debhelper package version
-override_dh_install:
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin/
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/ubuntu-docviewer-app/
-	cp ubuntu-docviewer-app.desktop $(CURDIR)/debian/tmp/usr/share/applications/
-	cp ubuntu-docviewer-app $(CURDIR)/debian/tmp/usr/bin/
-	cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/ubuntu-docviewer-app/
-	
-	dh_install --sourcedir=debian/tmp --fail-missing
-
 %:
 	dh $@
+
+override_dh_install:
+	dh_install --fail-missing

=== modified file 'debian/source/format'
--- debian/source/format	2013-02-12 16:18:48 +0000
+++ debian/source/format	2013-04-11 21:07:24 +0000
@@ -1,1 +1,1 @@
-3.0 (native)
+1.0

=== modified file 'debian/ubuntu-docviewer-app.install'
--- debian/ubuntu-docviewer-app.install	2013-02-12 16:28:32 +0000
+++ debian/ubuntu-docviewer-app.install	2013-04-11 21:07:24 +0000
@@ -1,3 +1,5 @@
-usr/share/applications
-usr/bin
-usr/share/ubuntu-docviewer-app
+ubuntu-docviewer-app usr/bin/
+ubuntu-docviewer-app.desktop usr/share/applications/
+*.qml usr/share/ubuntu-docviewer-app/
+*.png usr/share/ubuntu-docviewer-app/
+

=== renamed file 'docviewer.qml' => 'ubuntu-doc-viewer.qml'
--- docviewer.qml	2013-02-12 16:28:32 +0000
+++ ubuntu-doc-viewer.qml	2013-04-11 21:07:24 +0000
@@ -10,6 +10,7 @@
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "docviewer"
+    applicationName: "ubuntu-docviewer-app"
     
     width: units.gu(50)
     height: units.gu(75)

=== modified file 'ubuntu-docviewer-app'
--- ubuntu-docviewer-app	2013-02-12 16:28:32 +0000
+++ ubuntu-docviewer-app	2013-04-11 21:07:24 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-docviewer-app/docviewer.qml
+qmlscene /usr/share/ubuntu-docviewer-app/ubuntu-docviewer-app.qml

=== modified file 'ubuntu-docviewer-app.desktop'
--- ubuntu-docviewer-app.desktop	2013-02-12 16:28:32 +0000
+++ ubuntu-docviewer-app.desktop	2013-04-11 21:07:24 +0000
@@ -3,6 +3,8 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=/usr/bin/ubuntu-docviewer-app
+Exec=qmlscene /usr/share/ubuntu-docviewer-app/ubuntu-docviewer-app.qml
 Icon=/usr/share/ubuntu-docviewer-app/docviewer64.png
 Name=Document Viewer
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage