[SCM] KDevelop packaging branch, experimental, updated. debian/4.7.3-3-16-g701bc3b
Pino Toscano
pino at moszumanska.debian.org
Fri Aug 26 05:52:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=de6fb30
The following commit has been merged in the experimental branch:
commit de6fb303b777383bd0b0e17b63a43424b0e24c57
Author: Pino Toscano <pino at debian.org>
Date: Fri Aug 26 07:43:35 2016 +0200
install qmake_qt4guiapp.tar.bz2 again
the conflict with kapptemplate should be long gone
---
debian/changelog | 2 ++
debian/rules | 5 -----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 17cb365..b5fe436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ kdevelop (4:5.0-0r1) UNRELEASED; urgency=medium
* Disable building of unit tests, as long as they are not run.
* Pass --list-missing to dh_install.
* Update lintian overrides.
+ * Install qmake_qt4guiapp.tar.bz2 again, since the conflict with kapptemplate
+ should be long gone.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 26 Aug 2016 06:08:47 +0200
diff --git a/debian/rules b/debian/rules
index e8ebf06..8861f3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,6 @@ override_dh_auto_build:
> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
done
-override_dh_auto_install:
- dh_auto_install
- # Work around a conflict with kapptemplate
- find debian/tmp -type f -name qmake_qt4guiapp.tar.bz2 | xargs rm -fv
-
override_dh_install:
dh_install --list-missing
--
KDevelop packaging
More information about the pkg-kde-commits
mailing list