[SCM] qt5webkit packaging branch, kubuntu_unstable, updated. debian/5.5.0+dfsg-2

Rohan Garg rohangarg-guest at moszumanska.debian.org
Tue Sep 8 13:47:12 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit b36ff94f2882fbfe25de04c429022b5aa18b9696
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 24 09:46:32 2015 +0300

    Explicitly specify Makefile to use for installing docs.
    
    This is needed to avoid recursively calling qmake in all directories,
    which doesn't work in indep builds.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b8da07d..c5be333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit-opensource-src (5.5.0+dfsg-2) UNRELEASED; urgency=medium
   * Add empty override_dh_auto_test target to make indep builds work.
   * Remove copyright entries for generated files that are not present in the
     tarball.
+  * Explicitly specify Makefile to use for installing docs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Aug 2015 16:34:24 +0300
 
diff --git a/debian/rules b/debian/rules
index 477913a..0573183 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 override_dh_auto_install-indep:
-	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
+	$(MAKE) -f Source/Makefile.api INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list