[SCM] kdegraphics-mobipocket packaging branch, master, updated. 6fef8c710a5c575afd00dcd2ec26ee01ea9a378b

[Pino Toscano]

The following commit has been merged in the master branch:
commit 6fef8c710a5c575afd00dcd2ec26ee01ea9a378b
Author: Pino Toscano <pino at debian.org>
Date:   Fri Nov 25 19:50:26 2011 +0100

    replace kubuntu_mobi_desktop_use_tryexec.diff with the upstream commit
---
 .../patches/kubuntu_mobi_desktop_use_tryexec.diff  |   15 ----------
 debian/patches/series                              |    2 +-
 ...-okular-to-okularApplication_mobi.desktop.patch |   29 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/debian/patches/kubuntu_mobi_desktop_use_tryexec.diff b/debian/patches/kubuntu_mobi_desktop_use_tryexec.diff
deleted file mode 100644
index 9685232..0000000
--- a/debian/patches/kubuntu_mobi_desktop_use_tryexec.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: add TryExec to check if okular is installed
-Author: Philip Muskovac <yofel at kubuntu.org>
-Bug: https://bugs.kde.org/show_bug.cgi?id=277833
-Index: mobipocket-4.6.90+repack/okular/okularApplication_mobi.desktop
-===================================================================
---- mobipocket-4.6.90+repack.orig/okular/okularApplication_mobi.desktop	2011-07-15 15:05:06.516333024 +0200
-+++ mobipocket-4.6.90+repack/okular/okularApplication_mobi.desktop	2011-07-15 15:05:17.646333116 +0200
-@@ -119,6 +119,7 @@
- GenericName[x-test]=xxDocument Viewerxx
- GenericName[zh_CN]=文档查看器
- GenericName[zh_TW]=文件檢視器
-+TryExec=okular
- Exec=okular %U %i -caption "%c"
- Icon=okular
- Type=Application
diff --git a/debian/patches/series b/debian/patches/series
index 03f3825..8fbd638 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-kubuntu_mobi_desktop_use_tryexec.diff
+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
new file mode 100644
index 0000000..7d67647
--- /dev/null
+++ b/debian/patches/upstream_Add-TryExec-okular-to-okularApplication_mobi.desktop.patch
@@ -0,0 +1,29 @@
+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