[SCM] qtcreator packaging branch, master, updated. debian/2.8.1-3-11-g3003ff3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 3003ff304c26669bbf3f0845b3b3e01b7a5b3cf1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 24 23:58:09 2014 -0300

    Avoid installing a license file and symlink it to it's common-licenses' counterpart.
---
 debian/changelog            | 2 ++
 debian/qtcreator-data.links | 1 +
 debian/rules                | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0043571..21eecb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ qtcreator (3.0.1-1) UNRELEASED; urgency=medium
   * Remove rule to compress the packages with xz, it is now the default
     compression method.
   * Bump Standards-Version to 3.9.5, no changes required.
+  * Avoid installing a license file and symlink it to it's common-licenses'
+    counterpart.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Feb 2014 22:24:57 -0300
 
diff --git a/debian/qtcreator-data.links b/debian/qtcreator-data.links
index 49f103b..455fb67 100644
--- a/debian/qtcreator-data.links
+++ b/debian/qtcreator-data.links
@@ -1,6 +1,7 @@
 usr/share/common-licenses/LGPL-2.1 usr/share/qtcreator/dumper/LICENSE.LGPL
 usr/share/common-licenses/LGPL-2.1 usr/share/qtcreator/qml/qmldump/LICENSE.LGPL
 usr/share/common-licenses/LGPL-2.1 usr/share/qtcreator/qml/qmlobserver/LICENSE.LGPL
+usr/share/common-licenses/LGPL-2.1 usr/share/qtcreator/debugger/LICENSE.LGPL
 usr/share/doc/qtcreator/LGPL_EXCEPTION.TXT usr/share/qtcreator/dumper/LGPL_EXCEPTION.TXT
 usr/share/doc/qtcreator/LGPL_EXCEPTION.TXT usr/share/qtcreator/qml/qmldump/LGPL_EXCEPTION.TXT
 usr/share/doc/qtcreator/LGPL_EXCEPTION.TXT usr/share/qtcreator/qml/qmlobserver/LGPL_EXCEPTION.TXT
diff --git a/debian/rules b/debian/rules
index a1a47af..415fe64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,11 @@ override_dh_auto_clean:
 	find . -type d -name '.rcc' | xargs rm -rf
 	find . -type d -name '.uic' | xargs rm -rf
 
+override_dh_auto_install:
+	dh_auto_install
+	# Do not install the file, we better symlink it.
+	rm -vf debian/tmp/usr/share/qtcreator/debugger/LICENSE.LGPL
+
 override_dh_install:
 	# Remove arch-specific files from /usr/share until
 	# https://bugreports.qt-project.org/browse/QTCREATORBUG-10074

-- 
qtcreator packaging