U1DB Qt/ QML

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

  1. trunk
  2. Merge into trunk
Proposed by Cris Dywan
Status: Superseded
Proposed branch: lp:~kalikiana/u1db-qt/trunk
Merge into: lp:u1db-qt
Diff against target: 104 lines (+34/-7)
5 files modified
CMakeLists.txt (+14/-4)
debian/changelog (+5/-0)
debian/control (+12/-0)
debian/libu1db-qt5-doc.install (+1/-0)
debian/rules (+2/-3)
To merge this branch: bzr merge lp:~kalikiana/u1db-qt/trunk
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Cris Dywan Approve
Review via email: mp+157332@code.launchpad.net

This proposal has been superseded by a proposal from 2013-04-08.

Commit message

Add -doc package containing offline documentation

Description of the change

Add -doc package containing offline documentation

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
lp:~kalikiana/u1db-qt/trunk updated
72. By Cris Dywan

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

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
lp:~kalikiana/u1db-qt/trunk updated
73. By Cris Dywan

Use dh_auto_build instead of bare make

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
lp:~kalikiana/u1db-qt/trunk updated
74. By Cris Dywan

Fix build dependencies and section/ architecture of -doc package

75. By Cris Dywan

Use variable to binary-relative docs dir

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
lp:~kalikiana/u1db-qt/trunk updated
76. By Cris Dywan

Enforce building docs relative to toplevel source folder

77. By Cris Dywan

Go back to bare make doc, dh_auto_build silently ignores it

78. By Cris Dywan

Merge lp:u1db-qt

79. By Cris Dywan

Build and install docs like other files if BUILD_DOCS is defined

80. By Cris Dywan

Add mkdir -p to ensure subfolders in output directory

Unmerged revisions

80. By Cris Dywan

Add mkdir -p to ensure subfolders in output directory

79. By Cris Dywan

Build and install docs like other files if BUILD_DOCS is defined

78. By Cris Dywan

Merge lp:u1db-qt

77. By Cris Dywan

Go back to bare make doc, dh_auto_build silently ignores it

76. By Cris Dywan

Enforce building docs relative to toplevel source folder

75. By Cris Dywan

Use variable to binary-relative docs dir

74. By Cris Dywan

Fix build dependencies and section/ architecture of -doc package

73. By Cris Dywan

Use dh_auto_build instead of bare make

72. By Cris Dywan

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

71. By Cris Dywan

Add -doc package containing offline documentation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-04-04 13:54:32 +0000
3+++ CMakeLists.txt 2013-04-08 14:09:21 +0000
4@@ -77,11 +77,13 @@
5 enable_testing()
6
7 add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
8+
9+set(U1DB_DOCS "${CMAKE_SOURCE_DIR}/documentation/output/html")
10 add_custom_target(doc "qdoc" "u1db.qdocconf"
11- COMMAND "sed" "-r" "-i" "'s@(</head>)@<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\\1@'" "./output/html/*.html"
12- COMMAND "qhelpgenerator" "./output/html/u1dbqt.qhp"
13- COMMAND "assistant" "-register" "./output/html/u1dbqt.qch"
14- WORKING_DIRECTORY "documentation")
15+ COMMAND "sed" "-r" "-i" "'s@(</head>)@<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\\1@'" "${U1DB_DOCS}/*.html"
16+ COMMAND "qhelpgenerator" "${U1DB_DOCS}/u1dbqt.qhp"
17+ COMMAND "assistant" "-register" "${U1DB_DOCS}/u1dbqt.qch"
18+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/documentation")
19 add_subdirectory(modules)
20 add_subdirectory(tests)
21
22@@ -96,6 +98,14 @@
23 DESTINATION ${INCLUDE_INSTALL_DIR}
24 )
25
26+if (EXISTS ${U1DB_DOCS}/u1dbqt.qch)
27+ install(FILES "${U1DB_DOCS}/u1dbqt.qch"
28+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/phrasebooks/"
29+ )
30+else ()
31+ install(CODE "message(\"Documentation won't be installed (${U1DB_DOCS}/u1dbqt.qch not found)\")")
32+endif ()
33+
34 # PkgConfig file
35 set (PREFIX "${CMAKE_INSTALL_PREFIX}")
36 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
37
38=== modified file 'debian/changelog'
39--- debian/changelog 2013-03-27 11:39:41 +0000
40+++ debian/changelog 2013-04-08 14:09:21 +0000
41@@ -1,3 +1,8 @@
42+u1db-qt (0.1.1-0ubuntu2) quantal; urgency=low
43+ * Add -doc package containing offline documentation
44+
45+ -- Christian Dywan <christian.dywan@canonical.com> Fri, 05 Apr 2013 12:52:13 +0200
46+
47 u1db-qt (0.1.1-0ubuntu1) quantal; urgency=low
48 * Added .install files
49 * Corrected dependencies
50
51=== modified file 'debian/control'
52--- debian/control 2013-03-27 11:39:41 +0000
53+++ debian/control 2013-04-08 14:09:21 +0000
54@@ -7,6 +7,7 @@
55 qtdeclarative5-dev,
56 qtbase5-dev,
57 dbus-test-runner,
58+ qttools5-dev-tools
59 Standards-Version: 3.9.3
60 Vcs-Bzr: https://launchpad.net/u1db-qt/trunk
61
62@@ -18,6 +19,17 @@
63 Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library
64 Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
65
66+Package: libu1db-qt5-doc
67+Section: doc
68+Architecture: all
69+Depends: ${misc:Depends},
70+ libu1db-qt5-1 (= ${binary:Version}),
71+ qttools5-dev-tools
72+Description: Qt5 binding and QtQuick2 plugin for U1DB - offline documentation
73+ Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
74+ .
75+ This package contains the offline documentation for the Qt binding for U1DB
76+
77 Package: libu1db-qt5-dev
78 Section: libdevel
79 Architecture: any
80
81=== added file 'debian/libu1db-qt5-doc.install'
82--- debian/libu1db-qt5-doc.install 1970-01-01 00:00:00 +0000
83+++ debian/libu1db-qt5-doc.install 2013-04-08 14:09:21 +0000
84@@ -0,0 +1,1 @@
85+usr/share/qt5/phrasebooks/*
86
87=== modified file 'debian/rules'
88--- debian/rules 2013-03-28 12:40:13 +0000
89+++ debian/rules 2013-04-08 14:09:21 +0000
90@@ -10,12 +10,11 @@
91 dh $@ --parallel
92
93 override_dh_auto_configure:
94- PATH=/opt/qt5/bin:$(PATH) \
95- dh_auto_configure -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake \
96- -DLD_LIBRARY_PATH=/opt/qt5/lib:$(LD_LIBRARY_PATH)
97+ dh_auto_configure -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake
98
99 override_dh_auto_build:
100 dh_auto_build
101+ make doc
102
103 override_dh_auto_clean:
104 dh_auto_clean

Subscribers

People subscribed via source and target branches

to all changes: