[SCM] okular packaging branch, master, updated. debian/16.08.2-1-75-g412778f

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:16:54 UTC 2017 

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

The following commit has been merged in the master branch:
commit f675a2a9471332f29edc52ef770f954fe4624a4a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Nov 23 13:24:29 2016 +0000

    separate okular and extra-backends correctly
---
 debian/control                       |   6 +-
 debian/okular-extra-backends.install |  54 +++--------------
 debian/okular.install                | 112 +++++++++++++++++------------------
 3 files changed, 66 insertions(+), 106 deletions(-)

diff --git a/debian/control b/debian/control
index d89fead..a971722 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,9 @@ Suggests: ghostscript,
           texlive-binaries,
           unrar
 Provides: pdf-viewer, postscript-viewer
-Breaks: kdegraphics-mobipocket (<< 4:4.12)
+Breaks: kdegraphics-mobipocket (<< 4:4.12),
+        okular-extra-backends (<< 4:16.08.90+p16.04+git20161122.1356-0)
+Replaces: okular-extra-backends (<< 4:16.08.90+p16.04+git20161122.1356-0)
 Description: universal document viewer
  Okular is a universal document viewer with support for advanced document
  features, such as annotations, forms, and embedded files.
@@ -111,6 +113,8 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: okular
 Provides: djvu-viewer
+Breaks: okular (<< 4:16.08.90+p16.04+git20161122.1356-0)
+Replaces: okular (<< 4:16.08.90+p16.04+git20161122.1356-0)
 Description: additional document format support for Okular
  These plugins allow Okular to view additional document formats:
   * Portable Document Format (PDF)
