[SCM] qt-gstreamer packaging branch, master, updated. debian/0.10.2-2-38-gc9a2d64

Diane Trout diane-guest at moszumanska.debian.org
Mon Apr 27 18:57:24 UTC 2015


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

The following commit has been merged in the master branch:
commit d698706e485acccbc2718a9761f5477dc0b77f2e
Author: Diane Trout <diane at ghic.org>
Date:   Mon Apr 27 11:35:54 2015 -0700

    Build doc files in an architecture independent step.
---
 debian/changelog | 1 +
 debian/rules     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a88a00d..0dbbeca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qt-gstreamer (1.2.0-2) UNRELEASED; urgency=medium
     - I copied work from Jonathan Riddell for the .install and
       .symbols files.
   * Differentiate package long descriptions between Qt4 and Qt5 packages.
+  * Build doc files in an architecture independent step.
 
  -- Diane Trout <diane at ghic.org>  Mon, 09 Mar 2015 21:38:06 -0700
 
diff --git a/debian/rules b/debian/rules
index f106747..52e47f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,13 @@ override_dh_auto_configure:
 	dh_auto_configure --builddirectory=$(BUILD_QT5) -- \
                           -DQT_VERSION=5 $(CMAKE_OPTS)
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	dh_auto_build --parallel -- all doc
 	dh_auto_build --parallel --builddirectory=$(BUILD_QT5) -- all
 
+override_dh_auto_build-indep:
+	dh_auto_build --parallel --builddirectory=$(BUILD_QT5) -- doc
+
 override_dh_auto_install:
 	dh_auto_install --parallel
 	dh_auto_install --parallel --builddirectory=$(BUILD_QT5)

-- 
qt-gstreamer packaging



More information about the pkg-kde-commits mailing list