U1DB Qt/ QML

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

  1. trunk
  2. Merge into trunk
Proposed by Cris Dywan
Status: Rejected
Rejected by: Cris Dywan
Proposed branch: lp:~kalikiana/u1db-qt/trunk
Merge into: lp:u1db-qt
Diff against target: 127 lines (+39/-15)
6 files modified
CMakeLists.txt (+19/-5)
debian/changelog (+5/-0)
debian/control (+12/-6)
debian/libu1db-qt5-doc.install (+1/-0)
debian/rules (+1/-3)
documentation/u1db.qdocconf (+1/-1)
To merge this branch: bzr merge lp:~kalikiana/u1db-qt/trunk
Reviewer Review Type Date Requested Status
Cris Dywan Disapprove
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Review via email: mp+157664@code.launchpad.net

This proposal supersedes a proposal from 2013-04-05.

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) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
78. By Cris Dywan

Merge lp:u1db-qt

79. By Cris Dywan

Build and install docs like other files if BUILD_DOCS is defined

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

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 updated
80. By Cris Dywan

Add mkdir -p to ensure subfolders in output directory

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

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)
Revision history for this message
Cris Dywan (kalikiana) wrote :

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

review: Disapprove

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
=== 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 @@
77enable_testing()77enable_testing()
7878
79add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")79add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
80add_custom_target(doc "qdoc" "u1db.qdocconf"80
81 COMMAND "sed" "-r" "-i" "'s@(</head>)@<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\\1@'" "./output/html/*.html"81option(BUILD_DOCS "Build documentation" OFF)
82 COMMAND "qhelpgenerator" "./output/html/u1dbqt.qhp"82if (BUILD_DOCS)
83 COMMAND "assistant" "-register" "./output/html/u1dbqt.qch"83 set(ALL "ALL")
84 WORKING_DIRECTORY "documentation")84endif ()
85set(U1DB_DOCS "${PROJECT_BINARY_DIR}/documentation/output")
86add_custom_target(doc ${ALL} "mkdir" "-p" "${U1DB_DOCS}"
87 COMMAND "qdoc" "-outputdir" "${U1DB_DOCS}" "${CMAKE_SOURCE_DIR}/documentation/u1db.qdocconf" "1>/dev/null" "2>/dev/null"
88 COMMAND "sed" "-r" "-i" "'s@(</head>)@<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\\1@'" "${U1DB_DOCS}/*.html"
89 COMMAND "qhelpgenerator" "${U1DB_DOCS}/u1dbqt.qhp"
90 COMMAND "assistant" "-register" "${U1DB_DOCS}/u1dbqt.qch"
91 SOURCES "${CMAKE_SOURCE_DIR}/documentation/u1db.qdocconf"
92 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/documentation")
85add_subdirectory(modules)93add_subdirectory(modules)
86add_subdirectory(tests)94add_subdirectory(tests)
8795
@@ -96,6 +104,12 @@
96 DESTINATION ${INCLUDE_INSTALL_DIR}104 DESTINATION ${INCLUDE_INSTALL_DIR}
97 )105 )
98106
107if (BUILD_DOCS)
108 install(FILES "${U1DB_DOCS}/u1dbqt.qch"
109 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/phrasebooks/"
110 )
111endif ()
112
99# PkgConfig file113# PkgConfig file
100set (PREFIX "${CMAKE_INSTALL_PREFIX}")114set (PREFIX "${CMAKE_INSTALL_PREFIX}")
101set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")115set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
102116
=== 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 @@
1u1db-qt (0.1.2) quantal; urgency=low
2 * Add -doc package containing offline documentation
3
4 -- Christian Dywan <christian.dywan@canonical.com> Fri, 05 Apr 2013 12:52:13 +0200
5
1u1db-qt (0.1.1-0ubuntu1) quantal; urgency=low6u1db-qt (0.1.1-0ubuntu1) quantal; urgency=low
2 * Added .install files7 * Added .install files
3 * Corrected dependencies8 * Corrected dependencies
49
=== 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 @@
7 qtdeclarative5-dev,7 qtdeclarative5-dev,
8 qtbase5-dev,8 qtbase5-dev,
9 dbus-test-runner,9 dbus-test-runner,
10 qt5-default,10 qttools5-dev-tools
11 qtdeclarative5-test-plugin,
12 qtdeclarative5-qtquick2-plugin,
13 libqt5sql5-sqlite,
14 qtdeclarative5-dev-tools
15Standards-Version: 3.9.311Standards-Version: 3.9.3
16Vcs-Bzr: https://launchpad.net/u1db-qt/trunk12Vcs-Bzr: https://launchpad.net/u1db-qt/trunk
1713
@@ -19,11 +15,21 @@
19Architecture: any15Architecture: any
20Depends: ${shlibs:Depends},16Depends: ${shlibs:Depends},
21 ${misc:Depends},17 ${misc:Depends},
22 qtdeclarative5-qtquick2-plugin,
23 libqt5sql5-sqlite18 libqt5sql5-sqlite
24Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library19Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library
25 Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).20 Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
2621
22Package: libu1db-qt5-doc
23Section: doc
24Architecture: all
25Depends: ${misc:Depends},
26 libu1db-qt5-1 (= ${binary:Version}),
27 qttools5-dev-tools
28Description: Qt5 binding and QtQuick2 plugin for U1DB - offline documentation
29 Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
30 .
31 This package contains the offline documentation for the Qt binding for U1DB
32
27Package: libu1db-qt5-dev33Package: libu1db-qt5-dev
28Section: libdevel34Section: libdevel
29Architecture: any35Architecture: any
3036
=== 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 @@
1usr/share/qt5/phrasebooks/*
02
=== 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 @@
10 dh $@ --parallel10 dh $@ --parallel
1111
12override_dh_auto_configure:12override_dh_auto_configure:
13 PATH=/opt/qt5/bin:$(PATH) \13 dh_auto_configure -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake -DBUILD_DOCS=ON
14 dh_auto_configure -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake \
15 -DLD_LIBRARY_PATH=/opt/qt5/lib:$(LD_LIBRARY_PATH)
1614
17override_dh_auto_build:15override_dh_auto_build:
18 dh_auto_build16 dh_auto_build
1917
=== 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 @@
30examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"30examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
31examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"31examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
3232
33outputdir = output/html33outputdir = output
34outputformats = HTML34outputformats = HTML
35syntaxhighlighting = true35syntaxhighlighting = true
3636

Subscribers

People subscribed via source and target branches

to all changes: