[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.5.1-4-5-g4972633

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Mar 22 21:41:56 UTC 2016


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

The following commit has been merged in the experimental branch:
commit 7c5b94de8952e1bb246c94e12e7656a50bc53254
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Mar 22 22:40:55 2016 +0100

    Drop no longer needed hack to fix wrong path in pkgconfig files.
---
 debian/changelog | 1 +
 debian/rules     | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69bbfc7..66bf345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebsockets-opensource-src (5.6.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop qtry_compare.patch, applied upstream.
   * Bump Qt build-dependencies to 5.6.0.
+  * Drop no longer needed hack to fix wrong path in pkgconfig files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Mar 2016 22:37:27 +0100
 
diff --git a/debian/rules b/debian/rules
index 7512b60..7432232 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,10 +31,6 @@ override_dh_auto_install-arch:
 	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebSockets/*/QtWebSockets/private/
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_websockets_private.pri
 
-	# 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' {} \;
-
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 

-- 
qtwebsockets packaging



More information about the pkg-kde-commits mailing list