[SCM] mate-utils Debian package branch, master, updated. debian/1.8.0+dfsg1-3-8-gd42b14c
Mike Gabriel
sunweaver at moszumanska.debian.org
Fri Oct 24 11:39:30 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-utils.git;a=commitdiff;h=8c4a8b4
The following commit has been merged in the master branch:
commit 8c4a8b4469e2c527135ba90c0952f8039c186968
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Oct 24 13:23:47 2014 +0200
debian/patches: Drop debian/patches/0001_symlink-mate-panel-screenshot.patch. Included in this upstream release. debian/patches/1001_add-keywords-key-to-desktop-files.patch. Accepted upstream. debian/patches/1002_fix-hyphens-on-man-page.patch. Accepted upstream.
---
.../0001_symlink-mate-panel-screenshot.patch | 11 ---
.../1001_add-keywords-key-to-desktop-files.patch | 53 --------------
debian/patches/1002_fix-hyphens-on-man-page.patch | 80 ----------------------
debian/patches/series | 3 -
4 files changed, 147 deletions(-)
diff --git a/debian/patches/0001_symlink-mate-panel-screenshot.patch b/debian/patches/0001_symlink-mate-panel-screenshot.patch
deleted file mode 100644
index 9e33f01..0000000
--- a/debian/patches/0001_symlink-mate-panel-screenshot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Symlink mate-panel-screenshot.1 man page to mate-screenshot.1 man page
-Author: Sander Sweers <https://github.com/infirit>
-Origin: https://github.com/mate-desktop/mate-utils/commit/c323f2af04672f6bcdebe01461738552245df868
---- a/mate-screenshot/Makefile.am
-+++ b/mate-screenshot/Makefile.am
-@@ -88,3 +88,5 @@
- install-exec-local:
- rm -f $(DESTDIR)$(bindir)/mate-panel-screenshot
- ln -s mate-screenshot $(DESTDIR)$(bindir)/mate-panel-screenshot
-+ rm -f $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1
-+ ln -s mate-screenshot.1 $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1
diff --git a/debian/patches/1001_add-keywords-key-to-desktop-files.patch b/debian/patches/1001_add-keywords-key-to-desktop-files.patch
deleted file mode 100644
index faebe00..0000000
--- a/debian/patches/1001_add-keywords-key-to-desktop-files.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Add keywords key to .desktop files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/mate-utils/issues/63
---- a/baobab/data/mate-disk-usage-analyzer.desktop.in.in
-+++ b/baobab/data/mate-disk-usage-analyzer.desktop.in.in
-@@ -8,6 +8,7 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;System;Filesystem;
-+Keywords=MATE;check;disk;usage;analyze;size;space;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=mate-utils
---- a/gsearchtool/mate-search-tool.desktop.in
-+++ b/gsearchtool/mate-search-tool.desktop.in
-@@ -7,6 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Utility;Core;
-+Keywords=MATE;search;files;locate;documents;folders;computer;name;content;find;tool;
- OnlyShowIn=MATE;
- X-MATE-DocPath=mate-search-tool/mate-search-tool.xml
- X-MATE-Bugzilla-Bugzilla=MATE
---- a/logview/data/mate-system-log.desktop.in.in
-+++ b/logview/data/mate-system-log.desktop.in.in
-@@ -7,6 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;System;Monitor;
-+Keywords=MATE;monitor;view;system;log;files;logviewer;
- OnlyShowIn=MATE;
- X-MATE-DocPath=mate-system-log/mate-system-log.xml
- X-MATE-Bugzilla-Bugzilla=MATE
---- a/mate-dictionary/data/mate-dictionary.desktop.in.in
-+++ b/mate-dictionary/data/mate-dictionary.desktop.in.in
-@@ -7,6 +7,7 @@
- Icon=accessories-dictionary
- StartupNotify=true
- Categories=GTK;Office;Dictionary;
-+Keywords=MATE;dictionary;applet;thesaurus;spelling;definitions;online;
- OnlyShowIn=MATE;
- X-MATE-DocPath=mate-dictionary/mate-dictionary.xml
- X-MATE-Bugzilla-Bugzilla=MATE
---- a/mate-screenshot/mate-screenshot.desktop.in
-+++ b/mate-screenshot/mate-screenshot.desktop.in
-@@ -7,6 +7,7 @@
- Icon=applets-screenshooter
- StartupNotify=true
- Categories=GTK;Utility;
-+Keywords=MATE;screenshot;snapshot;desktop;window;image;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=mate-utils
diff --git a/debian/patches/1002_fix-hyphens-on-man-page.patch b/debian/patches/1002_fix-hyphens-on-man-page.patch
deleted file mode 100644
index 95b630a..0000000
--- a/debian/patches/1002_fix-hyphens-on-man-page.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix several hyphens-used-as-minus-sign issues on two of the man pages
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/mate-utils/issues/64
---- a/gsearchtool/mate-search-tool.1
-+++ b/gsearchtool/mate-search-tool.1
-@@ -26,7 +26,7 @@
- uses the find, grep, and locate UNIX commands. The case
- sensitivity of the search depends on your operating
- system. For example, on Linux, the find, grep, and locate
--commands support the -i option, so all searches are
-+commands support the \-i option, so all searches are
- case-insensitive.
-
- For full documentation see the
---- a/mate-screenshot/mate-screenshot.1
-+++ b/mate-screenshot/mate-screenshot.1
-@@ -1,50 +1,50 @@
- .TH "MATE-SCREENSHOT" "1" "June 28, 2009" "" ""
- .SH NAME
--mate-screenshot \- capture the screen, a window, or an user-defined area and save the snapshot image to a file.
-+mate-screenshot \- capture the screen, a window, or an user\-defined area and save the snapshot image to a file.
- .SH SYNOPSIS
- .sp
--
Bmate-screenshot
R [
B-w
R ] [
B-a
R ] [
B-b
R ] [
B-B
R ] [
B-d
ISECONDS
B
R ] [
B-e
IEFFECT
B
R ] [
B-i
R ] [
B--display
IDISPLAY
B
R ]
-+
Bmate-screenshot
R [
B\-w
R ] [
B\-a
R ] [
B\-b
R ] [
B\-B
R ] [
B\-d
ISECONDS
B
R ] [
B\-e
IEFFECT
B
R ] [
B\-i
R ] [
B\-\-display
IDISPLAY
B
R ]
- .SH "DESCRIPTION"
- .PP
-
Bmate-screenshot
R is a MATE utility for taking
--screenshots of the entire screen, a window or an user-defined area of the screen, with optional beutifying
-+screenshots of the entire screen, a window or an user\-defined area of the screen, with optional beutifying
- border effects.
- .SH "OPTIONS"
- .TP
--
B-w, --window
R
-+
B\-w, \-\-window
R
- Grab the current active window instead of the entire
- screen.
- .TP
--
B-a, --area
R
-+
B\-a, \-\-area
R
- Grab an area of the screen instead of the entire screen.
- .TP
--
B-b, --include-border
R
-+
B\-b, \-\-include-border
R
- Include the window border within the screenshot.
- .TP
--
B-B, --remove-border
R
-+
B\-B, \-\-remove-border
R
- Remove the window border from the screenshot.
- .TP
--
B-d, --delay=
ISECONDS
B,
R
-+
B\-d, \-\-delay=
ISECONDS
B,
R
- Take the screenshot after the specified delay [in seconds].
- .TP
--
B-e, --effect=
IEFFECT
B,
R
-+
B\-e, \-\-effect=
IEFFECT
B,
R
- Add an effect to the outside of the screenshot border.
-
IEFFECT
R can be ``shadow''
- (adding drop shadow), ``border'' (adding rectangular
- space around the screenshot) or ``none'' (no effect).
- Default is ``none''.
- .TP
--
B-i, --interactive
R
-+
B\-i, \-\-interactive
R
- Interactively set options in a dialog.
- .TP
--
B--display=
IDISPLAY
B
R
-+
B\-\-display=
IDISPLAY
B
R
- X display to use.
- .TP
--
B-?, -h, --help
R
-+
B\-?, \-h, \-\-help
R
- Show a summary of the available options.
- .PP
- In addition, the usual GTK+ and MATE command line options apply.
--See the output of --help for details.
-+See the output of \-\-help for details.
- .PP
- .SH "SEE ALSO"
- .PP
diff --git a/debian/patches/series b/debian/patches/series
index 90491cf..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0001_symlink-mate-panel-screenshot.patch
-1001_add-keywords-key-to-desktop-files.patch
-1002_fix-hyphens-on-man-page.patch
2001_omit-gfdl-licensed-help-files.patch
--
mate-utils Debian package
More information about the pkg-mate-commits
mailing list