uonedb-qt team mailing list archive

[Christian Dywan <christian.dywan@xxxxxxxxxxxxx>]

Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/creatorqch into lp:u1db-qt.

Commit message:
Add qch file for QtCreator to -dev package

Requested reviews:
  U1DB Qt developers (uonedb-qt)

For more details, see:
https://code.launchpad.net/~kalikiana/u1db-qt/creatorqch/+merge/162250

Add qch file for QtCreator to -dev package
-- 
https://code.launchpad.net/~kalikiana/u1db-qt/creatorqch/+merge/162250
Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/creatorqch into lp:u1db-qt.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 18:07:10 +0000
+++ debian/changelog	2013-05-02 21:24:24 +0000
@@ -1,3 +1,8 @@
+u1db-qt (0.1.4) quantal; urgency=low
+  * Add qch file for QtCreator to -dev package
+ 
+ -- Christian Dywan <christian.dywan@xxxxxxxxxxxxx>  Wed, 02 May 2013 14:21:33  -0700
+
 u1db-qt (0.1.3) quantal; urgency=low
   * Add QtCreator Application templates and plugins.qmltypes to -dev package
  

=== modified file 'debian/libu1db-qt5-dev.install'
--- debian/libu1db-qt5-dev.install	2013-05-01 18:07:10 +0000
+++ debian/libu1db-qt5-dev.install	2013-05-02 21:24:24 +0000
@@ -3,3 +3,4 @@
 usr/lib/pkgconfig/lib*.pc
 usr/lib/*/qt5/qml/*/plugins.qmltypes
 usr/share/qtcreator/templates/qml/*
+usr/share/qt5/phrasebooks/*

=== modified file 'documentation/CMakeLists.txt'
--- documentation/CMakeLists.txt	2013-05-01 22:49:50 +0000
+++ documentation/CMakeLists.txt	2013-05-02 21:24:24 +0000
@@ -25,6 +25,9 @@
     install(FILES "${U1DB_DOCS}/u1dbqt.qch"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/phrasebooks/"
         )
+    install(FILES "${U1DB_DOCS}/u1dbqt.qch"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/doc/qch/"
+        )
     install(DIRECTORY "${U1DB_DOCS}/"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
         FILES_MATCHING PATTERN "*.html"