[SCM] mate-session-manager Debian package branch, master, updated. 4dd80bab8fc3ecead8faf031a5ac75f4f84ab5f8

Mon Feb 17 09:04:01 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-session-manager.git;a=commitdiff;h=909c1f3

The following commit has been merged in the master branch:
commit 909c1f34a4ba6de51af2177ee2a65d258555bc49
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 17 08:19:33 2014 +0100

    debian/patches: two more patches
---
 ...1001_fix-mate-bugtracker-url-in-man-pages.patch |   8 +-
 .../1002_hyphen-as-minus-sign-in-man-page.patch    | 221 +++++++++++++++++++++
 .../1003_add-keywords-to-desktop-files.patch       |  30 +++
 debian/patches/series                              |   2 +
 4 files changed, 257 insertions(+), 4 deletions(-)

diff --git a/debian/patches/1001_fix-mate-bugtracker-url-in-man-pages.patch b/debian/patches/1001_fix-mate-bugtracker-url-in-man-pages.patch
index 8e84760..d1aadcf 100644
--- a/debian/patches/1001_fix-mate-bugtracker-url-in-man-pages.patch
+++ b/debian/patches/1001_fix-mate-bugtracker-url-in-man-pages.patch
@@ -7,7 +7,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  .SH BUGS
  If you find bugs in the 
Imate-session-properties
P program, please report
 -these on https://bugzilla.gnome.org.
-+these on https://github.com/mate-desktop/mate-session-manager/issues.
++these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
  .SH SEE ALSO
  .BR mate-session(1)
  .BR mate-session-save(1)
@@ -18,7 +18,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  .SH BUGS
  If you find bugs in the 
Imate-session-save
P program, please report
 -these on https://bugzilla.gnome.org.
-+these on https://github.com/mate-desktop/mate-session-manager/issues.
++these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
  .SH SEE ALSO
  .BR mate-session(1)
 --- a/doc/man/mate-session.1
@@ -28,7 +28,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  .SH BUGS
  If you find bugs in the 
Imate-session
P program, please report
 -these on https://bugzilla.gnome.org.
-+these on https://github.com/mate-desktop/mate-session-manager/issues.
++these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
  .SH SEE ALSO
  .BR mate-session-properties(1)
  .BR mate-session-save(1)
@@ -39,6 +39,6 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  .SH BUGS
  If you find bugs in the 
Imate-wm
P program, please report
 -these on https://bugzilla.gnome.org.
-+these on https://github.com/mate-desktop/mate-session-manager/issues.
++these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
  .SH SEE ALSO
  .BR mate-session(1)
