[SCM] qtcreator packaging branch, master, updated. debian/2.8.1-3-21-g5f0f7ac

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Feb 26 02:20:56 UTC 2014


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

The following commit has been merged in the master branch:
commit a103a48809bacc9892fa12a5bd787ad534617755
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 25 23:19:31 2014 -0300

    Do not repeat override_dh_auto_install.
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index a9fdef9..6b8a51c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,9 @@ endif
 	dh_auto_install --destdir=debian/tmp/usr
 	dh_auto_build -- install_docs INSTALL_ROOT=$(CURDIR)/debian/tmp/usr
 
+	# Do not install the file, we better symlink it.
+	rm -vf debian/tmp/usr/share/qtcreator/debugger/LICENSE.LGPL
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/html lib/qmldesigner lib/qtcreator/plugins share/doc
@@ -57,11 +60,6 @@ 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



More information about the pkg-kde-commits mailing list