diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2008-02-21 18:29:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-02-21 18:29:49 +0000 |
| commit | afd6f59595fa20df66c405710c09d108ff3433e4 (patch) | |
| tree | 8d9f61e0a6d22a9d15501d8ab0f9d60cf3706bfb /x11-misc | |
| parent | Cleaning up random foo to make repoman fully happy (diff) | |
| download | historical-afd6f59595fa20df66c405710c09d108ff3433e4.tar.gz historical-afd6f59595fa20df66c405710c09d108ff3433e4.tar.bz2 historical-afd6f59595fa20df66c405710c09d108ff3433e4.zip | |
Make the desktop entry invisible in Gnome so it doesn't duplicate with gnome-screensaver due to translations and rename the desktop file to xscreensaver-properties.desktop
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch | 26 |
3 files changed, 32 insertions, 5 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 0796c11b0c1a..7fa65f5c195b 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.219 2008/02/21 17:04:12 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.220 2008/02/21 18:29:48 drac Exp $ + + 21 Feb 2008; Samuli Suominen <drac@gentoo.org> + files/xscreensaver-5.04-desktop-entry.patch: + Rename desktop file to xscreensaver-properties.desktop and add NotShowIn + GNOME to avoid duplicate entry with gnome-screensaver in Gnome environment. 21 Feb 2008; nixnut <nixnut@gentoo.org> xscreensaver-5.04-r1.ebuild: Stable on ppc wrt bug 210913 diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 6a022ccce208..fe170bc3430e 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -2,7 +2,7 @@ AUX desktop_entries/screensaver-properties.desktop 999 RMD160 c49e241d9731e31612 AUX xscreensaver-5.02-gentoo.patch 5731 RMD160 01d82a320dfcddfa0b5870c395d2334dc49e8af4 SHA1 8f3a08256907d0fe45eb75140843c9db8db3de88 SHA256 a5055ebfd350d236daa6625700dfdf1e638aea90f5472a3d700020c3ea303d73 AUX xscreensaver-5.03-nsfw.patch 6541 RMD160 7730170a441d7666233cdfe66dbebc738116f5d2 SHA1 bf0309dcbafed19cf178b6b38d46ebd45f80d865 SHA256 5d91ce4e3c654ea98c7d3c453a108f6eaf7057d23e5e52dc0567a80f9fb7879a AUX xscreensaver-5.04-build.patch 1199 RMD160 f6a4e16513168daa57241f0fe09459710b8b7cc7 SHA1 f58ccaff5f145f28f980a5380eea614d976d6d8d SHA256 323827a4fa1bfab553e41dafef3fb45ae35bdb6cd20fe8f824a1a3b3518d8994 -AUX xscreensaver-5.04-desktop-entry.patch 636 RMD160 b784667858307267ef146d353616897277f1ee84 SHA1 12073dea7320220e7971058a0022054c7dff37e1 SHA256 85e23a898aced1f7497f71fed00d7556be7378ff5e755655b5ead3c15d7d8743 +AUX xscreensaver-5.04-desktop-entry.patch 1822 RMD160 9150f517f5ed6e55788af838e0296b357384d1b2 SHA1 ba39458f6e94e14723ffb695bae1d351d26fdf60 SHA256 233215ef5af94130697f5eb42dbb2147c0d774cae42ef4df6c3c4cf58e45bbe5 AUX xscreensaver-5.04-gentoo.patch 4806 RMD160 abc9b3e218d4a8a5618d1ab04d00a21d4633c847 SHA1 56ae0cd141d9ac0667974d4b6f9162e80f2f87e3 SHA256 fdf5396983d5905b1d6d3eefdd6eed981abc2567d6bae58141516a75ab708a08 AUX xscreensaver-5.04-nsfw.patch 2068 RMD160 0a0a1081584b81c8beda6cd7d6bd89d0dc8da72c SHA1 a2768a4bef374c7d36bd285e65244877abef752a SHA256 bdd5a0363ec5f71886b3fc402749d9082ba4be4d1e7e05eeb81d5271b2cd1acd DIST xscreensaver-5.03.tar.gz 5412089 RMD160 f28aca829982c9b9b1989f03309e48fdbdc8e2de SHA1 e283a52faf6148273a82a9e5c9ed70c5722cdcb8 SHA256 82ad32523f5e6b8c8b6431aac4474f2bfde9d4cf70caec9446ed900f48887d26 @@ -10,5 +10,5 @@ DIST xscreensaver-5.04.tar.gz 5438905 RMD160 cf8c59a1aff1139c8d205bb734a17bc706f EBUILD xscreensaver-5.03.ebuild 4475 RMD160 72bfbe6fd349d3d35af9ce7d1501dff553a56187 SHA1 8b623c40d88d037f7aad8c9e36a5850f46b3200d SHA256 f7279fa3d14a512710a653bcdabc27258eeaff267b3cf2d1f8916e0e6b0c91dd EBUILD xscreensaver-5.04-r1.ebuild 2678 RMD160 5b038666948730df7cc7f9265c24350f81c4db63 SHA1 85103c42246ac600f4e9c85b8a19fe35d4661fac SHA256 5160df55f0be8149042a2872cf13b5364db53b58f0a5dbc5576f145ac92037df EBUILD xscreensaver-5.04.ebuild 2728 RMD160 23cc6e74f9e7246bbec654a3ef0182d2843d3441 SHA1 15a2a8133531ef8a8a00e240d5b94e1ae4417254 SHA256 18192827d1d04ce16a74860bd69cb00b73611e9799bdd901ba11b9c4f55e2cde -MISC ChangeLog 35612 RMD160 51b5f581cac913b79b7671275df9dd84df82fd1e SHA1 a60be02babf5534384465ff1cf73241eb47bf936 SHA256 71c56bb2b4174fc6ee37fef21ff5684ee1f0320224bb0f3ddf620b5e15df3bb8 +MISC ChangeLog 35860 RMD160 bb13aadf2fc7f5bff666367cab22c7e8e679d08a SHA1 4d84c65cbb80ffe0626f0512bc2335795725aaae SHA256 6edc2ead77b563253b2f78a1ca93dd54f2c47b0bfd7ea64dc668a316682cd435 MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch index aff293d6e999..fd6ef5eb81bb 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch @@ -1,7 +1,28 @@ +diff -ur xscreensaver-5.04.orig/driver/Makefile.in xscreensaver-5.04/driver/Makefile.in +--- xscreensaver-5.04.orig/driver/Makefile.in 2007-11-13 10:39:35.000000000 +0200 ++++ xscreensaver-5.04/driver/Makefile.in 2008-02-21 20:20:55.000000000 +0200 +@@ -498,7 +498,7 @@ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ + fi ;\ +- name2=gnome-screensaver-properties.desktop ;\ ++ name2=xscreensaver-properties.desktop ;\ + echo $(INSTALL_DATA) screensaver-properties.desktop \ + $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ + $(INSTALL_DATA) screensaver-properties.desktop \ +@@ -571,7 +571,7 @@ + # into /usr/share/applications/ + uninstall-gnome:: + @if [ "$(GTK_DATADIR)" != "" ]; then \ +- f=gnome-screensaver-properties.desktop ;\ ++ f=xscreensaver-properties.desktop ;\ + echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + fi diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreensaver-5.04/driver/screensaver-properties.desktop.in --- xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in 2003-12-15 13:16:12.000000000 +0200 -+++ xscreensaver-5.04/driver/screensaver-properties.desktop.in 2007-12-30 21:00:15.000000000 +0200 -@@ -1,8 +1,8 @@ ++++ xscreensaver-5.04/driver/screensaver-properties.desktop.in 2008-02-21 20:21:19.000000000 +0200 +@@ -1,8 +1,9 @@ [Desktop Entry] Exec=xscreensaver-demo -Icon=xscreensaver.xpm @@ -12,3 +33,4 @@ diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreen Type=Application -Categories=Application;Settings;Appearance;AdvancedSettings; +Categories=Settings;DesktopSettings;Security; ++NotShowIn=GNOME; |