[SCM] Phonon GStreamer backend packaging branch, experimental, updated. debian/4.7.1-1-7-gd64cace

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git;a=commitdiff;h=d64cace

The following commit has been merged in the experimental branch:
commit d64cacedfc230e99ab5bdc22bf494f9768ab5f97
Author: Diane Trout <diane at ghic.org>
Date:   Mon Sep 15 20:35:12 2014 -0700

    the .desktop files are only used by the Qt4 version of phonon
    
    so move it out of -common and back into the qt4 backend.
---
 debian/changelog                               | 4 ++--
 debian/phonon-backend-gstreamer-common.install | 1 -
 debian/phonon-backend-gstreamer.install        | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b87bbce..97c13ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,8 @@ phonon-backend-gstreamer (4:4.8.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Build against gstreamer1.0
   * Provide Qt5 build.
-    This required creating a -common package for the icons and desktop file
-    shared between the Qt4 and Qt5 versions.
+    This required creating a -common package for the icons shared between
+    the Qt4 and Qt5 versions.
   * Add myself to uploaders.
 
  -- Diane Trout <diane at ghic.org>  Mon, 18 Aug 2014 22:38:36 -0700
diff --git a/debian/phonon-backend-gstreamer-common.install b/debian/phonon-backend-gstreamer-common.install
index ab2f676..62e4d84 100644
--- a/debian/phonon-backend-gstreamer-common.install
+++ b/debian/phonon-backend-gstreamer-common.install
@@ -1,2 +1 @@
 usr/share/icons/hicolor/*/apps/phonon-gstreamer.*
-usr/share/kde4/services/phononbackends/gstreamer.desktop
diff --git a/debian/phonon-backend-gstreamer.install b/debian/phonon-backend-gstreamer.install
index 0350a04..8121664 100644
--- a/debian/phonon-backend-gstreamer.install
+++ b/debian/phonon-backend-gstreamer.install
@@ -1 +1,3 @@
 usr/lib/*/qt4/plugins/phonon_backend/phonon_gstreamer.so
+usr/share/kde4/services/phononbackends/gstreamer.desktop
+

-- 
Phonon GStreamer backend packaging