[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.2+dfsg-2ubuntu1-37-ge7607b0
Timo Jyrinki
timo at moszumanska.debian.org
Sun Jul 5 12:13:50 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e7607b0
The following commit has been merged in the ubuntu branch:
commit e7607b053e3fd9bd866154b69a0f4e0d498ae40b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Sun Jul 5 12:13:23 2015 +0000
Build depend on GStreamer 1.0 and add a configure option for it
---
debian/changelog | 1 +
debian/control | 2 ++
debian/rules | 1 +
3 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cfb6772..2664305 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
* Drop patches in upstream:
- Correct-typo-in-the-Gujarati-openType-identififer.patch
* Rebase enable-tests.patch
+ * Build depend on GStreamer 1.0 and add a configure option for it
-- Timo Jyrinki <timo-jyrinki at ubuntu.com> Tue, 24 Mar 2015 13:56:14 +0000
diff --git a/debian/control b/debian/control
index f804cd7..b15330a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Build-Depends: debhelper (>= 9),
libgles2-mesa-dev [linux-any] | libgles2-dev [linux-any],
libglib2.0-dev,
libglu1-mesa-dev | libglu-dev,
+ libgstreamer1.0-dev,
+ libgstreamer-plugins-base1.0-dev,
libgtk2.0-dev,
libharfbuzz-dev,
libicu-dev,
diff --git a/debian/rules b/debian/rules
index 2870bae..09c4720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,6 +175,7 @@ endif
-accessibility \
-compile-examples \
-no-directfb \
+ -gstreamer 1.0 \
$(extra_configure_opts) \
$(cpu_opt)
--
qtbase packaging
More information about the pkg-kde-commits
mailing list