uonedb-qt team mailing list archive

[Timo Jyrinki <timo.jyrinki@xxxxxxxxxxxxx>]

Timo Jyrinki has proposed merging lp:~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch into lp:u1db-qt.

Commit message:
Split QML plugin, install into multi-arch directories.

Requested reviews:
  U1DB Qt developers (uonedb-qt)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch/+merge/177819

Split QML plugin, install into multi-arch directories.
-- 
https://code.launchpad.net/~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch/+merge/177819
Your team U1DB Qt developers is requested to review the proposed merge of lp:~timo-jyrinki/u1db-qt/split_qmlplugin_add_multiarch into lp:u1db-qt.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-01 22:49:50 +0000
+++ CMakeLists.txt	2013-07-31 12:24:26 +0000
@@ -6,6 +6,7 @@
 
 # Dependencies
 include(FindPkgConfig)
+include(GNUInstallDirs)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Sql REQUIRED)
 add_definitions(-DWITHQT5=1)
@@ -32,11 +33,13 @@
 # PkgConfig file
 set (PREFIX "${CMAKE_INSTALL_PREFIX}")
 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
 
 configure_file (libu1db-qt.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/${QT_U1DB_PKGCONFIG_FILE} @ONLY)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${QT_U1DB_PKGCONFIG_FILE}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
     )
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-31 08:31:23 +0000
+++ debian/changelog	2013-07-31 12:24:26 +0000
@@ -5,7 +5,7 @@
     https://wiki.ubuntu.com/DailyRelease/InlinePackaging
 
   [ Timo Jyrinki ]
-  * Automatic snapshot from revision 94 (bootstrap)
+  * Automatic snapshot from revision 96 (bootstrap)
 
  -- Christian Dywan <christian.dywan@xxxxxxxxxxxxx>  Mon, 01 Jul 2013 14:37:36 +0200
 

=== modified file 'debian/control'
--- debian/control	2013-07-30 08:53:00 +0000
+++ debian/control	2013-07-31 12:24:26 +0000
@@ -21,6 +21,7 @@
 
 Package: libu1db-qt5-3
 Architecture: any
+Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~),
              ${misc:Pre-Depends},
 Depends: libqt5sql5-sqlite,
@@ -29,6 +30,22 @@
          ${shlibs:Depends},
 Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
+ .
+ This package contains the shared library.
+
+Package: qtdeclarative5-u1db-plugin
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: libqt5sql5-sqlite,
+         qtdeclarative5-qtquick2-plugin,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt5 binding and QtQuick2 plugin for U1DB - QML plugin
+ Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
+ .
+ This package contains the QML plugin.
 
 Package: libu1db-qt5-dev
 Section: libdevel

=== modified file 'debian/libu1db-qt5-3.install'
--- debian/libu1db-qt5-3.install	2013-07-30 08:53:00 +0000
+++ debian/libu1db-qt5-3.install	2013-07-31 12:24:26 +0000
@@ -1,3 +1,1 @@
-usr/lib/*/qt5/qml/*/lib*Plugin.so
-usr/lib/*/qt5/qml/*/qmldir
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

=== modified file 'debian/libu1db-qt5-dev.install'
--- debian/libu1db-qt5-dev.install	2013-07-30 08:53:00 +0000
+++ debian/libu1db-qt5-dev.install	2013-07-31 12:24:26 +0000
@@ -1,6 +1,6 @@
 usr/include/lib*/*.h
 usr/lib/*/qt5/qml/*/plugins.qmltypes
-usr/lib/lib*.so
-usr/lib/pkgconfig/lib*.pc
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/lib*.pc
 usr/share/qt5/doc/qch/*
 usr/share/qtcreator/templates/qml/*

=== added file 'debian/qtdeclarative5-u1db-plugin.install'
--- debian/qtdeclarative5-u1db-plugin.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-u1db-plugin.install	2013-07-31 12:24:26 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/qml/*/lib*Plugin.so
+usr/lib/*/qt5/qml/*/qmldir

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-04-23 10:39:54 +0000
+++ src/CMakeLists.txt	2013-07-31 12:24:26 +0000
@@ -47,7 +47,7 @@
 set(INCLUDE_INSTALL_DIR include/lib${U1DB_QT_LIBNAME})
 
 install(TARGETS ${U1DB_QT_LIBNAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
 
 install(FILES global.h database.h document.h index.h query.h