[SCM] qtcreator packaging branch, master, updated. 9c4326c006c561ecf65e36734e1dd97cc9ac205a

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 9c4326c006c561ecf65e36734e1dd97cc9ac205a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 27 14:01:00 2013 -0300

    Tell git to use dpkg-mergechangelogs.
---
 debian/.gitattributes |    1 +
 debian/changelog      |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 04e0259..0bbd9d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
   * Make every package that ships a binary managed by qtchooser depend on it.
   * Build the documentation using qmake. Taken from Ubuntu.
   * Override dh_install to pass --fail-missing.
+  * Tell git to use dpkg-mergechangelogs on merging changelogs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 May 2013 15:40:28 -0300
 

-- 
qtcreator packaging