Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/crossdoc into lp:u1db-qt.
Commit message: Add .index file for cross-linking to -doc package and set URL Requested reviews: U1DB Qt developers (uonedb-qt) For more details, see: https://code.launchpad.net/~kalikiana/u1db-qt/crossdoc/+merge/161999 Add .index file for cross-linking to -doc package and set URL -- https://code.launchpad.net/~kalikiana/u1db-qt/crossdoc/+merge/161999 Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/crossdoc into lp:u1db-qt.
=== modified file 'debian/changelog' --- debian/changelog 2013-05-01 18:07:10 +0000 +++ debian/changelog 2013-05-02 00:07:35 +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 <[email protected]> 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 00:07:35 +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 00:07:35 +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/u1db.qdocconf' --- documentation/u1db.qdocconf 2013-04-22 12:22:04 +0000 +++ documentation/u1db.qdocconf 2013-05-02 00:07:35 +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
-- Mailing list: https://launchpad.net/~uonedb-qt Post to : [email protected] Unsubscribe : https://launchpad.net/~uonedb-qt More help : https://help.launchpad.net/ListHelp
