[SCM] kdegraphics-mobipocket packaging branch, master, updated. debian/4.7.4-2-7-g9d15e9f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdegraphics-mobipocket.git;a=commitdiff;h=9d15e9f

The following commit has been merged in the master branch:
commit 9d15e9f8395970cc404ecced376e4bc720abb101
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 17:02:14 2012 +0200

    drop upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch
    
    it was backported from upstream
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 -
 ...-okular-to-okularApplication_mobi.desktop.patch |   29 --------------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4dcaeea..944fbe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ kdegraphics-mobipocket (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kdelibs5-dev and okular-dev build dependencies to 4.8.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Convert copyright to copyright-format v1.0.
+  * Drop upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch,
+    it was backported from upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Jun 2012 16:54:26 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8fbd638..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch
diff --git a/debian/patches/upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch b/debian/patches/upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch
deleted file mode 100644
index 7d67647..0000000
--- a/debian/patches/upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b8e524d636da5be90dd9c1f2231d3a4b42d96de1 Mon Sep 17 00:00:00 2001
-From: Felix Geyer <debfx-kde at fobos.de>
-Date: Tue, 8 Nov 2011 18:20:45 +0100
-Subject: [PATCH] Add TryExec=okular to okularApplication_mobi.desktop.
-
-This allows distributions to put mobipocket into a single package
-that doesn't need to depend on okular.
-
-BUG: 277833
-FIXED-IN: 4.8
----
- okular/okularApplication_mobi.desktop |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/okular/okularApplication_mobi.desktop b/okular/okularApplication_mobi.desktop
-index 649fe55..d12df4c 100755
---- a/okular/okularApplication_mobi.desktop
-+++ b/okular/okularApplication_mobi.desktop
-@@ -120,6 +120,7 @@ GenericName[uk]=Переглядач документів
- GenericName[x-test]=xxDocument Viewerxx
- GenericName[zh_CN]=文档查看器
- GenericName[zh_TW]=文件檢視器
-+TryExec=okular
- Exec=okular %U %i -caption "%c"
- Icon=okular
- Type=Application
--- 
-1.7.7.1
-

-- 
kdegraphics-mobipocket packaging