[SCM] Debian Qt/KDE packaging tools branch, kubuntu_xenial_archive, updated. ubuntu/0.15.20_ubuntu2
Philip Muškovac
yofel-guest at moszumanska.debian.org
Tue Dec 8 21:50:20 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=c3da131
The following commit has been merged in the kubuntu_xenial_archive branch:
commit c3da1310bc2d6841ecb2642e1c0f8c4a7f77f495
Author: Philip Muškovac <yofel at gmx.net>
Date: Tue Dec 8 22:43:27 2015 +0100
Drop the ECM_MKSPECS_INSTALL_DIR override in kf5.pm
it's obsolete and uses an inexistent function call
---
debian/changelog | 7 +++++++
perllib/Debian/Debhelper/Buildsystem/kf5.pm | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 3f55a2f..9cfb24d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pkg-kde-tools (0.15.20~ubuntu2) xenial; urgency=medium
+
+ * Drop the ECM_MKSPECS_INSTALL_DIR override in kf5.pm, it's obsolete and
+ uses an inexistent function call
+
+ -- Philip Muškovac <yofel at kubuntu.org> Tue, 08 Dec 2015 22:41:11 +0100
+
pkg-kde-tools (0.15.20~ubuntu1) xenial; urgency=medium
* Merge from Debian unstable. Remaining changes:
diff --git a/perllib/Debian/Debhelper/Buildsystem/kf5.pm b/perllib/Debian/Debhelper/Buildsystem/kf5.pm
index 7fca5e5..c472024 100644
--- a/perllib/Debian/Debhelper/Buildsystem/kf5.pm
+++ b/perllib/Debian/Debhelper/Buildsystem/kf5.pm
@@ -44,7 +44,6 @@ sub get_kf5_flags {
# Unescape flags using shell
$flags = `$^X -w -Mstrict -e 'print join("\x1e", \@ARGV);' -- $escaped_flags`;
- $flags = $flags . "\x1e-DECM_MKSPECS_INSTALL_DIR=/usr/lib/" . dpkg_architecture_value('DEB_HOST_MULTIARCH') . "/qt5/mkspecs/modules/";
return split("\x1e", $flags);
}
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list