summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-09-17 00:01:31 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-09-17 00:01:31 -0300
commit126c01029671dd3cfc711509d3e73dbde38bff14 (patch)
treebe112eb444c5da51492b601148447fb427e7119e
parent215d662ef10fab139ec469e16775385e7c92becf (diff)
downloadqt5webkit-126c01029671dd3cfc711509d3e73dbde38bff14.tar.gz
Revert "Switch to GStreamer 1.0."
This reverts commit 215d662ef10fab139ec469e16775385e7c92becf. QtMultimedia still uses GStreamer 0.1 :-/
-rw-r--r--debian/changelog3
-rw-r--r--debian/control4
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index a047759..6ea39ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,6 @@ qtwebkit-opensource-src (5.3.1+dfsg-4) UNRELEASED; urgency=medium
* Remove unused code from debian/rules.
* Update Vcs-Browser field to point to cgit interface.
- [ Lisandro Damián Nicanor Pérez Meyer ]
- * Switch to GStreamer 1.0.
-
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 07 Sep 2014 16:03:34 +0400
qtwebkit-opensource-src (5.3.1+dfsg-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 3717a4a..39e518c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends: bison,
libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
libglib2.0-dev,
libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
- libgstreamer-plugins-base1.0-dev,
- libgstreamer1.0-dev,
+ libgstreamer-plugins-base0.10-dev,
+ libgstreamer0.10-dev,
libicu-dev,
libjpeg-dev,
libpng-dev,