Merge lp:~saviq/dee-qt/rename-libs into lp:~unity-team/dee-qt/qt4-and-qt5

[Michał Sawicz]

rename libqtdee to libdee-qt, refactor plugin and tests

  * rename the source package to dee-qt
  * rename libqtdee to libdee-qt
  * rename libqtdee-qt5 to libdee-qt5
  * bump version to 3.0.0
  * separate plugin out into "modules" directory
  * separate tests out
  * drop obsolete test.cpp

To converge on a single way to name libraries and friends, rename them from libqtdee to libdee-qt.

Refactor the plugin and tests.

[lp:~saviq/dee-qt/rename-libs]

82. By Michał Sawicz on 2012-11-30

rename libqtdee to libdee-qt [code and CMake], refactor plugin and tests

  * rename the source package to dee-qt
  * rename libqtdee to libdee-qt
  * rename libqtdee-qt5 to libdee-qt5
  * bump version to 3.0.0
  * separate plugin out into "modules" directory
  * separate tests out
  * drop obsolete test.cpp
  * rename dee 0.1 QML plugin to Dee 3.0

83. By Michał Sawicz on 2012-11-30

rename libqtdee to libdee-qt [packaging]

84. By Michał Sawicz on 2012-11-30

bump version in .pc

85. By Michał Sawicz on 2012-11-30

rename cmake project to dee-qt

86. By Michał Sawicz on 2012-11-30

fix .pc include dir

[Albert Astals Cid (aacid)]

You still have OUR_QT_TEST_LIB in the root CMakeLists.txt and seems we don't need it there since the uses where moved to tests/CMakeLists.txt, same for the use of the test includes inside OUR_QT_INCLUDES

You don't need the enable_testing in tests/CMakeLists.txt, the one in the root CMakeLists.txt is enough

Also I think that you don't need to concatenate OUR_QT_INCLUDES like you do in tests/CMakeLists.txt, you can just use a new variable and use it in include_directories, as far as i read the include_directories entry in the cmake man page the include_directories commands work like a stack so if the "old" OUR_QT_INCLUDES were already included in the root you'll already have them, just need to include the new stuff

review: Needs Fixing

[lp:~saviq/dee-qt/rename-libs]

87. By Michał Sawicz on 2012-11-30

tweak CMakeLists.txts

[Albert Astals Cid (aacid)]

The splitting and cmake stuff works fine and looks correct, I'll let Didier comment on the debian packaging stuff

review: Approve

[lp:~saviq/dee-qt/rename-libs]

88. By Michał Sawicz on 2012-11-30

add missing dev depends

[Cris Dywan (kalikiana)]

We should query qmake for the import path.

+ # FIXME: find a way to deterime that
+ set(IMPORT_INSTALL_DIR /opt/qt5/imports/Dee)

execute_process(COMMAND /opt/qt5/bin/qmake -query QT_INSTALL_IMPORTS OUTPUT_VARIABLE IMPORT_INSTALL_DIR)

[lp:~saviq/dee-qt/rename-libs]

89. By Michał Sawicz on 2012-12-04

use QT_IMPORTS_DIR to determine imports install path

[Cris Dywan (kalikiana)]

Nice work on QT_IMPORTS_DIR. I did a test run and it works well.

[Didier Roche-Tolomelli (didrocks)]

Hey! Nice work, mostly good, but still some fix needed :)

So, to handle the transition from a previous release, we need to tell apt that the new package name replaces the old packages.

For that, you need to Provides/Replaces/Conflicts in each stenza against the previous version so that the user don't end up in an unusable machine during upgrade ;)
You can see: http://wiki.debian.org/Renaming_a_Package (Method 1 for you)

The other thing is that we decided with zoltan to separate the QML in its own package, which will be called qtquick2.0-<upstream_name>-<soname>.

And that the qml files and path will contains those as well. If you need more info, please ping me on IRC :)

The rest is looking good to me, nice work! :)

review: Needs Fixing

[lp:~saviq/dee-qt/rename-libs]

90. By Michał Sawicz on 2012-12-06

enable multiarch, split plugin into a separate package

