[SCM] qt3d packaging branch, master, updated. 34f6db3851a5744e7caef172477a0e9767dea0eb
Timo Jyrinki
timo at alioth.debian.org
Tue Jul 9 06:51:54 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=34f6db3
The following commit has been merged in the master branch:
commit 34f6db3851a5744e7caef172477a0e9767dea0eb
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Jul 9 09:51:32 2013 +0300
Improve override_dh_auto_install, use --fail-missing
---
debian/rules | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index f471984..6bb3706 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
%:
- dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
+ dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
override_dh_auto_configure:
qmake
@@ -16,8 +16,11 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install
# Fix wrong path in pkgconfig files
- find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
- -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
+ find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
+ -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
+
+ # Remove libtool-like files
+ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
override_dh_builddeb:
dh_builddeb -- -Zxz
--
qt3d packaging
More information about the pkg-kde-commits
mailing list