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

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

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

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)

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

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! :)

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 :)

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

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

-----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-----

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 :)