Merge lp:~kalikiana/u1db-qt/crossdoc into lp:u1db-qt

[Cris Dywan]

Add .index file for cross-linking to -doc package and set URL

Add .index file for cross-linking to -doc package and set URL

[Cris Dywan (kalikiana)]

This requires bug 1175389.

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

PASSED: Continuous integration, rev:89
http://91.189.93.125:8080/job/u1db-qt-ci/33/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/33
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/33

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/33/rebuild

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:90
http://91.189.93.125:8080/job/u1db-qt-ci/34/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/34/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/34/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/34/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:90
http://91.189.93.125:8080/job/u1db-qt-ci/36/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/36/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/36/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/36/rebuild

review: Needs Fixing (continuous-integration)

[lp:~kalikiana/u1db-qt/crossdoc]

91. By Cris Dywan on 2013-05-13

Merge lp:u1db-qt

92. By Cris Dywan on 2013-05-13

Depend on ubuntu-ui-toolkit-doc at build-time for cross-linking

93. By Cris Dywan on 2013-05-13

Follow up on ui-toolkit doc index rename

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 18:07:10 +0000
+++ debian/changelog	2013-05-02 18:25:42 +0000
@@ -1,3 +1,8 @@
+u1db-qt (0.1.4) quantal; urgency=low
+  * Add .index file for cross-linking to -doc package and set URL
+ 
+ -- Christian Dywan <[e-mail]>  Wed, 01 May 2013 17:05:04  -0700
+
 u1db-qt (0.1.3) quantal; urgency=low
   * Add QtCreator Application templates and plugins.qmltypes to -dev package
  

=== modified file 'debian/libu1db-qt5-doc.install'
--- debian/libu1db-qt5-doc.install	2013-04-22 14:36:13 +0000
+++ debian/libu1db-qt5-doc.install	2013-05-02 18:25:42 +0000
@@ -1,3 +1,4 @@
 usr/share/qt5/phrasebooks/*
+usr/share/u1db-qt/doc/html/*.index
 usr/share/u1db-qt/doc/html/*.html
 usr/share/u1db-qt/doc/html/style/*.css

=== modified file 'documentation/CMakeLists.txt'
--- documentation/CMakeLists.txt	2013-05-01 22:49:50 +0000
+++ documentation/CMakeLists.txt	2013-05-02 18:25:42 +0000
@@ -29,6 +29,10 @@
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
         FILES_MATCHING PATTERN "*.html"
         )
+    install(DIRECTORY "${U1DB_DOCS}/"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
+        FILES_MATCHING PATTERN "*.index"
+        )
     install(DIRECTORY "${U1DB_DOCS}/style/"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html/style"
         FILES_MATCHING PATTERN "*.css"

=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2013-04-23 13:11:30 +0000
+++ documentation/overview.qdoc	2013-05-02 18:25:42 +0000
@@ -25,7 +25,7 @@
      \part General Topics
      \list
      \li \l {Tutorial} gives a quick start guide from storing a document
-     to querying a database and displaying it in Ubuntu Components.
+     to querying a database and displaying it in \l {Ubuntu User Interface Toolkit}{Ubuntu Components}.
      \li \l {Design Concepts} provides an overview of the design and
      terminology.
      \endlist

=== modified file 'documentation/u1db.qdocconf'
--- documentation/u1db.qdocconf	2013-04-22 12:22:04 +0000
+++ documentation/u1db.qdocconf	2013-05-02 18:25:42 +0000
@@ -1,5 +1,7 @@
 project = U1Db-Qt
 description = U1Db-Qt plugin documentation
+url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/u1db/
+indexes = /usr/share/ubuntu-ui-toolkit/doc/html/ubuntu-user-interface-toolkit.index
 
 sourcedirs = ../src \
              ../documentation

=== modified file 'documentation/u1db.tutorial.qdoc'
--- documentation/u1db.tutorial.qdoc	2013-04-22 11:28:15 +0000
+++ documentation/u1db.tutorial.qdoc	2013-05-02 18:25:42 +0000
@@ -25,7 +25,7 @@
 
 In U1Db-Qt, the Database element is the the central figure that works in conjunction with Document elements, and in the future indexing (currently under development), and querying (currently under development) elements.	 It is the Database element that defines the location of the data repository.
 
-A Database element is also a valuable tool for cases where specific data from a repository needs to be retrieved quickly, without indexing or querying ahead of time.	The 'contents' object associated with the Database element can be used together with standard elements (see: Standard Elements -> TextField & TextArea) and model-based elements (see: Model-Based Elements -> ListView).		
+A Database element is also a valuable tool for cases where specific data from a repository needs to be retrieved quickly, without indexing or querying ahead of time.	The 'contents' object associated with the Database element can be used together with base items such as TextField or TextArea and model-based items like ListView and \l {Standard}{ListItems.Standard}.
    
 \section1 2.0.1 Database Properties