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

[Cris Dywan]

Add -doc package containing offline documentation

Add -doc package containing offline documentation

[Cris Dywan (kalikiana)]

review: Approve

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

78. By Cris Dywan on 2013-04-10

Merge lp:u1db-qt

79. By Cris Dywan on 2013-04-11

Build and install docs like other files if BUILD_DOCS is defined

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

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

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

review: Needs Fixing (continuous-integration)

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

80. By Cris Dywan on 2013-04-11

Add mkdir -p to ensure subfolders in output directory

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

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

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Superseded by https://code.launchpad.net/~kalikiana/u1db-qt/docs2/+merge/158631

review: Disapprove

Unmerged revisions

80. By Cris Dywan on 2013-04-11

Add mkdir -p to ensure subfolders in output directory

79. By Cris Dywan on 2013-04-11

Build and install docs like other files if BUILD_DOCS is defined

78. By Cris Dywan on 2013-04-10

Merge lp:u1db-qt

77. By Cris Dywan on 2013-04-08

Go back to bare make doc, dh_auto_build silently ignores it

76. By Cris Dywan on 2013-04-08

Enforce building docs relative to toplevel source folder

75. By Cris Dywan on 2013-04-05

Use variable to binary-relative docs dir

74. By Cris Dywan on 2013-04-05

Fix build dependencies and section/ architecture of -doc package

73. By Cris Dywan on 2013-04-05

Use dh_auto_build instead of bare make

72. By Cris Dywan on 2013-04-05

Don't set /opt/qt5 (LD_LIBRARY_)PATH in debian/rules

71. By Cris Dywan on 2013-04-05

Add -doc package containing offline documentation

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-10 14:56:02 +0000
+++ CMakeLists.txt	2013-04-11 12:45:43 +0000
@@ -77,11 +77,19 @@
 enable_testing()
 
 add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
-add_custom_target(doc "qdoc" "u1db.qdocconf"
-    COMMAND "sed" "-r" "-i" "'s@(</head>)@<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\\1@'" "./output/html/*.html"
-    COMMAND "qhelpgenerator" "./output/html/u1dbqt.qhp"
-    COMMAND "assistant" "-register" "./output/html/u1dbqt.qch"
-    WORKING_DIRECTORY "documentation")
+
+option(BUILD_DOCS "Build documentation" OFF)
+if (BUILD_DOCS)
+    set(ALL "ALL")
+endif ()
+set(U1DB_DOCS "${PROJECT_BINARY_DIR}/documentation/output")
+add_custom_target(doc ${ALL} "mkdir" "-p" "${U1DB_DOCS}"
+    COMMAND "qdoc" "-outputdir" "${U1DB_DOCS}" "${CMAKE_SOURCE_DIR}/documentation/u1db.qdocconf" "1>/dev/null" "2>/dev/null"
+    COMMAND "sed" "-r" "-i" "'s@(</head>)@<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\\1@'" "${U1DB_DOCS}/*.html"
+    COMMAND "qhelpgenerator" "${U1DB_DOCS}/u1dbqt.qhp"
+    COMMAND "assistant" "-register" "${U1DB_DOCS}/u1dbqt.qch"
+    SOURCES "${CMAKE_SOURCE_DIR}/documentation/u1db.qdocconf"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/documentation")
 add_subdirectory(modules)
 add_subdirectory(tests)
 
@@ -96,6 +104,12 @@
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 
+if (BUILD_DOCS)
+    install(FILES "${U1DB_DOCS}/u1dbqt.qch"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/phrasebooks/"
+        )
+endif ()
+
 # PkgConfig file
 set (PREFIX "${CMAKE_INSTALL_PREFIX}")
 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-27 11:39:41 +0000
+++ debian/changelog	2013-04-11 12:45:43 +0000
@@ -1,3 +1,8 @@
+u1db-qt (0.1.2) quantal; urgency=low
+  * Add -doc package containing offline documentation
+ 
+ -- Christian Dywan <[e-mail]>  Fri, 05 Apr 2013 12:52:13  +0200
+
 u1db-qt (0.1.1-0ubuntu1) quantal; urgency=low
   * Added .install files
   * Corrected dependencies

=== modified file 'debian/control'
--- debian/control	2013-04-09 12:41:08 +0000
+++ debian/control	2013-04-11 12:45:43 +0000
@@ -7,11 +7,7 @@
                qtdeclarative5-dev,
                qtbase5-dev,
                dbus-test-runner,
-               qt5-default,
-               qtdeclarative5-test-plugin,
-               qtdeclarative5-qtquick2-plugin,
-               libqt5sql5-sqlite,
-               qtdeclarative5-dev-tools
+               qttools5-dev-tools
 Standards-Version: 3.9.3
 Vcs-Bzr: https://launchpad.net/u1db-qt/trunk
 
@@ -19,11 +15,21 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         qtdeclarative5-qtquick2-plugin,
          libqt5sql5-sqlite
 Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
 
+Package: libu1db-qt5-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         libu1db-qt5-1 (= ${binary:Version}),
+         qttools5-dev-tools
+Description: Qt5 binding and QtQuick2 plugin for U1DB - offline documentation
+ Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
+ .
+ This package contains the offline documentation for the Qt binding for U1DB
+
 Package: libu1db-qt5-dev
 Section: libdevel
 Architecture: any

=== added file 'debian/libu1db-qt5-doc.install'
--- debian/libu1db-qt5-doc.install	1970-01-01 00:00:00 +0000
+++ debian/libu1db-qt5-doc.install	2013-04-11 12:45:43 +0000
@@ -0,0 +1,1 @@
+usr/share/qt5/phrasebooks/*

=== modified file 'debian/rules'
--- debian/rules	2013-04-09 11:32:11 +0000
+++ debian/rules	2013-04-11 12:45:43 +0000
@@ -10,9 +10,7 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	PATH=/opt/qt5/bin:$(PATH) \
-	dh_auto_configure -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake \
-	-DLD_LIBRARY_PATH=/opt/qt5/lib:$(LD_LIBRARY_PATH)
+	dh_auto_configure -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake -DBUILD_DOCS=ON
 
 override_dh_auto_build:
 	dh_auto_build

=== modified file 'documentation/u1db.qdocconf'
--- documentation/u1db.qdocconf	2013-04-08 10:32:14 +0000
+++ documentation/u1db.qdocconf	2013-04-11 12:45:43 +0000
@@ -30,7 +30,7 @@
 examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
 examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
 
-outputdir  =    output/html
+outputdir  =    output
 outputformats = HTML
 syntaxhighlighting = true