[SCM] okular packaging branch, master, updated. debian/4%17.08.1-1-10-g92a9b03

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5023e1fa4826fc6ebbdda0de6bf4ce560d45e805
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 10 11:17:30 2017 +0100

    install man pages with dh_install
---
 debian/changelog       | 2 ++
 debian/okular.install  | 2 ++
 debian/okular.manpages | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b1ecd8..88ee195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ okular (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.1.2, no changes required.
   * Simplify watch file, and switch it to https.
   * Remove trailing whitespaces in changelog.
+  * Install the upstream man pages using dh_install files, not with
+    dh_installman, as they are installed by upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 10 Dec 2017 11:11:56 +0100
 
diff --git a/debian/okular.install b/debian/okular.install
index 8ad2442..e8265ba 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -64,6 +64,8 @@ usr/share/locale/*/LC_MESSAGES/okular_plucker.mo
 usr/share/locale/*/LC_MESSAGES/okular_poppler.mo
 usr/share/locale/*/LC_MESSAGES/okular_txt.mo
 usr/share/locale/*/LC_MESSAGES/okular_xps.mo
+usr/share/man/*/man1/okular.1
+usr/share/man/man1/okular.1
 usr/share/metainfo/org.kde.okular-comicbook.metainfo.xml
 usr/share/metainfo/org.kde.okular-dvi.metainfo.xml
 usr/share/metainfo/org.kde.okular-fax.metainfo.xml
diff --git a/debian/okular.manpages b/debian/okular.manpages
deleted file mode 100644
index 200f860..0000000
--- a/debian/okular.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/*/man1/okular.1
-debian/tmp/usr/share/man/man1/okular.1

-- 
okular packaging