[SCM] qt-gstreamer packaging branch, master, updated. debian/1.2.0-3-3-g1237a63

Maximiliano Curia maxy at moszumanska.debian.org
Tue Aug 9 12:58:37 UTC 2016


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

The following commit has been merged in the master branch:
commit a317eea2badb4c3053c703c5f525e88e663c44d0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 9 14:56:56 2016 +0200

    Fix dpkg-buildpackage -A ftbfs (Closes: #806102)
---
 debian/changelog |  1 +
 debian/rules     | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7d4900..351046e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qt-gstreamer (1.2.0-4~) UNRELEASED; urgency=medium
   * Refresh patches.
   * Add new patch: Furter-workarounds-for-build-failures-now-boost-1.61-
     and-.patch
+  * Fix dpkg-buildpackage -A ftbfs (Closes: #806102)
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 09 Aug 2016 13:00:44 +0200
 
diff --git a/debian/rules b/debian/rules
index 9524a48..c62e371 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,12 @@ override_dh_auto_configure:
                           -DQT_VERSION=5 $(CMAKE_OPTS)
 
 override_dh_auto_build-arch:
-	dh_auto_build --parallel -- all doc
-	dh_auto_build --parallel --builddirectory=$(BUILD_QT5) -- all
+	dh_auto_build --parallel -a -- all
+	dh_auto_build --parallel --builddirectory=$(BUILD_QT5) -a -- all
 
 override_dh_auto_build-indep:
-	dh_auto_build --parallel --builddirectory=$(BUILD_QT5) -- doc
+	dh_auto_build --parallel -i -- doc
+	dh_auto_build --parallel --builddirectory=$(BUILD_QT5) -i -- doc
 
 override_dh_strip:
 	dh_strip -p libqtglib-2.0-0 \
@@ -34,9 +35,13 @@ override_dh_strip:
                  --dbg-package=qtgstreamer-dbg
 	dh_strip --remaining-packages --dbg-package=qt5gstreamer-dbg
 
-override_dh_auto_install:
-	dh_auto_install --parallel
-	dh_auto_install --parallel --builddirectory=$(BUILD_QT5)
+override_dh_auto_install-arch:
+	dh_auto_install --parallel -a
+	dh_auto_install --parallel --builddirectory=$(BUILD_QT5) -a
+
+override_dh_auto_install-indep:
+	dh_auto_install --parallel -i
+	dh_auto_install --parallel --builddirectory=$(BUILD_QT5) -i
 	cp -r obj-$(DEB_HOST_GNU_TYPE)/doc debian/tmp/doc
 	find debian/tmp/doc/html -name '*.md5' -exec rm {} \;
 	-rm debian/tmp/doc/html/jquery.js

-- 
qt-gstreamer packaging



More information about the pkg-kde-commits mailing list