U1DB Qt/ QML

Merge lp:~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch into lp:u1db-qt

  1. split_qmlplugin_add_multiarch
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Cris Dywan
Approved revision: 97
Merged at revision: 97
Proposed branch: lp:~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch
Merge into: lp:u1db-qt
Diff against target: 116 lines (+28/-8)
7 files modified
CMakeLists.txt (+4/-1)
debian/changelog (+1/-1)
debian/control (+17/-0)
debian/libu1db-qt5-3.install (+1/-3)
debian/libu1db-qt5-dev.install (+2/-2)
debian/qtdeclarative5-u1db-plugin.install (+2/-0)
src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+177819@code.launchpad.net

Commit message

Split QML plugin, install into multi-arch directories.

Description of the change

Split QML plugin, install into multi-arch directories.

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

PASSED: Continuous integration, rev:97
http://91.189.93.70:8080/job/u1db-qt-ci/13/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-precise-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-saucy-amd64-ci/13

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

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Nice to see some hard-coding of lib as a path go away. Looks good!

review: Approve

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-05-01 22:49:50 +0000
3+++ CMakeLists.txt 2013-07-31 12:24:26 +0000
4@@ -6,6 +6,7 @@
5
6 # Dependencies
7 include(FindPkgConfig)
8+include(GNUInstallDirs)
9 find_package(Qt5Core REQUIRED)
10 find_package(Qt5Sql REQUIRED)
11 add_definitions(-DWITHQT5=1)
12@@ -32,11 +33,13 @@
13 # PkgConfig file
14 set (PREFIX "${CMAKE_INSTALL_PREFIX}")
15 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
16+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
17+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
18
19 configure_file (libu1db-qt.pc.in
20 ${CMAKE_CURRENT_BINARY_DIR}/${QT_U1DB_PKGCONFIG_FILE} @ONLY)
21
22 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${QT_U1DB_PKGCONFIG_FILE}
23- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
24+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
25 )
26
27
28=== modified file 'debian/changelog'
29--- debian/changelog 2013-07-31 08:31:23 +0000
30+++ debian/changelog 2013-07-31 12:24:26 +0000
31@@ -5,7 +5,7 @@
32 https://wiki.ubuntu.com/DailyRelease/InlinePackaging
33
34 [ Timo Jyrinki ]
35- * Automatic snapshot from revision 94 (bootstrap)
36+ * Automatic snapshot from revision 96 (bootstrap)
37
38 -- Christian Dywan <christian.dywan@canonical.com> Mon, 01 Jul 2013 14:37:36 +0200
39
40
41=== modified file 'debian/control'
42--- debian/control 2013-07-30 08:53:00 +0000
43+++ debian/control 2013-07-31 12:24:26 +0000
44@@ -21,6 +21,7 @@
45
46 Package: libu1db-qt5-3
47 Architecture: any
48+Multi-Arch: same
49 Pre-Depends: dpkg (>= 1.15.6~),
50 ${misc:Pre-Depends},
51 Depends: libqt5sql5-sqlite,
52@@ -29,6 +30,22 @@
53 ${shlibs:Depends},
54 Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library
55 Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
56+ .
57+ This package contains the shared library.
58+
59+Package: qtdeclarative5-u1db-plugin
60+Architecture: any
61+Multi-Arch: same
62+Pre-Depends: dpkg (>= 1.15.6~),
63+ ${misc:Pre-Depends},
64+Depends: libqt5sql5-sqlite,
65+ qtdeclarative5-qtquick2-plugin,
66+ ${misc:Depends},
67+ ${shlibs:Depends},
68+Description: Qt5 binding and QtQuick2 plugin for U1DB - QML plugin
69+ Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
70+ .
71+ This package contains the QML plugin.
72
73 Package: libu1db-qt5-dev
74 Section: libdevel
75
76=== modified file 'debian/libu1db-qt5-3.install'
77--- debian/libu1db-qt5-3.install 2013-07-30 08:53:00 +0000
78+++ debian/libu1db-qt5-3.install 2013-07-31 12:24:26 +0000
79@@ -1,3 +1,1 @@
80-usr/lib/*/qt5/qml/*/lib*Plugin.so
81-usr/lib/*/qt5/qml/*/qmldir
82-usr/lib/lib*.so.*
83+usr/lib/*/lib*.so.*
84
85=== modified file 'debian/libu1db-qt5-dev.install'
86--- debian/libu1db-qt5-dev.install 2013-07-30 08:53:00 +0000
87+++ debian/libu1db-qt5-dev.install 2013-07-31 12:24:26 +0000
88@@ -1,6 +1,6 @@
89 usr/include/lib*/*.h
90 usr/lib/*/qt5/qml/*/plugins.qmltypes
91-usr/lib/lib*.so
92-usr/lib/pkgconfig/lib*.pc
93+usr/lib/*/lib*.so
94+usr/lib/*/pkgconfig/lib*.pc
95 usr/share/qt5/doc/qch/*
96 usr/share/qtcreator/templates/qml/*
97
98=== added file 'debian/qtdeclarative5-u1db-plugin.install'
99--- debian/qtdeclarative5-u1db-plugin.install 1970-01-01 00:00:00 +0000
100+++ debian/qtdeclarative5-u1db-plugin.install 2013-07-31 12:24:26 +0000
101@@ -0,0 +1,2 @@
102+usr/lib/*/qt5/qml/*/lib*Plugin.so
103+usr/lib/*/qt5/qml/*/qmldir
104
105=== modified file 'src/CMakeLists.txt'
106--- src/CMakeLists.txt 2013-04-23 10:39:54 +0000
107+++ src/CMakeLists.txt 2013-07-31 12:24:26 +0000
108@@ -47,7 +47,7 @@
109 set(INCLUDE_INSTALL_DIR include/lib${U1DB_QT_LIBNAME})
110
111 install(TARGETS ${U1DB_QT_LIBNAME}
112- LIBRARY DESTINATION lib${LIB_SUFFIX}
113+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
114 )
115
116 install(FILES global.h database.h document.h index.h query.h

Subscribers

People subscribed via source and target branches

to all changes: