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

[Cris Dywan]

Stricter approach to installing HTML docs

Stricter approach to installing HTML docs

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

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

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-22 09:27:48 +0000
+++ CMakeLists.txt	2013-04-22 14:43:26 +0000
@@ -100,16 +100,17 @@
     install(FILES "${U1DB_DOCS}/u1dbqt.qch"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/phrasebooks/"
         )
-    file(GLOB ALL_HTML ${U1DB_DOCS}/*.html)
-    install(FILES ${ALL_HTML}
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html
-        )
-    install(DIRECTORY "${U1DB_DOCS}/style"
+    install(DIRECTORY "${U1DB_DOCS}/"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
-        )
-    file(GLOB ALL_EXAMPLES ${U1DB_DOCS}/*example-*.html)
-    install(FILES ${ALL_EXAMPLES}
+        FILES_MATCHING PATTERN "*.html"
+        )
+    install(DIRECTORY "${U1DB_DOCS}/style/"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html/style"
+        FILES_MATCHING PATTERN "*.css"
+        )
+    install(DIRECTORY
         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/u1db-qt/examples
+        FILES_MATCHING PATTERN "*example-*.html"
         )
 endif ()
 

=== modified file 'debian/libu1db-qt5-doc.install'
--- debian/libu1db-qt5-doc.install	2013-04-22 09:27:48 +0000
+++ debian/libu1db-qt5-doc.install	2013-04-22 14:43:26 +0000
@@ -1,2 +1,3 @@
 usr/share/qt5/phrasebooks/*
-usr/share/u1db-qt/doc/html/*
+usr/share/u1db-qt/doc/html/*.html
+usr/share/u1db-qt/doc/html/style/*.css