[SCM] qbs packaging branch, master, updated. debian/1.2.2+dfsg-1-13-gef96cd9

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=ef96cd9

The following commit has been merged in the master branch:
commit ef96cd993ab3f06e29665303d3865138e5fcda9d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Oct 4 10:26:06 2014 +0400

    Break/Replace qtcreator (<< 3.2.1+dfsg-4~) (closes: #763365).
---
 debian/changelog | 1 +
 debian/control   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 897b1fd..e698065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qbs (1.3.1+dfsg-1) UNRELEASED; urgency=medium
     + Update .install files.
     + Update libqbscore1.symbols. There are missing symbols, but
       we ignore that as the package has never been in testing.
+  * Break/Replace qtcreator (<< 3.2.1+dfsg-4~) (closes: #763365).
   * Fix build failure when multiple compilers are installed.
   * Properly clean up after tests.
   * Update my e-mail address.
diff --git a/debian/control b/debian/control
index b94fcae..25979c9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qbs.git
 Package: qbs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtcreator (<< 3.2.1+dfsg-4~)
+Replaces: qtcreator (<< 3.2.1+dfsg-4~)
 Description: Qt Build Suite
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
qbs packaging