diff --git a/debian/patches/1002_hyphen-as-minus-sign-in-man-page.patch b/debian/patches/1002_hyphen-as-minus-sign-in-man-page.patch
new file mode 100644
index 0000000..20528d6
--- /dev/null
+++ b/debian/patches/1002_hyphen-as-minus-sign-in-man-page.patch
@@ -0,0 +1,221 @@
+Description: Don't use hyphen as minus sign.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/doc/man/mate-session.1
++++ b/doc/man/mate-session.1
+@@ -5,11 +5,11 @@
+ .\"
+ .TH MATE-SESSION 1 "MATE"
+ .SH NAME
+-mate-session \- Start the MATE desktop environment
++mate\-session \- Start the MATE desktop environment
+ .SH SYNOPSIS
+-.B mate-session [\-\-autostart=DIR] [\-\-default-session-key=KEY] [\-\-failsafe|\-f] [\-\-debug]
++.B mate\-session [\-\-autostart=DIR] [\-\-default-session-key=KEY] [\-\-failsafe|\-f] [\-\-debug]
+ .SH DESCRIPTION
+-The 
Imate-session
P program starts up the MATE desktop
++The 
Imate\-session
P program starts up the MATE desktop
+ environment. This command is typically executed by your login manager
+ (either mdm, xdm, or from your X startup scripts). It will load
+ either your saved session, or it will provide a default session for the
+@@ -18,46 +18,46 @@
+ .PP
+ The default session is defined in the MateConf keys under
+ 
B/desktop/mate/session
P.
+-When saving a session, 
Imate-session
P saves the currently running
+-applications in the 
B$XDG_CONFIG_HOME/mate-session/saved-session
P
++When saving a session, 
Imate\-session
P saves the currently running
++applications in the 
B$XDG_CONFIG_HOME/mate\-session/saved\-session
P
+ directory.
+ .PP
+-
Imate-session
P is an X11R6 session manager. It can manage MATE
++
Imate\-session
P is an X11R6 session manager. It can manage MATE
+ applications as well as any X11R6 SM compliant.
+ .SH OPTIONS
+ The following options are supported:
+ .TP
+-.I "--autostart=DIR"
++.I "\-\-autostart=DIR"
+ Start all applications defined in 
IDIR
P, instead of starting the
+ applications defined in 
B/desktop/mate/session/default_session
P,
+-or via the 
I--default-session-key
P option. Multiple
+-
I--autostart
P options can be passed.
++or via the 
I\-\-default\-session\-key
P option. Multiple
++
I\-\-autostart
P options can be passed.
+ .TP
+-.I "--default-session-key=KEY"
++.I "\-\-default\-session\-key=KEY"
+ Set the MateConf key from which applications running a default session
+ should be read to 
IKEY
P. If not specificed,
+ 
B/desktop/mate/session/default_session
P will be used.
+ .TP
+-.I "--failsafe"
+-Run in fail-safe mode. User-specified applications will not be started.
++.I "\-\-failsafe"
++Run in fail\-safe mode. User-specified applications will not be started.
+ .TP
+-.I "--debug"
++.I "\-\-debug"
+ Enable debugging code.
+ .SH ENVIRONMENT
+-
Imate-session
P sets several environment variables for the use of
++
Imate\-session
P sets several environment variables for the use of
+ its child processes:
+ .PP
+ .B SESSION_MANAGER
+ .IP
+ This variable is used by session-manager aware clients to contact
+-mate-session.
++mate\-session.
+ .PP
+ .B DISPLAY
+ .IP
+ This variable is set to the X display being used by
+-
Imate-session
P. Note that if the --display option is used
++
Imate\-session
P. Note that if the \-\-display option is used
+ this might be different from the setting of the environment variable
+-when mate-session is invoked.
++when mate\-session is invoked.
+ .SH FILES
+ .PP
+ .B $XDG_CONFIG_HOME/config/autostart
+@@ -65,15 +65,15 @@
+ .B /usr/share/mate/autostart
+ .IP
+ The applications defined in those directories will be started on login.
+-
Imate-session-properties(1)
P can be used to easily configure them.
++
Imate\-session\-properties(1)
P can be used to easily configure them.
+ .PP
+-.B $XDG_CONFIG_HOME/mate-session/saved-session
++.B $XDG_CONFIG_HOME/mate\-session/saved\-session
+ .IP
+ This directory contains the list of applications of the saved session.
+ .SH BUGS
+-If you find bugs in the 
Imate-session
P program, please report
++If you find bugs in the 
Imate\-session
P program, please report
+ these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
+ .SH SEE ALSO
+-.BR mate-session-properties(1)
+-.BR mate-session-save(1)
+-.BR mate-wm(1)
++.BR mate\-session\-properties(1)
++.BR mate\-session\-save(1)
++.BR mate\-wm(1)
+--- a/doc/man/mate-session-properties.1
++++ b/doc/man/mate-session-properties.1
+@@ -6,10 +6,10 @@
+ .SH NAME
+ mate-session-properties \- Configure applications to start on login
+ .SH SYNOPSIS
+-.B mate-session-properties
++.B mate\-session\-properties
+ .SH DESCRIPTION
+ .PP
+-The 
Imate-session-properties
P program enables the users to
++The 
Imate\-session\-properties
P program enables the users to
+ configure what applications should be started on login, in addition to
+ the default startup applications configured on the system.
+ .PP
+@@ -17,8 +17,8 @@
+ running applications so that they can automatically be restored to
+ their current state on your next MATE session.
+ .SH BUGS
+-If you find bugs in the 
Imate-session-properties
P program, please report
++If you find bugs in the 
Imate\-session\-properties
P program, please report
+ these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
+ .SH SEE ALSO
+-.BR mate-session(1)
+-.BR mate-session-save(1)
++.BR mate\-session(1)
++.BR mate\-session\-save(1)
+--- a/doc/man/mate-session-save.1
++++ b/doc/man/mate-session-save.1
+@@ -5,11 +5,11 @@
+ .\"
+ .TH MATE-SESSION-SAVE 1 "MATE"
+ .SH NAME
+-mate-session-save \- End or save the current MATE session
++mate\-session\-save \- End or save the current MATE session
+ .SH SYNOPSIS
+-.B mate-session-save [\-\-logout] [\-\-force\-logout] [\-\-logout\-dialog] [\-\-shutdown\-dialog] [\-\-gui] [\-\-kill [\-\-silent]]
++.B mate\-session\-save [\-\-logout] [\-\-force\-logout] [\-\-logout\-dialog] [\-\-shutdown\-dialog] [\-\-gui] [\-\-kill [\-\-silent]]
+ .SH DESCRIPTION
+-The 
Imate-session-save
P program can be used from a MATE session to
++The 
Imate\-session\-save
P program can be used from a MATE session to
+ save a snapshot of the currently running applications. This session will
+ be later restored at your next MATE session.
+ .PP
+@@ -31,10 +31,10 @@
+ option. If 
B\-\-silent
P is used with 
B\-\-kill
R, then it will
+ behave as if 
B\-\-logout
P was used.
+ .PP
+-The session is not saved when 
Imate-session-save
P is called with any of
++The session is not saved when 
Imate\-session\-save
P is called with any of
+ the options ending the session.
+ .SH BUGS
+-If you find bugs in the 
Imate-session-save
P program, please report
++If you find bugs in the 
Imate\-session\-save
P program, please report
+ these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
+ .SH SEE ALSO
+-.BR mate-session(1)
++.BR mate\-session(1)
+--- a/doc/man/mate-wm.1
++++ b/doc/man/mate-wm.1
+@@ -5,12 +5,12 @@
+ .\"
+ .TH MATE-WM 1 "MATE"
+ .SH NAME
+-mate-wm \- Start the window manager configured by the user
++mate\-wm \- Start the window manager configured by the user
+ .SH SYNOPSIS
+ .PP
+-.B mate-wm [--default-wm=WINDOWMANAGER] [--sm-client-id=ID]
++.B mate\-wm [\-\-default\-wm=WINDOWMANAGER] [\-\-sm\-client\-id=ID]
+ .SH DESCRIPTION
+-The 
Imate-wm
P program starts the window manager configured by the
++The 
Imate\-wm
P program starts the window manager configured by the
+ user. If the user has not chosen a window manager it will launch a
+ MATE compliant window manager.
+ .PP
+@@ -18,34 +18,34 @@
+ 
B/desktop/mate/session/required_components/windowmanager
P MateConf
+ key. The value of this key should be the name of the desktop file of the
+ desired window manager, without its 
B.desktop
P extension. If this
+-key is set to 
Imate-wm
P, then 
Imate-wm
P will simply look for
++key is set to 
Imate\-wm
P, then 
Imate\-wm
P will simply look for
+ an appropriate window manager. The user can also override the selection
+ of a window manager by setting the 
BWINDOW_MANAGER
P environment
+ variable.
+ .PP
+-If the 
B--default-wm
P option is used, 
Imate-wm
P will use
++If the 
B\-\-default\-wm
P option is used, 
Imate\-wm
P will use
+ 
IWINDOWMANAGER
P as window manager if the 
BWINDOW_MANAGER
P
+ environment variable is not set and if the
+ 
B/desktop/mate/session/required_components/windowmanager
P MateConf
+ key does not define a specific window manager, or if the configured
+ window manager cannot be found.
+ .PP
+-The 
B--sm-client-id
P option is translated to an appropriate option
++The 
B\-\-sm\-client\-id
P option is translated to an appropriate option
+ depending on which window manager will be started.
+ .SH OPTIONS
+ The following options are supported:
+ .TP
+-.I --default-wm=WINDOWMANAGER
++.I \-\-default\-wm=WINDOWMANAGER
+ Define the default window manager to start if no window manager is
+ configured, or if the configured window manager cannot be found.
+ .TP
+-.I --sm-client-id=ID
++.I \-\-sm\-client\-id=ID
+ Specify the session management 
IID
P when connecting to the session manager.
+ .SH ENVIRONMENT
+-
Imate-wm
P uses the value of the 
BWINDOW_MANAGER
P environment
++
Imate\-wm
P uses the value of the 
BWINDOW_MANAGER
P environment
+ variable to let the user override the configured window manager.
+ .SH BUGS
+-If you find bugs in the 
Imate-wm
P program, please report
++If you find bugs in the 
Imate\-wm
P program, please report
+ these on https://github.com/mate\-desktop/mate\-session\-manager/issues.
+ .SH SEE ALSO
+-.BR mate-session(1)
++.BR mate\-session(1)
diff --git a/debian/patches/1003_add-keywords-to-desktop-files.patch b/debian/patches/1003_add-keywords-to-desktop-files.patch
new file mode 100644
index 0000000..71a9743
--- /dev/null
+++ b/debian/patches/1003_add-keywords-to-desktop-files.patch
@@ -0,0 +1,30 @@
+Description: Add keywords key to .desktop files
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/data/mate-session-properties.desktop.in.in
++++ b/data/mate-session-properties.desktop.in.in
+@@ -7,6 +7,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=GTK;Settings;X-MATE-PersonalSettings;
++Keywords=MATE;session;properties;applications;login;start;
+ OnlyShowIn=MATE;
+ X-MATE-Bugzilla-Bugzilla=MATE
+ X-MATE-Bugzilla-Product=mate-session
+--- a/data/mate-wm.desktop.in.in
++++ b/data/mate-wm.desktop.in.in
+@@ -2,6 +2,7 @@
+ Type=Application
+ _Name=Window Manager
+ Exec=mate-wm
++Keywords=MATE;window;manager;launch;MDM;
+ NoDisplay=true
+ X-MATE-Autostart-Phase=WindowManager
+ X-MATE-Provides=windowmanager
+--- a/data/mate.desktop.in
++++ b/data/mate.desktop.in
+@@ -5,3 +5,4 @@
+ TryExec=mate-session
+ Icon=
+ Type=Application
++Keywords=launch;MATE;desktop;session;
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index e600656..472b196 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 1001_fix-mate-bugtracker-url-in-man-pages.patch
+1002_hyphen-as-minus-sign-in-man-page.patch
+1003_add-keywords-to-desktop-files.patch

-- 
mate-session-manager Debian package

