Merge lp:~bzoltan/qtcreator-plugin-cmake/fix-1293022 into lp:qtcreator-plugin-cmake

[Zoltan Balogh]

fixed https://bugs.launchpad.net/ubuntu/+source/qtcreator-plugin-cmake/+bug/1293022

fixed https://bugs.launchpad.net/ubuntu/+source/qtcreator-plugin-cmake/+bug/1293022

[Timo Jyrinki (timo-jyrinki)]

It's good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-15 12:58:01 +0000
+++ debian/control	2014-03-16 09:25:22 +0000
@@ -21,6 +21,8 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Replaces: qtcreator (<= 2.8.2)
+Conflicts: qtcreator (<= 2.8.2)
 Description: CMake plugin for Qt Creator IDE
  Qt Creator is a new, lightweight, cross-platform integrated development
  environment (IDE) designed to make development with the Qt application
@@ -33,6 +35,8 @@
 Architecture: any
 Depends: qtcreator-plugin-cmake (= ${binary:Version}),
          ${misc:Depends},
+Replaces: qtcreator-dev (<= 2.8.2)
+Conflicts: qtcreator-dev (<= 2.8.2)
 Description: Qt Creator cmake plugin development files
  This package contains the developer files for Qt
  Creator cmake plugin evelopment