[SCM] dragon packaging branch, kubuntu_unstable, updated. debian/4.14.0-1-21-g19693e5

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/dragon.git;a=commitdiff;h=19693e5

The following commit has been merged in the kubuntu_unstable branch:
commit 19693e5ebcdfb607e9e05a9fc0461a3e6bdd0fae
Author: Harald Sitter <sitter at kde.org>
Date:   Mon May 4 13:51:18 2015 +0200

    rip out shit patch
    
    dragon -> phonon -> phonon-gstreamer -> gstreamer-qapt -> qapt ->
    resolve missing codecs -> ask user for permission to install -> install
    -> reload gst cache -> play thing
---
 debian/patches/kubuntu_install-restricted.diff | 37 --------------------------
 debian/patches/series                          |  1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/kubuntu_install-restricted.diff b/debian/patches/kubuntu_install-restricted.diff
deleted file mode 100644
index 8571dd4..0000000
--- a/debian/patches/kubuntu_install-restricted.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: call kubuntu-notifications-helper to prompt for installing restricted codecs
-Author: Jonathan Riddell
-Origin: kubuntu
-Forwarded: no cos k-n-h is kubuntu only, but I have a gsoc project to do this better upstream
-Last-Update: 2015-04-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/app/main.cpp	2015-02-21 07:46:09.000000000 +0100
-+++ b/src/app/main.cpp	2015-04-01 18:19:17.478573756 +0200
-@@ -26,6 +26,9 @@
- #include <KCmdLineArgs>
- #include <KLocalizedString>
- 
-+#include <QDBusMessage>
-+#include <QDBusConnection>
-+
- static KAboutData aboutData( APP_NAME, 0,
-         ki18n("Dragon Player"), APP_VERSION,
-         ki18n("A video player that has a usability focus"), KAboutData::License_GPL_V2,
-@@ -52,5 +55,17 @@
-     KUniqueApplication::addCmdLineOptions();
- 
-     Dragon::PlayerApplication application;
-+
-+    //Added by Kubuntu for update-notifier-kde to prompt for restricted codec install
-+    QDBusMessage m = QDBusMessage::createMethodCall("org.kubuntu.restrictedInstall",
-+                                                    "/org/kubuntu/restrictedInstall",
-+                                                    "org.kubuntu.restrictedInstall",
-+                                                    "installRestricted");
-+    QList<QVariant> dbusargs;
-+    dbusargs.append("Dragon Video Player");
-+    dbusargs.append("gstreamer1.0-libav");
-+    m.setArguments(dbusargs);
-+    bool queued = QDBusConnection::sessionBus().send(m);
-+
-     return application.exec();
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b0b423b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_install-restricted.diff

-- 
dragon packaging