[SCM] qtbase packaging branch, master, updated. debian/5.0.0-1-11-gc2ea9c9

Timo Jyrinki timo at alioth.debian.org
Mon Jan 21 05:18:19 UTC 2013


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

The following commit has been merged in the master branch:
commit e5581f7f4f11dd549432bf9395aef1e5eb8b06a7
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Jan 17 13:32:25 2013 +0000

    The paths in .prl files just got emptied, so removing the fix.
---
 debian/rules |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 951bd1b..327c1c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -220,9 +220,6 @@ override_dh_auto_install:
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
-	# Fix wrong path in prl files
-	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
-		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*//" {} \;
 
 	# Add a configuration for qtchooser
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list