[mate-system-tools] 12/20: debian/patches: Add four patches, two might be interesting for upstream, two are Debian-specific.
Mike Gabriel
sunweaver at debian.org
Sat Oct 25 07:59:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository mate-system-tools.
commit babf5d73d48f9d7c4edf779b9825fc5c35a43aef
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Oct 25 04:03:59 2014 +0200
debian/patches: Add four patches, two might be interesting for upstream, two are Debian-specific.
---
.../1002_add-keywords-to-desktop-files.patch | 44 ++++++++++++++++++
.../1003_use-NotShowIn-instead-of-OnlyShowIn.patch | 54 ++++++++++++++++++++++
.../2001_omit-gfdl-licensed-doc-files.patch | 26 +++++++++++
.../patches/2002_fix-pkgconfig-bad-directive.patch | 16 +++++++
debian/patches/series | 4 ++
5 files changed, 144 insertions(+)
diff --git a/debian/patches/1002_add-keywords-to-desktop-files.patch b/debian/patches/1002_add-keywords-to-desktop-files.patch
new file mode 100644
index 0000000..f6bed17
--- /dev/null
+++ b/debian/patches/1002_add-keywords-to-desktop-files.patch
@@ -0,0 +1,44 @@
+Description: Add Keyword= fields to .desktop files.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/src/services/mate-services.desktop.in.in
++++ b/src/services/mate-services.desktop.in.in
+@@ -12,4 +12,5 @@
+ X-MATE-Bugzilla-Component=runlevel-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+ OnlyShowIn=MATE;XFCE;
++Keywords=system;start;boot;initscripts;services;
+ StartupNotify=true
+--- a/src/shares/mate-shares.desktop.in.in
++++ b/src/shares/mate-shares.desktop.in.in
+@@ -12,5 +12,6 @@
+ X-MATE-Bugzilla-Component=shares-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+ OnlyShowIn=MATE;XFCE;
++Keywords=network;neighbourhood;folders;shares;
+ StartupNotify=true
+
+--- a/src/time/mate-time.desktop.in.in
++++ b/src/time/mate-time.desktop.in.in
+@@ -12,4 +12,5 @@
+ X-MATE-Bugzilla-Component=mate-time-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+ OnlyShowIn=MATE;XFCE;
++Keywords=Time;Timezone;system;clock;MATE;mate-system-tools;
+ StartupNotify=true
+--- a/src/users/mate-users.desktop.in.in
++++ b/src/users/mate-users.desktop.in.in
+@@ -12,4 +12,5 @@
+ X-MATE-Bugzilla-Component=users-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+ OnlyShowIn=MATE;XFCE;
++Keywords=manage;users;groups;system;mate-system-tools;
+ StartupNotify=true
+--- a/src/network/mate-network.desktop.in.in
++++ b/src/network/mate-network.desktop.in.in
+@@ -12,4 +12,5 @@
+ X-MATE-Bugzilla-Component=network-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+ OnlyShowIn=MATE;XFCE;
++Keywords=network;devices;connections;mate-system-tools;
+ StartupNotify=true
diff --git a/debian/patches/1003_use-NotShowIn-instead-of-OnlyShowIn.patch b/debian/patches/1003_use-NotShowIn-instead-of-OnlyShowIn.patch
new file mode 100644
index 0000000..7ab3817
--- /dev/null
+++ b/debian/patches/1003_use-NotShowIn-instead-of-OnlyShowIn.patch
@@ -0,0 +1,54 @@
+Description: Make mate-system-utils also available in DEs except GNOME/KDE
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/src/services/mate-services.desktop.in.in
++++ b/src/services/mate-services.desktop.in.in
+@@ -11,6 +11,6 @@
+ X-MATE-Bugzilla-Product=mate-system-tools
+ X-MATE-Bugzilla-Component=runlevel-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+-OnlyShowIn=MATE;XFCE;
++NotShowIn=GNOME;KDE;
+ Keywords=system;start;boot;initscripts;services;
+ StartupNotify=true
+--- a/src/shares/mate-shares.desktop.in.in
++++ b/src/shares/mate-shares.desktop.in.in
+@@ -11,7 +11,7 @@
+ X-MATE-Bugzilla-Product=mate-system-tools
+ X-MATE-Bugzilla-Component=shares-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+-OnlyShowIn=MATE;XFCE;
++NotShowIn=GNOME;KDE;
+ Keywords=network;neighbourhood;folders;shares;
+ StartupNotify=true
+
+--- a/src/time/mate-time.desktop.in.in
++++ b/src/time/mate-time.desktop.in.in
+@@ -11,6 +11,6 @@
+ X-MATE-Bugzilla-Product=mate-system-tools
+ X-MATE-Bugzilla-Component=mate-time-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+-OnlyShowIn=MATE;XFCE;
++NotShowIn=GNOME;KDE;
+ Keywords=Time;Timezone;system;clock;MATE;mate-system-tools;
+ StartupNotify=true
+--- a/src/users/mate-users.desktop.in.in
++++ b/src/users/mate-users.desktop.in.in
+@@ -11,6 +11,6 @@
+ X-MATE-Bugzilla-Product=mate-system-tools
+ X-MATE-Bugzilla-Component=users-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+-OnlyShowIn=MATE;XFCE;
++NotShowIn=GNOME;KDE;
+ Keywords=manage;users;groups;system;mate-system-tools;
+ StartupNotify=true
+--- a/src/network/mate-network.desktop.in.in
++++ b/src/network/mate-network.desktop.in.in
+@@ -11,6 +11,6 @@
+ X-MATE-Bugzilla-Product=mate-system-tools
+ X-MATE-Bugzilla-Component=network-admin
+ X-MATE-Bugzilla-Version=@VERSION@
+-OnlyShowIn=MATE;XFCE;
++NotShowIn=GNOME;KDE;
+ Keywords=network;devices;connections;mate-system-tools;
+ StartupNotify=true
diff --git a/debian/patches/2001_omit-gfdl-licensed-doc-files.patch b/debian/patches/2001_omit-gfdl-licensed-doc-files.patch
new file mode 100644
index 0000000..3144c20
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-doc-files.patch
@@ -0,0 +1,26 @@
+Description: Don't build non-DFSG (GFDL 1.1 licensed) help files
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc icons interfaces pixmaps src po
++SUBDIRS = icons interfaces pixmaps src po
+
+ distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -307,12 +307,6 @@
+
+ AC_OUTPUT([
+ Makefile
+-doc/Makefile
+-doc/network/Makefile
+-doc/services/Makefile
+-doc/shares/Makefile
+-doc/time/Makefile
+-doc/users/Makefile
+ icons/Makefile
+ icons/16x16/Makefile
+ icons/16x16/apps/Makefile
diff --git a/debian/patches/2002_fix-pkgconfig-bad-directive.patch b/debian/patches/2002_fix-pkgconfig-bad-directive.patch
new file mode 100644
index 0000000..6643ef2
--- /dev/null
+++ b/debian/patches/2002_fix-pkgconfig-bad-directive.patch
@@ -0,0 +1,16 @@
+Description: Use hard-coded paths (instead of invalid @pixmapsdir@, @scriptsdir@)
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/mate-system-tools.pc.in
++++ b/mate-system-tools.pc.in
+@@ -3,8 +3,8 @@
+ libdir=
+ includedir=
+
+-pixmapsdir=@pixmapsdir@
+-backenddir=@scriptsdir@
++pixmapsdir=/usr/share/mate-system-tools/pixmaps
++backenddir=/usr/share/system-tools-backends-2.0/scripts
+
+ Name: gst
+ Description: Mate System Tools
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2dd24d3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+1002_add-keywords-to-desktop-files.patch
+1003_use-NotShowIn-instead-of-OnlyShowIn.patch
+2001_omit-gfdl-licensed-doc-files.patch
+2002_fix-pkgconfig-bad-directive.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-system-tools.git
More information about the pkg-mate-commits
mailing list