91. By Michał Sawicz on 2012-12-06

add a module directive in qmldir

[Didier Roche-Tolomelli (didrocks)]

I don't find qtbase and qtdeclarative on raring? what are those build-deps?

Also, I won't say that qtquick1.0-dee-3 provides libqtdee2, I'll just keep the conflicts/replaces here.

The rest seems quite ok to me, but I would love to see the debs or have an easy way to build it to look at them :)

review: Needs Information

[Didier Roche-Tolomelli (didrocks)]

 Simple QtQuick2 plugin for Dee (https://launchpad.net/dee).

ah, also please change that in the description (we tend to not write url)

[Michał Sawicz (saviq)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

W dniu 06.12.2012 13:20, Didier Roche pisze:
> Review: Needs Information
>
> I don't find qtbase and qtdeclarative on raring? what are those
> build-deps?

I'm using ppa:canonical-qt5-edgers/qt5-beta1, so you should be fine
building against that. We don't yet have qt5 in raring, although
ppa:canonical-qt5-edgers/qt5-proper is probably what is going to get
to the distro in the end. I can "rebase" on that, if needed.

> Also, I won't say that qtquick1.0-dee-3 provides libqtdee2, I'll
> just keep the conflicts/replaces here.

Should anything else provide libqtdee2? libdee-qt-3? Problem is that
qtquick1.0-dee-3 provides the QtQuick plugin that we had before

> The rest seems quite ok to me, but I would love to see the debs or
> have an easy way to build it to look at them :)

I've uploaded them to http://people.canonical.com/~msawicz/dee-qt/,
and will put them in a PPA in a sec.
- --
Michał Sawicz <email address hidden>
Canonical Services Ltd.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQIcBAEBAgAGBQJQwKCiAAoJEGnv7NPGHSZF46kQAITKNiNcE9FQzfNJG1Va7hxt
hxogjzN2xUE8of8Gq+W+9SdQedM2QdXpeI/Jy4zp0t8EX14zRVOZKWBcpA8dtXbw
Fhr3jVhnD61SwQw/lhTs87AgMpBfAl3Cfu0A8E4Zk52BNE6A2FfV3qOOQW+pREtm
RBmzl5RXEKImFLWLbp71QHQxlXQX9hwO3al6ZtuvggqTsNvnMNL4vCbwAUhO2WZD
vjnMlhLq/p/qoX5Z6NFyM1ILWOFAO1ONhYYcqbH2C36MmF54GpsbNGBzqbgQK+fE
fpSkzn0MZUhTOlKY/m45OsSOmtGQCbhbTf1C+Gue1HWLiHoxQ8EsQaB+K6ZiTlDf
VVadG6/8ty5h7SwUPNfeu1TVnIOg7phbzyiMyCn5MsH7+ZPXXoUSOLr5EeNgzrY4
Bi1tnRAb7HowZ1GXHV3+BNIDCZM6acklpnJF61VeZf/917VH/zZ0qtaCLR0EpYcS
bw0OZA2fubFmAk1DYwrasVkQZ4JiJlVFoROAV0ZIClGnDeqJHyr9Fuu4CZPFnjwy
atAbPuXGNVjod05OhbxQJfqhuUAXQyhsoz7o2WCA9pZ60gvNgc8uHm2IMglaxw3s
YqyWnWOJnnR8MJBJyqFhHNdhYABsr+BcF0qWRpqDlNWbTIM6YsjBz7lfU1YOBS9T
v81eDecksOefG5Ufuglf
=GtwX
-----END PGP SIGNATURE-----

[lp:~saviq/dee-qt/rename-libs]

92. By Michał Sawicz on 2012-12-06

add <soname> to library name

93. By Michał Sawicz on 2012-12-06

apply tweaks requested by Didier

[Didier Roche-Tolomelli (didrocks)]

everything is looking good to me packaging-wise. I think we'll revisit later for a double check once we'll be able to land that to ubuntu for sanity :)

review: Approve

[lp:~saviq/dee-qt/rename-libs]

94. By Michał Sawicz on 2013-01-28

use qml${version}-${project}-${version} naming scheme