diff --git a/debian/okular-extra-backends.install b/debian/okular-extra-backends.install
index aee5fc9..14b5d8c 100644
--- a/debian/okular-extra-backends.install
+++ b/debian/okular-extra-backends.install
@@ -1,60 +1,22 @@
+usr/lib/*/qt5/plugins/kio_msits.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_chmlib.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_comicbook.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_djvu.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_dvi.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_epub.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_fax.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_fb.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_ghostview.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_kimgio.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_mobi.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_ooo.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_plucker.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_poppler.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_tiff.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_txt.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_xps.so
 usr/share/applications/okularApplication_chm.desktop
-usr/share/applications/okularApplication_comicbook.desktop
 usr/share/applications/okularApplication_djvu.desktop
-usr/share/applications/okularApplication_dvi.desktop
 usr/share/applications/okularApplication_epub.desktop
-usr/share/applications/okularApplication_fax.desktop
-usr/share/applications/okularApplication_fb.desktop
-usr/share/applications/okularApplication_ghostview.desktop
-usr/share/applications/okularApplication_kimgio.desktop
-usr/share/applications/okularApplication_mobi.desktop
-usr/share/applications/okularApplication_ooo.desktop
-usr/share/applications/okularApplication_pdf.desktop
-usr/share/applications/okularApplication_plucker.desktop
 usr/share/applications/okularApplication_tiff.desktop
-usr/share/applications/okularApplication_txt.desktop
-usr/share/applications/okularApplication_xps.desktop
 usr/share/applications/org.kde.mobile.okular_chm.desktop
-usr/share/applications/org.kde.mobile.okular_mobi.desktop
-usr/share/applications/org.kde.okular.desktop
+usr/share/applications/org.kde.mobile.okular_djvu.desktop
+usr/share/applications/org.kde.mobile.okular_epub.desktop
+usr/share/applications/org.kde.mobile.okular_tiff.desktop
+usr/share/kservices5/ms-its.protocol
 usr/share/kservices5/okularChm.desktop
-usr/share/kservices5/okularComicbook.desktop
 usr/share/kservices5/okularDjvu.desktop
-usr/share/kservices5/okularDvi.desktop
 usr/share/kservices5/okularEPub.desktop
-usr/share/kservices5/okularFax.desktop
-usr/share/kservices5/okularFb.desktop
-usr/share/kservices5/okularGhostview.desktop
-usr/share/kservices5/okularKimgio.desktop
-usr/share/kservices5/okularMobi.desktop
-usr/share/kservices5/okularOoo.desktop
-usr/share/kservices5/okularPlucker.desktop
-usr/share/kservices5/okularPoppler.desktop
 usr/share/kservices5/okularTiff.desktop
-usr/share/kservices5/okularTxt.desktop
-usr/share/kservices5/okularXps.desktop
-usr/share/metainfo/org.kde.okular-kimgio.metainfo.xml
-usr/share/metainfo/org.kde.okular-mobipocket.metainfo.xml
-usr/share/metainfo/org.kde.okular-ooo.metainfo.xml
-usr/share/metainfo/org.kde.okular-plucker.metainfo.xml
-usr/share/metainfo/org.kde.okular-poppler.metainfo.xml
-usr/share/metainfo/org.kde.okular-spectre.metainfo.xml
+usr/share/metainfo/org.kde.okular-chm.metainfo.xml
+usr/share/metainfo/org.kde.okular-djvu.metainfo.xml
+usr/share/metainfo/org.kde.okular-epub.metainfo.xml
 usr/share/metainfo/org.kde.okular-tiff.metainfo.xml
-usr/share/metainfo/org.kde.okular-txt.metainfo.xml
-usr/share/metainfo/org.kde.okular-xps.metainfo.xml
diff --git a/debian/okular.install b/debian/okular.install
index ae6b640..7450dd1 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -1,78 +1,72 @@
 etc/xdg/okular.categories
 usr/bin/okular
-usr/lib/x86_64-linux-gnu/qt5/plugins/kio_msits.so
-usr/lib/x86_64-linux-gnu/qt5/plugins/okularpart.so
-usr/lib/x86_64-linux-gnu/qt5/qml/org/kde/okular/DocumentView.qml
-usr/lib/x86_64-linux-gnu/qt5/qml/org/kde/okular/libokularplugin.so
-usr/lib/x86_64-linux-gnu/qt5/qml/org/kde/okular/private/PageView.qml
-usr/lib/x86_64-linux-gnu/qt5/qml/org/kde/okular/qmldir
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_comicbook.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_comicbook.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_dvi.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_fax.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_fb.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_ghostview.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_kimgio.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_mobi.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_ooo.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_plucker.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_poppler.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_txt.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_xps.so
+usr/lib/*/qt5/plugins/okularpart.so
+usr/lib/*/qt5/qml/org/kde/okular/
+usr/share/applications/okularApplication_comicbook.desktop
+usr/share/applications/okularApplication_dvi.desktop
+usr/share/applications/okularApplication_fax.desktop
+usr/share/applications/okularApplication_fb.desktop
+usr/share/applications/okularApplication_ghostview.desktop
+usr/share/applications/okularApplication_kimgio.desktop
+usr/share/applications/okularApplication_mobi.desktop
+usr/share/applications/okularApplication_ooo.desktop
+usr/share/applications/okularApplication_pdf.desktop
+usr/share/applications/okularApplication_plucker.desktop
+usr/share/applications/okularApplication_txt.desktop
+usr/share/applications/okularApplication_xps.desktop
+usr/share/applications/org.kde.okular.desktop
 usr/share/config.kcfg/gssettings.kcfg
 usr/share/config.kcfg/okular.kcfg
 usr/share/config.kcfg/okular_core.kcfg
 usr/share/config.kcfg/pdfsettings.kcfg
-usr/share/doc/HTML/*/okular
-usr/share/icons/hicolor/128x128/apps/okular.png
-usr/share/icons/hicolor/16x16/apps/okular.png
-usr/share/icons/hicolor/22x22/apps/okular.png
-usr/share/icons/hicolor/32x32/apps/okular.png
-usr/share/icons/hicolor/48x48/apps/okular.png
-usr/share/icons/hicolor/64x64/apps/okular.png
+usr/share/doc/HTML/en/okular
+usr/share/icons/hicolor/*/apps/okular.png
 usr/share/kconf_update/okular.upd
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/Bookmarks.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/Documents.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/MainView.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/OkularDrawer.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/TableOfContents.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/Thumbnails.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/ThumbnailsBase.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/TreeDelegate.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/contents/ui/main.qml
-usr/share/kpackage/genericqml/org.kde.mobile.okular/metadata.desktop
-usr/share/kservices5/ms-its.protocol
+usr/share/kservices5/okularComicbook.desktop
+usr/share/kservices5/okularDvi.desktop
+usr/share/kservices5/okularFax.desktop
+usr/share/kservices5/okularFb.desktop
+usr/share/kservices5/okularGhostview.desktop
+usr/share/kservices5/okularKimgio.desktop
+usr/share/kservices5/okularMobi.desktop
+usr/share/kservices5/okularOoo.desktop
+usr/share/kservices5/okularPlucker.desktop
+usr/share/kservices5/okularPoppler.desktop
+usr/share/kservices5/okularTxt.desktop
+usr/share/kservices5/okularXps.desktop
 usr/share/kservices5/okular_part.desktop
 usr/share/kservicetypes5/okularGenerator.desktop
 usr/share/kxmlgui5/okular/part-viewermode.rc
 usr/share/kxmlgui5/okular/part.rc
 usr/share/kxmlgui5/okular/shell.rc
-usr/share/metainfo/org.kde.okular-chm.metainfo.xml
 usr/share/metainfo/org.kde.okular-comicbook.metainfo.xml
-usr/share/metainfo/org.kde.okular-djvu.metainfo.xml
 usr/share/metainfo/org.kde.okular-dvi.metainfo.xml
-usr/share/metainfo/org.kde.okular-epub.metainfo.xml
 usr/share/metainfo/org.kde.okular-fax.metainfo.xml
 usr/share/metainfo/org.kde.okular-fb.metainfo.xml
+usr/share/metainfo/org.kde.okular-kimgio.metainfo.xml
+usr/share/metainfo/org.kde.okular-mobipocket.metainfo.xml
+usr/share/metainfo/org.kde.okular-ooo.metainfo.xml
+usr/share/metainfo/org.kde.okular-plucker.metainfo.xml
+usr/share/metainfo/org.kde.okular-poppler.metainfo.xml
+usr/share/metainfo/org.kde.okular-spectre.metainfo.xml
+usr/share/metainfo/org.kde.okular-txt.metainfo.xml
+usr/share/metainfo/org.kde.okular-xps.metainfo.xml
 usr/share/metainfo/org.kde.okular.appdata.xml
 usr/share/okular/drawingtools.xml
-usr/share/okular/icons/hicolor/16x16/apps/okular-fb2.png
-usr/share/okular/icons/hicolor/16x16/apps/okular-gv.png
-usr/share/okular/icons/hicolor/32x32/apps/okular-fb2.png
-usr/share/okular/icons/hicolor/32x32/apps/okular-gv.png
-usr/share/okular/icons/hicolor/48x48/apps/okular-fb2.png
-usr/share/okular/pics/checkmark.png
-usr/share/okular/pics/circle.png
-usr/share/okular/pics/comment.png
-usr/share/okular/pics/cross.png
-usr/share/okular/pics/help.png
-usr/share/okular/pics/insert.png
-usr/share/okular/pics/key.png
-usr/share/okular/pics/newparagraph.png
-usr/share/okular/pics/note.png
-usr/share/okular/pics/okular-epub-movie.png
-usr/share/okular/pics/okular-epub-sound-icon.png
-usr/share/okular/pics/paperclip.png
-usr/share/okular/pics/paragraph.png
-usr/share/okular/pics/pushpin.png
-usr/share/okular/pics/rightarrow.png
-usr/share/okular/pics/rightpointer.png
-usr/share/okular/pics/stamps.svg
-usr/share/okular/pics/star.png
-usr/share/okular/pics/tool-base-okular.png
-usr/share/okular/pics/tool-highlighter-okular-colorizable.png
-usr/share/okular/pics/tool-ink-okular-colorizable.png
-usr/share/okular/pics/tool-note-inline-okular-colorizable.png
-usr/share/okular/pics/tool-note-inline.png
-usr/share/okular/pics/tool-note-okular-colorizable.png
-usr/share/okular/pics/tool-note.png
-usr/share/okular/pics/uparrow.png
-usr/share/okular/pics/upleftarrow.png
+usr/share/okular/icons/hicolor/*/apps/okular-fb2.png
+usr/share/okular/icons/hicolor/*/apps/okular-gv.png
+usr/share/okular/pics
 usr/share/okular/tools.xml

-- 
okular packaging

More information about the pkg-kde-commits mailing list