[SCM] okular packaging branch, master, updated. f82410ade45491ae55f4aae04db2a148255f1c23

[Eshat Cakar]

The following commit has been merged in the master branch:
commit f82410ade45491ae55f4aae04db2a148255f1c23
Author: Eshat Cakar <info at eshat.de>
Date:   Tue Oct 4 14:19:25 2011 +0200

    prepare for 4.7.2, integrate previously activated chm support
---
 debian/changelog                     |    4 ++--
 debian/okular-extra-backends.install |    6 ++++++
 debian/okular-extra-backends.mime    |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0cd99a5..ca009d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-okular (4:4.7.1-0rc2) UNRELEASED; urgency=low
+okular (4:4.7.2-0r0) UNRELEASED; urgency=low
 
   * Initial release. Start from the Kubuntu packaging, thanks!
 
- -- Eshat Cakar <eshat at master>  Wed, 28 Sep 2011 00:11:26 +0200
+ -- Eshat Cakar <info at eshat.de>  Tue, 04 Oct 2011 14:18:38 +0200
diff --git a/debian/okular-extra-backends.install b/debian/okular-extra-backends.install
index 42b52cb..dfc3f6c 100644
--- a/debian/okular-extra-backends.install
+++ b/debian/okular-extra-backends.install
@@ -1,12 +1,18 @@
+usr/lib/kde4/kio_msits.so
+usr/lib/kde4/okularGenerator_chmlib.so
 usr/lib/kde4/okularGenerator_djvu.so
 usr/lib/kde4/okularGenerator_epub.so
 usr/lib/kde4/okularGenerator_tiff.so
+usr/share/applications/kde4/okularApplication_chm.desktop
 usr/share/applications/kde4/okularApplication_djvu.desktop
 usr/share/applications/kde4/okularApplication_epub.desktop
 usr/share/applications/kde4/okularApplication_tiff.desktop
+usr/share/kde4/services/libokularGenerator_chmlib.desktop
 usr/share/kde4/services/libokularGenerator_djvu.desktop
 usr/share/kde4/services/libokularGenerator_epub.desktop
 usr/share/kde4/services/libokularGenerator_tiff.desktop
+usr/share/kde4/services/msits.protocol
+usr/share/kde4/services/okularChm.desktop
 usr/share/kde4/services/okularDjvu.desktop
 usr/share/kde4/services/okularEPub.desktop
 usr/share/kde4/services/okularTiff.desktop
diff --git a/debian/okular-extra-backends.mime b/debian/okular-extra-backends.mime
index e1014cd..86baba0 100644
--- a/debian/okular-extra-backends.mime
+++ b/debian/okular-extra-backends.mime
@@ -1,2 +1,3 @@
 image/vnd.djvu;             okular '%s';        nametemplate=%s.djvu;     test=test "$DISPLAY" != "";     priority=5
 image/tiff;                 okular '%s';        nametemplate=%s.tiff;     test=test "$DISPLAY" != "";     priority=5
+application/x-chm;          okular '%s';        nametemplate=%s.chm;      test=test "$DISPLAY" != "";     priority=5

-- 
okular packaging