95. By Michał Sawicz on 2013-01-30

break/replace previous qtquick{1,2}.0-dee-3 packages, enable testing

=== modified file '.bzrignore'
--- .bzrignore	2010-11-22 08:03:37 +0000
+++ .bzrignore	2013-01-31 15:15:25 +0000
@@ -2,7 +2,7 @@
 CMakeFiles
 Makefile
 cmake_install.cmake
-libQtDee.so*
+libdee-qt.so*
+libdee-qt5.so*
 moc_*.cxx
-test
 install_manifest.txt

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-27 18:40:27 +0000
+++ CMakeLists.txt	2013-01-31 15:15:25 +0000
@@ -1,6 +1,10 @@
-project(libqtdee)
+project(dee-qt)
 cmake_minimum_required(VERSION 2.8.6)
 
+set(SONAME 3)
+set(VERSION 3.0)
+set(SOVERSION 3.0.0)
+
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
@@ -10,22 +14,15 @@
   message("Building Qt5 version")
 
   find_package(Qt5Core REQUIRED)
-  find_package(Qt5Quick REQUIRED)
-  find_package(Qt5Test REQUIRED)
   find_package(Qt5DBus REQUIRED)
 
   add_definitions(-DWITHQT5=1)
 
-  set(QTDEE_LIBNAME QtDee-qt5)
-  set(OUR_QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Quick_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
+  set(DEE_QT_LIBNAME dee-qt5-${SONAME})
+  set(OUR_QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
   set(OUR_QT_CORE_LIB ${Qt5Core_LIBRARIES})
-  set(OUR_QT_TEST_LIB ${Qt5Test_LIBRARIES})
-  set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
   set(OUR_QT_DBUS_LIB ${Qt5DBus_LIBRARIES})
-  # FIXME: find a way to deterime that
-  set(IMPORT_INSTALL_DIR /opt/qt5/imports/dee)
-  set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtQuick")
-  set(QT_DEE_PKGCONFIG_FILE libqtdee-qt5.pc)
+  set(QT_PKGCONFIG_DEPENDENCIES "QtCore")
 else ()
   message("Building Qt4 version")
 
@@ -33,91 +30,57 @@
 
   add_definitions(-DWITHQT5=0)
 
-  set(QTDEE_LIBNAME QtDee)
-  set(OUR_QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTDECLARATIVE_INCLUDE_DIR} ${QT_QTTEST_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR})
+  set(DEE_QT_LIBNAME dee-qt-${SONAME})
+  set(OUR_QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR})
   set(OUR_QT_CORE_LIB ${QT_QTCORE_LIBRARIES})
-  set(OUR_QT_TEST_LIB ${QT_QTTEST_LIBRARIES})
-  set(OUR_QT_QUICK_LIB ${QT_QTDECLARATIVE_LIBRARIES})
   set(OUR_QT_DBUS_LIB ${QT_QTDBUS_LIBRARIES})
-  set(IMPORT_INSTALL_DIR lib/qt4/imports/dee)
-  set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtDBus QtDeclarative")
-  set(QT_DEE_PKGCONFIG_FILE libqtdee.pc)
+  set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtDBus")
 endif ()
+
+set(QT_DEE_PKGCONFIG_FILE lib${DEE_QT_LIBNAME}.pc)
+
 pkg_check_modules(DEE REQUIRED dee-1.0)
 
 # Build flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wundef -std=c++0x")
 
 # Sources
-## QtDee
-set(QtDee_SRCS
+set(DEE_QT_SRCS
     deelistmodel.cpp
     )
 
-set(QtDee_MOC_HDRS
-    deelistmodel.h
-    )
-
-
-## QtDeeQml
-set(QtDeeQml_SRCS
-    plugin.cpp
-    )
-
-set(QtDeeQml_MOC_HDRS
-    plugin.h
-    )
-
 # Build
 add_definitions(-DQT_NO_KEYWORDS)
 
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${OUR_QT_INCLUDES}
     ${DEE_INCLUDE_DIRS}
     )
 
