[SCM] mate-settings-daemon Debian package branch, master, updated. 33651889061e95c3eabfa482054c9571d4de5b66

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-settings-daemon.git;a=commitdiff;h=d2e31ee

The following commit has been merged in the master branch:
commit d2e31eeab2013796ab6d8335668856e75e973e0e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 11 22:01:57 2014 +0100

    man pages: Drop debian/man/mate-settings-daemon.1. Provided in upstream sources now.
---
 debian/man/mate-settings-daemon.1             | 38 ---------------------------
 debian/mate-settings-daemon-common.manpages   |  1 -
 debian/mate-settings-daemon-gstreamer.install |  1 +
 debian/mate-settings-daemon.manpages          |  1 -
 4 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/man/mate-settings-daemon.1 b/debian/man/mate-settings-daemon.1
deleted file mode 100644
index 28b62ef..0000000
--- a/debian/man/mate-settings-daemon.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"
-.\" mate₋settings-daemon manual page
-.\" Copyright (c) 2009 Joshua Cummings <jrac at internode.on.net>
-.\"
-.TH MATE-SETTINGS-DAEMON 1 "June 25 2009" ""
-.SH NAME
-mate-settings-daemon \- Handles the MATE session settings
-.SH SYNOPSIS
-
Bmate-settings-daemon
R [
B\-\-debug
R] [
B\-\-replace
R] 
-[
B\-\-display
R=
IDISPLAY
R]
-.SH DESCRIPTION
-
Imate-settings-daemon
R is responsible for setting the various preference 
-parameters of a MATE session and the applications that run under it.
-.SH OPTIONS
-.PP
-Help options
-.TP
-\-?, 
B\-\-help
R
-Show this help message
-.PP
-Application options
-.TP 
-
B\-\^\-debug
R
-Enable debugging code
-.TP
-
B\-\^\-replace
R
-Replaces the current running daemon
-.TP
-
B\-\^\-display
R=
IDISPLAY
R
-X display to use
-.PP
-.SH AUTHOR
-
Bmate-settings-daemon
R was written by Jonathan Blandford <jrb at redhat.com> 
-and William Jon McCann <mccann at jhu.edu>.
-.PP
-This manual page was originally written by Joshua Cummings <jrac at internode.on.net>.
-.PP
-This manual page was adopted for MATE by Vangelis Mouhtsis <vangelis at gnugr.org>. 
diff --git a/debian/mate-settings-daemon-common.manpages b/debian/mate-settings-daemon-common.manpages
deleted file mode 100644
index 27288a9..0000000
--- a/debian/mate-settings-daemon-common.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/mate-settings-daemon.1
diff --git a/debian/mate-settings-daemon-gstreamer.install b/debian/mate-settings-daemon-gstreamer.install
index 111b80f..7318958 100644
--- a/debian/mate-settings-daemon-gstreamer.install
+++ b/debian/mate-settings-daemon-gstreamer.install
@@ -9,3 +9,4 @@ usr/share/glib-2.0/
 usr/share/icons/
 usr/share/mate-settings-daemon/
 usr/share/polkit-1/
+usr/share/man/
diff --git a/debian/mate-settings-daemon.manpages b/debian/mate-settings-daemon.manpages
deleted file mode 100644
index 27288a9..0000000
--- a/debian/mate-settings-daemon.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/mate-settings-daemon.1

-- 
mate-settings-daemon Debian package