r53520 - in /desktop/unstable/gnome-dictionary/debian: changelog control gnome-dictionary.install patches/install-man.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Wed Sep  6 15:33:46 2017
New Revision: 53520

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53520
Log:
Add install-man.patch: Cherry-pick patch to fix manpage installation

Added:
    desktop/unstable/gnome-dictionary/debian/patches/install-man.patch
Modified:
    desktop/unstable/gnome-dictionary/debian/changelog
    desktop/unstable/gnome-dictionary/debian/control
    desktop/unstable/gnome-dictionary/debian/gnome-dictionary.install
    desktop/unstable/gnome-dictionary/debian/patches/series

Modified: desktop/unstable/gnome-dictionary/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/changelog?rev=53520&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] Wed Sep  6 15:33:46 2017
@@ -3,6 +3,7 @@
   * New upstream release
     - Remove libgdict
   * Build with meson
+  * Add install-man.patch: Cherry-pick patch to fix manpage installation
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 06 Sep 2017 11:12:11 -0400
 

Modified: desktop/unstable/gnome-dictionary/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/control?rev=53520&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/control	[utf-8] Wed Sep  6 15:33:46 2017
@@ -8,12 +8,12 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 10.3~),
                gnome-pkg-tools (>= 0.10),
-               intltool (>= 0.40.0),
+               itstool,
                libglib2.0-dev (>= 2.42.0),
                libgtk-3-dev (>= 3.21.1),
-               yelp-tools,
+               meson (>= 0.39.1),
                gobject-introspection (>= 1.42.0),
                libgirepository1.0-dev (>= 1.42.0)
 Standards-Version: 4.1.0

Modified: desktop/unstable/gnome-dictionary/debian/gnome-dictionary.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/gnome-dictionary.install?rev=53520&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/gnome-dictionary.install	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/gnome-dictionary.install	[utf-8] Wed Sep  6 15:33:46 2017
@@ -3,5 +3,5 @@
 usr/share/applications/org.gnome.Dictionary.desktop
 usr/share/dbus-1/services/org.gnome.Dictionary.service
 usr/share/help
-usr/share/man/man1/gnome-dictionary.1
+usr/share/man
 usr/share/glib-2.0/schemas/org.gnome.dictionary.gschema.xml

Added: desktop/unstable/gnome-dictionary/debian/patches/install-man.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/patches/install-man.patch?rev=53520&op=file
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/patches/install-man.patch	(added)
+++ desktop/unstable/gnome-dictionary/debian/patches/install-man.patch	[utf-8] Wed Sep  6 15:33:46 2017
@@ -0,0 +1,24 @@
+From b45dd79d332cc83ae117aefdb4816d8b39f18ae2 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Wed, 23 Aug 2017 10:38:16 +0100
+Subject: Install man page
+
+The move to Meson skipped the installation of the man page for
+gnome-dictionary.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786319
+---
+ data/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/meson.build b/data/meson.build
+index 3653142..5bb10b4 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,3 +56,5 @@ foreach s: sources
+                   po_dir: po_dir,
+                   type: 'desktop')
+ endforeach
++
++install_man([ 'gnome-dictionary.1' ], install_dir: join_paths(gdict_mandir, 'man1'))
+

Modified: desktop/unstable/gnome-dictionary/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/patches/series?rev=53520&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/patches/series	[utf-8] Wed Sep  6 15:33:46 2017
@@ -0,0 +1 @@
+install-man.patch