-## QtDee
-add_library(${QTDEE_LIBNAME} SHARED ${QtDee_SRCS} ${QtDee_MOC_SRCS})
-target_link_libraries(${QTDEE_LIBNAME}
+add_library(${DEE_QT_LIBNAME} SHARED ${DEE_QT_SRCS})
+target_link_libraries(${DEE_QT_LIBNAME}
     ${OUR_QT_CORE_LIB}
     ${DEE_LDFLAGS}
     )
 
-set_target_properties(${QTDEE_LIBNAME} PROPERTIES
-  SOVERSION 2
-  VERSION 2.0.0
-  )
-
-## QtDeeQml
-add_library(QtDeeQml SHARED ${QtDeeQml_SRCS} ${QtDeeQml_MOC_SRCS})
-
-target_link_libraries(QtDeeQml
-  ${QTDEE_LIBNAME}
-  ${OUR_QT_QUICK_LIB}
-  )
-
-## test
-set(test_SRCS
-    test.cpp
-    )
-
-set(test_MOC_HDRS
-    test.h
-    )
-
-add_executable(test ${test_SRCS} ${test_MOC_SRCS})
-set_target_properties(test PROPERTIES COMPILE_FLAGS -fPIC)
-target_link_libraries(test
-  ${QTDEE_LIBNAME}
-  )
+set_target_properties(${DEE_QT_LIBNAME} PROPERTIES
+  SOVERSION ${SONAME}
+  VERSION ${SOVERSION}
+  )
+
+# Unit-Test
+enable_testing()
+
+add_subdirectory(modules)
+add_subdirectory(tests)
 
 # Install
-set(INCLUDE_INSTALL_DIR include/QtDee)
+set(INCLUDE_INSTALL_DIR include/lib${DEE_QT_LIBNAME})
 
-## QtDee
-install(TARGETS ${QTDEE_LIBNAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+install(TARGETS ${DEE_QT_LIBNAME}
+    LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}${LIB_SUFFIX}
     )
 
 install(FILES deelistmodel.h
@@ -128,36 +91,9 @@
 set (PREFIX "${CMAKE_INSTALL_PREFIX}")
 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
-configure_file (libqtdee.pc.in
+configure_file (libdee-qt.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/${QT_DEE_PKGCONFIG_FILE} @ONLY)
 
 install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${QT_DEE_PKGCONFIG_FILE}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
-    )
-
-## QtDeeQml
-install(TARGETS QtDeeQml
-    LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
-    )
-
-install(FILES qmldir
-    DESTINATION ${IMPORT_INSTALL_DIR}
-    )
-
-## Unit-Test
-enable_testing()
-add_executable(conversiontest conversiontest.cpp)
-target_link_libraries(conversiontest ${OUR_QT_TEST_LIB} ${QTDEE_LIBNAME})
-set_target_properties(conversiontest PROPERTIES COMPILE_FLAGS -fPIC)
-add_test(NAME conversiontest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/conversiontest" "-p" "-xunitxml" "-p" "-o" "-p" "conversiontest-xunit.xml")
-set_property(TEST conversiontest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
-
-add_executable(test-helper test-helper.cpp)
-target_link_libraries(test-helper ${OUR_QT_CORE_LIB} ${OUR_QT_DBUS_LIB} ${DEE_LDFLAGS})
-set_target_properties(test-helper PROPERTIES COMPILE_FLAGS -fPIC)
-
-add_executable(deelistmodeltest deelistmodeltest.cpp)
-target_link_libraries(deelistmodeltest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${QTDEE_LIBNAME})
-set_target_properties(deelistmodeltest PROPERTIES COMPILE_FLAGS -fPIC)
-add_test(NAME deelistmodeltest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/test-helper" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deelistmodeltest" "-p" "-xunitxml" "-p" "-o" "-p" "deelistmodeltest-xunit.xml")
-set_property(TEST deelistmodeltest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig
+    )

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-27 18:40:27 +0000
+++ debian/changelog	2013-01-31 15:15:25 +0000
@@ -1,3 +1,16 @@
+dee-qt (3.0-0ubuntu1) quantal; urgency=low
+
+  * new release
+  * rename the source package to dee-qt
+  * rename libqtdee to libdee-qt
+  * rename libqtdee-qt5 to libdee-qt5
+  * separate plugin out into "modules" directory
+  * separate tests out
+  * drop obsolete test.cpp
+  * rename dee 0.1 QML plugin to Dee 3.0
+
+ -- Michał Sawicz <[e-mail]>  Fri, 30 Nov 2012 12:32:41 +0100
+
 libqtdee (0.2.4-0ubuntu4) quantal; urgency=low
 
   * debian/rules

=== modified file 'debian/control'
--- debian/control	2012-11-21 15:20:20 +0000
+++ debian/control	2013-01-31 15:15:25 +0000
@@ -1,4 +1,4 @@
-Source: libqtdee
+Source: dee-qt
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -15,41 +15,67 @@
 # just go ahead.  ~unity-team will notice and sync up the code again.
 Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/dee-qt/trunk
 
-Package: libqtdee2
+Package: libdee-qt-3
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libqt4-dbus,
          libqt4-declarative,
-Description: Qt binding and QML plugin for Dee - shared library
- Simple Qt binding and QML plugin for Dee (https://launchpad.net/dee).
-
-Package: libqtdee-dev
+Description: Qt4 binding for Dee - shared library
+ Simple Qt4 binding for Dee.
+
+Package: qml1-dee-3
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libdee-qt-3 (= ${binary:Version}),
+Breaks: qtquick1.0-dee-3
+Replaces: libqtdee2, qtquick1.0-dee-3
+Conflicts: libqtdee2
+Description: QtQuick1 plugin for Dee
+ Simple QtQuick1 plugin for Dee.
+
+Package: libdee-qt-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libqtdee2 (= ${binary:Version}),
+         libdee-qt-3 (= ${binary:Version}),
          libqt4-dev (>= 4.7),
-Description: Qt binding and QML plugin for Dee - development files
- Simple Qt binding and QML plugin for Dee (https://launchpad.net/dee).
+         libdee-dev (>= 1.0.0),
+Provides: libqtdee-dev
+Replaces: libqtdee-dev
+Conflicts: libqtdee-dev
+Description: Qt binding for Dee - development files
+ Simple Qt binding for Dee.
  .
  This package contains the developer headers for the Qt binding for Dee
 
-Package: libqtdee-qt5
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Description: Qt5 binding and QtQuick2 plugin for Dee - shared library
- Simple Qt5 binding and QtQuick2 plugin for Dee (https://launchpad.net/dee).
-
-Package: libqtdee-qt5-dev
+Package: libdee-qt5-3
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+Description: Qt5 binding for Dee - shared library
+ Simple Qt5 binding for Dee.
+
+Package: qml2-dee-3
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libdee-qt5-3 (= ${binary:Version}),
+Breaks: qtquick2.0-dee-3
+Replaces: qtquick2.0-dee-3
+Description: QtQuick2 plugin for Dee
+ Simple QtQuick2 plugin for Dee.
+
+Package: libdee-qt5-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libqtdee-qt5 (= ${binary:Version}),
+         libdee-qt5-3 (= ${binary:Version}),
          qtbase,
          qtdeclarative,
-Description: Qt5 binding and QtQuick2 plugin for Dee - development files
- Simple Qt5 binding and QtQuick2 plugin for Dee (https://launchpad.net/dee).
+         libdee-dev (>= 1.0.0),
+Description: Qt5 binding for Dee - development files
+ Simple Qt5 binding for Dee.
  .
  This package contains the developer headers for the Qt binding for Dee

=== renamed file 'debian/libqtdee2.install' => 'debian/libdee-qt-3.install'
--- debian/libqtdee2.install	2011-01-28 05:27:37 +0000
+++ debian/libdee-qt-3.install	2013-01-31 15:15:25 +0000
@@ -1,3 +1,1 @@
-usr/lib/libQtDee.so.*
-usr/lib/qt4/imports/dee/libQtDeeQml.so
-usr/lib/qt4/imports/dee/qmldir
+usr/lib/*/libdee-qt-3.so.*

=== renamed file 'debian/libqtdee-dev.install' => 'debian/libdee-qt-dev.install'
--- debian/libqtdee-dev.install	2012-01-05 20:27:31 +0000
+++ debian/libdee-qt-dev.install	2013-01-31 15:15:25 +0000
@@ -1,3 +1,3 @@
-usr/lib/libQtDee.so
-usr/include/QtDee/*.h
-usr/lib/pkgconfig/libqtdee.pc
+usr/include/libdee-qt-3/*.h
+usr/lib/*/libdee-qt-3.so
+usr/lib/*/pkgconfig/libdee-qt-3.pc

=== renamed file 'debian/libqtdee-qt5.install' => 'debian/libdee-qt5-3.install'
--- debian/libqtdee-qt5.install	2012-11-27 18:40:27 +0000
+++ debian/libdee-qt5-3.install	2013-01-31 15:15:25 +0000
@@ -1,3 +1,1 @@
-usr/lib/libQtDee-qt5.so.*
-opt/qt5/imports/dee/libQtDeeQml.so
-opt/qt5/imports/dee/qmldir
+usr/lib/*/libdee-qt5-3.so.*

=== renamed file 'debian/libqtdee-qt5-dev.install' => 'debian/libdee-qt5-dev.install'
--- debian/libqtdee-qt5-dev.install	2012-11-27 18:40:27 +0000
+++ debian/libdee-qt5-dev.install	2013-01-31 15:15:25 +0000
@@ -1,3 +1,3 @@
-usr/lib/libQtDee-qt5.so
-usr/include/QtDee/*.h
-usr/lib/pkgconfig/libqtdee-qt5.pc
+usr/include/libdee-qt5-3/*.h
+usr/lib/*/libdee-qt5-3.so
+usr/lib/*/pkgconfig/libdee-qt5-3.pc

=== added file 'debian/qml1-dee-3.install'
--- debian/qml1-dee-3.install	1970-01-01 00:00:00 +0000
+++ debian/qml1-dee-3.install	2013-01-31 15:15:25 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/qt4/imports/Dee.3/libDeePlugin.so
+usr/lib/*/qt4/imports/Dee.3/qmldir

=== added file 'debian/qml2-dee-3.install'
--- debian/qml2-dee-3.install	1970-01-01 00:00:00 +0000
+++ debian/qml2-dee-3.install	2013-01-31 15:15:25 +0000
@@ -0,0 +1,2 @@
+opt/qt5/imports/Dee.3/libDeePlugin.so
+opt/qt5/imports/Dee.3/qmldir

=== modified file 'debian/rules'
--- debian/rules	2012-11-27 18:40:27 +0000
+++ debian/rules	2013-01-31 15:15:25 +0000
@@ -12,9 +12,7 @@
 override_dh_auto_configure:
 	dh_auto_configure -Bbuild/qt4 -- -DWITHQT5=0
 	PATH=/opt/qt5/bin:$(PATH) \
-	dh_auto_configure -Bbuild/qt5 -- -DCMAKE_MODULE_PATH=/opt/qt5/lib/cmake \
-					 -DLD_LIBRARY_PATH=/opt/qt5/lib:$(LD_LIBRARY_PATH) \
-					 -DWITHQT5=1
+	dh_auto_configure -Bbuild/qt5 -- -DWITHQT5=1
 
 override_dh_auto_build:
 	dh_auto_build -Bbuild/qt4
@@ -25,6 +23,8 @@
 	dh_auto_clean -Bbuild/qt5
 
 override_dh_auto_test:
+	dh_auto_test -Bbuild/qt4
+	dh_auto_test -Bbuild/qt5
 
 override_dh_auto_install:
 	dh_auto_install -Bbuild/qt4

=== renamed file 'libqtdee.pc.in' => 'libdee-qt.pc.in'
--- libqtdee.pc.in	2012-11-12 12:48:13 +0000
+++ libdee-qt.pc.in	2013-01-31 15:15:25 +0000
@@ -1,12 +1,12 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=${exec_prefix}/lib/@CMAKE_LIBRARY_ARCHITECTURE@
+includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
-Name: libqtdee
+Name: @DEE_QT_LIBNAME@
 Description: Qt binding and QML plugin for Dee.
-Version: 0.2
+Version: @VERSION@
 
 Requires: @QT_PKGCONFIG_DEPENDENCIES@ dee-1.0
-Libs: -L${libdir} -l@QTDEE_LIBNAME@
-Cflags: -I${includedir}/QtDee
+Libs: -L${libdir} -l@DEE_QT_LIBNAME@
+Cflags: -I${includedir}

=== added directory 'modules'
=== added file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/CMakeLists.txt	2013-01-31 15:15:25 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Dee)

=== added directory 'modules/Dee'
=== added file 'modules/Dee/CMakeLists.txt'
--- modules/Dee/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/Dee/CMakeLists.txt	2013-01-31 15:15:25 +0000
@@ -0,0 +1,45 @@
+
+if (WITHQT5)
+  find_package(Qt5Quick REQUIRED)
+  set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
+
+  get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+  exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_IMPORTS" OUTPUT_VARIABLE QT_IMPORTS_DIR)
+  file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
+
+  set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
+  LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "QtQuick")
+else ()
+  set(OUR_QT_QUICK_LIB ${QT_QTDECLARATIVE_LIBRARIES})
+  set(OUR_QT_QUICK_INCLUDE ${QT_QTDECLARATIVE_INCLUDE_DIR})
+  LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "QtDeclarative")
+endif ()
+
+set(DeePlugin_SRCS
+    plugin.cpp
+    )
+
+add_library(DeePlugin SHARED ${DeePlugin_SRCS})
+
+target_link_libraries(DeePlugin
+  ${DEE_QT_LIBNAME}
+  ${OUR_QT_QUICK_LIB}
+  )
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${OUR_QT_QUICK_INCLUDE}
+    )
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+install(TARGETS DeePlugin
+    LIBRARY DESTINATION ${QT_IMPORTS_DIR}/Dee.${SONAME}
+    )
+
+install(FILES qmldir
+    DESTINATION ${QT_IMPORTS_DIR}/Dee.${SONAME}
+    )

=== renamed file 'plugin.cpp' => 'modules/Dee/plugin.cpp'
--- plugin.cpp	2012-11-12 12:48:13 +0000
+++ modules/Dee/plugin.cpp	2013-01-31 15:15:25 +0000
@@ -25,11 +25,11 @@
   #include <QtDeclarative/qdeclarative.h>
 #endif
 
-void QtDeePlugin::registerTypes(const char *uri)
+void DeePlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
+    qmlRegisterType<DeeListModel>(uri, 3, 0, "DeeListModel");
 }
 
 #if !WITHQT5
-  Q_EXPORT_PLUGIN2(QtDee, QtDeePlugin);
+  Q_EXPORT_PLUGIN2(Dee, DeePlugin);
 #endif

=== renamed file 'plugin.h' => 'modules/Dee/plugin.h'
--- plugin.h	2012-11-12 12:48:13 +0000
+++ modules/Dee/plugin.h	2013-01-31 15:15:25 +0000
@@ -26,7 +26,7 @@
   #include <QtDeclarative/QDeclarativeExtensionPlugin>
 #endif
 
-class QtDeePlugin :
+class DeePlugin :
 #if WITHQT5
   public QQmlExtensionPlugin
 #else

=== renamed file 'qmldir' => 'modules/Dee/qmldir'
--- qmldir	2011-01-13 16:05:58 +0000
+++ modules/Dee/qmldir	2013-01-31 15:15:25 +0000
@@ -1,1 +1,2 @@
-plugin QtDeeQml
+module Dee
+plugin DeePlugin

=== removed file 'test.cpp'
--- test.cpp	2011-01-24 04:05:02 +0000
+++ test.cpp	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "test.h"
-#include "deelistmodel.h"
-
-int main(int argc, char *argv[])
-{
-    TestApplication application(argc, argv);
-
-    DeeListModel* model = new DeeListModel;
-
-    QObject::connect(model, SIGNAL(synchronizedChanged(bool)), &application, SLOT(onSynchronizedChanged(bool)));
-    QObject::connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), &application, SLOT(onRowsInserted()));
-
-    model->setName("com.canonical.Unity.ApplicationsPlace.ResultsModel");
-
-    return application.exec();
-}

=== removed file 'test.h'
--- test.h	2012-01-04 23:52:05 +0000
+++ test.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TEST_H
-#define TEST_H
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-
-#include "deelistmodel.h"
-
-class TestApplication : public QCoreApplication
-{
-    Q_OBJECT
-
-public:
-    TestApplication(int& argc, char** argv) : QCoreApplication(argc, argv) {}
-
-public Q_SLOTS:
-    void onSynchronizedChanged(bool synchronized) {
-        DeeListModel* model = (DeeListModel*)sender();
-        qDebug() << "Number of columns:" << model->roleNames().size();
-        qDebug() << "Number of rows:" << model->rowCount();
-
-        for(int i = 0; i < model->rowCount(); ++i) {
-            qDebug() << model->data(model->index(i));
-        }
-    }
-
-    void onRowsInserted() {
-        DeeListModel* model = (DeeListModel*)sender();
-        qDebug() << "Rows added, current number:" << model->rowCount();
-    }
-};
-
-#endif // TEST_H

=== added directory 'tests'
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2013-01-31 15:15:25 +0000
@@ -0,0 +1,29 @@
+if (WITHQT5)
+  find_package(Qt5Test REQUIRED)
+  set(OUR_QT_TEST_LIB ${Qt5Test_LIBRARIES})
+  set(OUR_QT_TEST_INCLUDES ${Qt5Test_INCLUDE_DIRS})
+else ()
+  set(OUR_QT_TEST_LIB ${QT_QTTEST_LIBRARIES})
+  set(OUR_QT_TEST_INCLUDES ${QT_QTTEST_INCLUDE_DIR})
+endif ()
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${OUR_QT_TEST_INCLUDES}
+    )
+
+add_executable(conversiontest conversiontest.cpp)
+target_link_libraries(conversiontest ${OUR_QT_TEST_LIB} ${DEE_QT_LIBNAME})
+set_target_properties(conversiontest PROPERTIES COMPILE_FLAGS -fPIC)
+add_test(NAME conversiontest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/conversiontest" "-p" "-xunitxml" "-p" "-o" "-p" "conversiontest-xunit.xml")
+set_property(TEST conversiontest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+
+add_executable(test-helper test-helper.cpp)
+target_link_libraries(test-helper ${OUR_QT_CORE_LIB} ${OUR_QT_DBUS_LIB} ${DEE_LDFLAGS})
+set_target_properties(test-helper PROPERTIES COMPILE_FLAGS -fPIC)
+
+add_executable(deelistmodeltest deelistmodeltest.cpp)
+target_link_libraries(deelistmodeltest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${DEE_QT_LIBNAME})
+set_target_properties(deelistmodeltest PROPERTIES COMPILE_FLAGS -fPIC)
+add_test(NAME deelistmodeltest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/test-helper" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deelistmodeltest" "-p" "-xunitxml" "-p" "-o" "-p" "deelistmodeltest-xunit.xml")
+set_property(TEST deelistmodeltest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")

=== renamed file 'conversiontest.cpp' => 'tests/conversiontest.cpp'
=== renamed file 'deelistmodeltest.cpp' => 'tests/deelistmodeltest.cpp'
=== renamed file 'test-helper.cpp' => 'tests/test-helper.cpp'
=== renamed file 'test_qtquick1.qml' => 'tests/test_qtquick1.qml'
--- test_qtquick1.qml	2012-11-12 12:48:13 +0000
+++ tests/test_qtquick1.qml	2013-01-31 15:15:25 +0000
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import dee 0.1
+import Dee 3.0
 
 ListView {
     width: 200

=== renamed file 'test_qtquick2.qml' => 'tests/test_qtquick2.qml'
--- test_qtquick2.qml	2012-11-12 12:48:13 +0000
+++ tests/test_qtquick2.qml	2013-01-31 15:15:25 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import dee 0.1
+import Dee 3.0
 
 ListView {
     width: 200