Attachment 135224 Details for Bug 180031 – file.diff

[patch] file.diff

file.diff (text/plain), 45.32 KB, created by Ivan Klymenko on 2013-06-27 16:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Klymenko

Created: 2013-06-27 16:40:00 UTC

Size: 45.32 KB

patch

obsolete

>diff --git a/cairo-dock-plugins.old/Makefile b/cairo-dock-plugins/Makefile
>index 2f06457..dcab870 100644
>--- a/cairo-dock-plugins.old/Makefile
>+++ b/cairo-dock-plugins/Makefile
>@@ -1,11 +1,10 @@
>-# Created by: Ivan Klymenko <fidaj@ukr.net>
>-# $FreeBSD: head/deskutils/cairo-dock-plugins/Makefile 320589 2013-06-11 14:53:03Z miwi $
>+# $FreeBSD:
> 
> PORTNAME=	cairo-dock-plugins
>-DISTVERSION=	2.3.0~3
>-PORTREVISION=	5
>+DISTVERSION=	3.2.1
>+PORTREVISION=	0
> CATEGORIES=	deskutils
>-MASTER_SITES=	http://launchpadlibrarian.net/73753265/ \
>+MASTER_SITES=	https://launchpadlibrarian.net/137290159/ \
> 		http://pazzle.otdux.com.ua/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ICONS_PACKAGE}${EXTRACT_SUFX}
> 
>@@ -14,7 +13,7 @@ COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
> 
> RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
> LIB_DEPENDS=	etpan:${PORTSDIR}/mail/libetpan \
>-		gldi.2:${PORTSDIR}/deskutils/cairo-dock
>+		gldi.3:${PORTSDIR}/deskutils/cairo-dock
> 
> DATADIR=	${PREFIX}/share/cairo-dock
> 
>@@ -26,83 +25,110 @@ USE_LDCONFIG=	yes
> USE_PYTHON=	yes
> USE_XORG=	xrender
> USE_DOS2UNIX=	YES
>-USES=		cmake gettext pathfix
>+USES=		cmake gettext
> USE_GCC=	4.6+
> MAKE_JOBS_SAFE=	YES
> PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/thon//}"
>+CMAKE_ARGS+=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
> 
>-
>-
>-OPTIONS_DEFINE=		GMENU KEYBOARD_INDICATOR TERMINAL WEBLETS \
>-			XFCE_INTEGRATION ALSA_MIXER
>+OPTIONS_DEFINE=		XFCE_INTEGRATION ALSA_MIXER GMENU \
>+			KEYBOARD_INDICATOR IMPULSE \
>+			SOUND_EFFECTS TERMINAL WEBLETS 
> OPTIONS_DEFAULT=	GMENU TERMINAL WEBLETS
>-GMENU_DESC=		Common Applications menu
>-KEYBOARD_INDICATOR_DESC=	 Control the keyboard layout
>-TERMINAL_DESC=		 Add a terminal to your dock
>-WEBLETS_DESC=		 To show an interactive web page
>-XFCE_INTEGRATION_DESC=	For XFCE environnement
>-ALSA_MIXER_DESC=	For ALSA compatibility utils
>+XFCE_INTEGRATION_DESC=	XFCE integration support
>+ALSA_MIXER_DESC=	Alsa-Mixer applet
>+GMENU_DESC=		GMenu applet
>+KEYBOARD_INDICATOR_DESC=	 Keyboard-indicator applet
>+IMPULSE_DESC=		Impulse applet
>+SOUND_EFFECTS_DESC=	Sound Effects applet
>+TERMINAL_DESC=		Terminal applet
>+WEBLETS_DESC=		Weblets applet
> 
> .include <bsd.port.options.mk>
> 
> post-patch:
> 	@${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC}
>+	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -i.orig -e \
>+	    's|/bin/bash|${LOCALBASE}/bin/bash|g; \
>+	     s|/usr/bin/python|${LOCALBASE}/bin/python|g; \
>+	     s|/usr/bin/ruby|${LOCALBASE}/bin/ruby|g; \
>+	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
>+	     s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
>+
>+.if ${PORT_OPTIONS:MXFCE_INTEGRATION}
>+LIB_DEPENDS+=	thunar-vfs-1:${PORTSDIR}/x11-fm/thunar-vfs \
>+		exif:${PORTSDIR}/graphics/libexif
>+CMAKE_ARGS+=	-Denable-xfce-integration:BOOL=TRUE
>+PLIST_SUB+=	XFCE_INTEGRATION=""
>+.else
>+CMAKE_ARGS+=	-Denable-xfce-integration:BOOL=FALSE
>+PLIST_SUB+=	XFCE_INTEGRATION="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MALSA_MIXER}
>+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
>+RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
>+CMAKE_ARGS+=	-Denable-alsa-mixer:BOOL=TRUE
>+PLIST_SUB+=	ALSA_MIXER=""
>+.else
>+CMAKE_ARGS+=	-Denable-alsa-mixer:BOOL=FALSE
>+PLIST_SUB+=	ALSA_MIXER="@comment "
>+.endif
> 
> .if ${PORT_OPTIONS:MGMENU}
>-LIB_DEPENDS+=	gnome-menu.2:${PORTSDIR}/x11/gnome-menus
>-CMAKE_ARGS+=	-Denable_gmenu:STRING=yes
>+LIB_DEPENDS+=	gnome-menu:${PORTSDIR}/x11/gnome-menus
>+CMAKE_ARGS+=	-Denable-gmenu:BOOL=TRUE
> PLIST_SUB+=	GMENU=""
> .else
>-CMAKE_ARGS+=	-Denable_gmenu:STRING=no
>+CMAKE_ARGS+=	-Denable-gmenu:BOOL=FALSE
> PLIST_SUB+=	GMENU="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MKEYBOARD_INDICATOR}
>-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif \
>-		xklavier.12:${PORTSDIR}/x11/libxklavier
>-CMAKE_ARGS+=	-Denable_keyboard_indicator:STRING=yes
>+LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif \
>+		xklavier:${PORTSDIR}/x11/libxklavier
>+CMAKE_ARGS+=	-Denable-keyboard-indicator:BOOL=TRUE
> PLIST_SUB+=	KEYBOARD_INDICATOR=""
> .else
>-CMAKE_ARGS+=	-Denable_keyboard_indicator:STRING=no
>+CMAKE_ARGS+=	-Denable-keyboard-indicator:BOOL=FALSE
> PLIST_SUB+=	KEYBOARD_INDICATOR="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MTERMINAL}
>-LIB_DEPENDS+=	vte.9:${PORTSDIR}/x11-toolkits/vte
>-CMAKE_ARGS+=	-Denable_terminal:STRING=yes
>-PLIST_SUB+=	TERMINAL=""
>+.if ${PORT_OPTIONS:MIMPULSE}
>+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
>+CMAKE_ARGS+=	-Denable-impulse:BOOL=TRUE
>+PLIST_SUB+=	IMPULSE=""
> .else
>-CMAKE_ARGS+=	-Denable_terminal:STRING=no
>-PLIST_SUB+=	TERMINAL="@comment "
>+CMAKE_ARGS+=	-Denable-impulse:BOOL=FALSE
>+PLIST_SUB+=	IMPULSE="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MWEBLETS}
>-LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
>-CMAKE_ARGS+=	-Denable_weblets:STRING=yes
>-PLIST_SUB+=	WEBLETS=""
>+.if ${PORT_OPTIONS:MSOUND_EFFECTS}
>+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
>+RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
>+CMAKE_ARGS+=	-Denable-sound-effects:BOOL=TRUE
>+PLIST_SUB+=	SOUND_EFFECTS=""
> .else
>-CMAKE_ARGS+=	-Denable_weblets:STRING=no
>-PLIST_SUB+=	WEBLETS="@comment "
>+CMAKE_ARGS+=	-Denable-sound-effects:BOOL=FALSE
>+PLIST_SUB+=	SOUND_EFFECTS="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MXFCE_INTEGRATION}
>-LIB_DEPENDS+=	thunar-vfs-1.5:${PORTSDIR}/x11-fm/thunar \
>-		exif.12:${PORTSDIR}/graphics/libexif
>-CMAKE_ARGS+=	-Denable_xfce_integration:STRING=yes
>-PLIST_SUB+=	XFCE_INTEGRATION=""
>+.if ${PORT_OPTIONS:MTERMINAL}
>+LIB_DEPENDS+=	vte:${PORTSDIR}/x11-toolkits/vte
>+CMAKE_ARGS+=	-Denable-terminal:BOOL=TRUE
>+PLIST_SUB+=	TERMINAL=""
> .else
>-CMAKE_ARGS+=	-Denable_xfce_integration:STRING=no
>-PLIST_SUB+=	XFCE_INTEGRATION="@comment "
>+CMAKE_ARGS+=	-Denable-terminal:BOOL=FALSE
>+PLIST_SUB+=	TERMINAL="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MALSA_MIXER}
>-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
>-RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
>-CMAKE_ARGS+=	-Denable_alsa_mixer:STRING=yes
>-PLIST_SUB+=	ALSA_MIXER=""
>+.if ${PORT_OPTIONS:MWEBLETS}
>+LIB_DEPENDS+=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
>+CMAKE_ARGS+=	-Denable-weblets:BOOL=TRUE
>+PLIST_SUB+=	WEBLETS=""
> .else
>-CMAKE_ARGS+=	-Denable_alsa_mixer:STRING=no
>-PLIST_SUB+=	ALSA_MIXER="@comment "
>+CMAKE_ARGS+=	-Denable-weblets:BOOL=FALSE
>+PLIST_SUB+=	WEBLETS="@comment "
> .endif
> 
> .include <bsd.port.mk>
>diff --git a/cairo-dock-plugins.old/distinfo b/cairo-dock-plugins/distinfo
>index 960b8ac..90f2a56 100644
>--- a/cairo-dock-plugins.old/distinfo
>+++ b/cairo-dock-plugins/distinfo
>@@ -1,4 +1,4 @@
>-SHA256 (cairo-dock-plugins-2.3.0~3.tar.gz) = 2bcfae5b6876a0a9a36ce7e0deb42a2d72234299da651c24f34e398f956a25cf
>-SIZE (cairo-dock-plugins-2.3.0~3.tar.gz) = 5959407
>+SHA256 (cairo-dock-plugins-3.2.1.tar.gz) = 11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01
>+SIZE (cairo-dock-plugins-3.2.1.tar.gz) = 6860950
> SHA256 (cairo-dock-plugins-png-icons.tar.gz) = f88327b073ac3673ea8765c608c7fe7beb1357b2c16c4dd8a26c14ec9cc2244a
> SIZE (cairo-dock-plugins-png-icons.tar.gz) = 1446489
>diff --git a/cairo-dock-plugins.old/files/patch-CDBashApplet.sh b/cairo-dock-plugins.old/files/patch-CDBashApplet.sh
>deleted file mode 100644
>index a66b73e..0000000
>--- a/cairo-dock-plugins.old/files/patch-CDBashApplet.sh
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- Dbus/interfaces/bash/CDBashApplet.sh.orig	2012-03-09 17:46:25.024862245 +0200
>-+++ Dbus/interfaces/bash/CDBashApplet.sh	2012-03-09 17:46:37.734860652 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # This is a part of the external applets for Cairo-Dock
>- # Copyright : (C) 2010-2011 by Nochka85
>diff --git a/cairo-dock-plugins.old/files/patch-CMakeLists.txt b/cairo-dock-plugins.old/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 020d984..0000000
>--- a/cairo-dock-plugins.old/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,97 +0,0 @@
>---- CMakeLists.txt.orig	2011-07-12 14:07:10.000000000 +0300
>-+++ CMakeLists.txt	2011-07-12 14:09:57.000000000 +0300
>-@@ -148,21 +148,6 @@
>- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Clipper/data/Clipper.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Clipper/data/Clipper.conf)
>- add_subdirectory (Clipper)
>- 
>--############# CLOCK #################
>--set (with_ical "yes")
>--pkg_check_modules ("LIBICAL_PACKAGE" "libical")
>--if ("${LIBICAL_PACKAGE_FOUND}" STREQUAL "")
>--	set (with_ical "no")
>--	message (STATUS "Could not find libical; Clock plugin won't be built with iCal support.")
>--endif()
>--set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
>--set (VERSION_CLOCK "2.1.2")
>--set (PACKAGE_CLOCK "cd-clock")
>--set (clockuserdirname "clock")
>--set (clockdatadir "${pluginsdatadir}/clock")
>--configure_file (${CMAKE_CURRENT_SOURCE_DIR}/clock/data/clock.conf.in ${CMAKE_CURRENT_BINARY_DIR}/clock/data/clock.conf)
>--add_subdirectory (clock)
>--
>- ############# COMPIZ_ICON #################
>- set (GETTEXT_COMPIZ_ICON ${GETTEXT_PLUGINS})
>- set (VERSION_COMPIZ_ICON "1.1.6")
>-@@ -224,7 +209,7 @@
>- 
>- # Valac is only riquired to convert vala files to C files.
>- #  So we can directly use produced files (c, h, vapi) without using valac.
>--set (with_vala "yes")
>-+set (with_vala "no")
>- set (with_valac "no")
>- find_program (VALAC_EXE valac)
>- message (STATUS "VALAC_EXE: ${VALAC_EXE}")
>-@@ -470,6 +455,7 @@
>- endif()
>- 
>- ############# KEYBOARD_INDICATOR #################
>-+if (NOT "${enable_keyboard_indicator}" STREQUAL "no")
>- set (with_keyboard_indicator "no")
>- pkg_check_modules (KEYBOARD_INDICATOR_PACKAGE libxklavier)
>- if ("${KEYBOARD_INDICATOR_PACKAGE_FOUND}" STREQUAL "")
>-@@ -483,6 +469,7 @@
>- 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/keyboard-indicator/data/keyboard-indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/keyboard-indicator/data/keyboard-indicator.conf)
>- 	add_subdirectory ("keyboard-indicator")
>- endif()
>-+endif()
>- 
>- ############# LOGOUT #################
>- set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS})
>-@@ -800,6 +787,7 @@
>- add_subdirectory (systray)
>- 
>- ############# TERMINAL #################
>-+if (NOT "${enable_terminal}" STREQUAL "no")
>- pkg_check_modules (TERMINAL_PACKAGE vte)
>- if ("${TERMINAL_PACKAGE_FOUND}" STREQUAL "")
>- 	message (STATUS "Could not find libvte; Cairo-Dock won't be built with terminal applet.")
>-@@ -813,6 +801,7 @@
>- 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/terminal/data/terminal.conf.in ${CMAKE_CURRENT_BINARY_DIR}/terminal/data/terminal.conf)
>- 	add_subdirectory (terminal)
>- endif()
>-+endif()
>- 
>- ############# TOMBOY #################
>- set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
>-@@ -841,6 +830,7 @@
>- add_subdirectory (weather)
>- 
>- ############# WEBLETS #################
>-+if (NOT "${enable_weblets}" STREQUAL "no")
>- set (with_weblets "no")
>- if (NOT "${enable-weblets}" STREQUAL "no")
>- 	pkg_check_modules (WEBKIT webkit-1.0)
>-@@ -856,6 +846,7 @@
>- 		add_subdirectory ("weblets")
>- 	endif()
>- endif()
>-+endif()
>- 
>- ############# WIFI #################
>- set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
>-@@ -866,6 +857,7 @@
>- add_subdirectory (wifi)
>- 
>- ############# XFCE-INTEGRATION #################
>-+if (NOT "${enable_xfce_integration}" STREQUAL "no")
>- set (with_xfce_integration "no")
>- if (NOT "${enable-xfce-integration}" STREQUAL "no")
>- 	pkg_check_modules (XFCE_INTEGRATION_THUNAR thunar-vfs-1)
>-@@ -880,6 +872,7 @@
>- 		add_subdirectory ("xfce-integration")
>- 	endif()
>- endif()
>-+endif()
>- 
>- ############# XGAMMA #################
>- pkg_check_modules (XGAMMA_PACKAGE x11 xxf86vm)
>diff --git a/cairo-dock-plugins.old/files/patch-Doncky-data-nvidia-config b/cairo-dock-plugins.old/files/patch-Doncky-data-nvidia-config
>deleted file mode 100644
>index 32045c2..0000000
>--- a/cairo-dock-plugins.old/files/patch-Doncky-data-nvidia-config
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- Doncky/data/nvidia-config.orig	2012-03-09 17:35:57.094857454 +0200
>-+++ Doncky/data/nvidia-config	2012-03-09 17:36:09.384875249 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>diff --git a/cairo-dock-plugins.old/files/patch-GMenu-applet-menu b/cairo-dock-plugins.old/files/patch-GMenu-applet-menu
>deleted file mode 100644
>index add348e..0000000
>--- a/cairo-dock-plugins.old/files/patch-GMenu-applet-menu
>+++ /dev/null
>@@ -1,22 +0,0 @@
>---- GMenu/src/applet-menu.c.orig	2011-06-19 02:27:29.000000000 +0300
>-+++ GMenu/src/applet-menu.c	2012-04-08 11:24:51.000000000 +0300
>-@@ -693,15 +693,15 @@
>- 	
>- 	// workaround pour KDE, qui ne loupe pas une occasion de se distinguer.
>- 	const gchar *cMenuFileName = NULL;
>--	if (! g_file_test ("/etc/xdg/menus/applications.menu", G_FILE_TEST_EXISTS))  // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard.
>-+	if (! g_file_test ("/usr/local/etc/xdg/menus/gnome-applications.menu", G_FILE_TEST_EXISTS))  // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard.
>- 	{
>--		if (g_file_test ("/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS))
>-+		if (g_file_test ("/usr/local/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS))
>- 			cMenuFileName = "kde-applications.menu";
>--		else if (g_file_test ("/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS))
>-+		else if (g_file_test ("/usr/local/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS))
>- 			cMenuFileName = "xfce-applications.menu";
>- 	}
>- 	if (cMenuFileName == NULL)
>--		cMenuFileName = "applications.menu";
>-+		cMenuFileName = "gnome-applications.menu";
>- 	
>- 	main_menu = create_applications_menu (cMenuFileName, NULL, NULL);
>- 	
>diff --git a/cairo-dock-plugins.old/files/patch-Network-Monitor-data-access-point b/cairo-dock-plugins.old/files/patch-Network-Monitor-data-access-point
>deleted file mode 100644
>index 3b0f834..0000000
>--- a/cairo-dock-plugins.old/files/patch-Network-Monitor-data-access-point
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- Network-Monitor/data/access-point.orig	2012-03-10 14:23:34.754015275 +0200
>-+++ Network-Monitor/data/access-point	2012-03-10 14:27:01.954034690 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>-@@ -17,4 +17,5 @@
>- # GNU General Public License for more details.
>- # http://www.gnu.org/licenses/licenses.html#GPL
>- 
>--iwlist $1 scan | grep "ESSID"
>-+#iwlist $1 scan | grep "ESSID"
>-+ifconfig $1 scan
>diff --git a/cairo-dock-plugins.old/files/patch-Network-Monitor-data-wifi b/cairo-dock-plugins.old/files/patch-Network-Monitor-data-wifi
>deleted file mode 100644
>index 49022f7..0000000
>--- a/cairo-dock-plugins.old/files/patch-Network-Monitor-data-wifi
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- Network-Monitor/data/wifi.orig	2012-03-10 14:33:22.124016420 +0200
>-+++ Network-Monitor/data/wifi	2012-03-10 14:42:50.174065239 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>-@@ -17,4 +17,8 @@
>- # GNU General Public License for more details.
>- # http://www.gnu.org/licenses/licenses.html#GPL
>- 
>--iwconfig 2>/dev/null
>-+#iwconfig 2>/dev/null
>-+
>-+lwlan = `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep wlan`
>-+
>-+ifconfig $lwlan
>diff --git a/cairo-dock-plugins.old/files/patch-System-Monitor-data-nvidia-config b/cairo-dock-plugins.old/files/patch-System-Monitor-data-nvidia-config
>deleted file mode 100644
>index 9f37356..0000000
>--- a/cairo-dock-plugins.old/files/patch-System-Monitor-data-nvidia-config
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- System-Monitor/data/nvidia-config.orig	2012-03-09 17:41:19.754859912 +0200
>-+++ System-Monitor/data/nvidia-config	2012-03-09 17:41:43.364873894 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # nVidia parameters script for Cairo-Dock
>- #
>diff --git a/cairo-dock-plugins.old/files/patch-System-Monitor.conf.in b/cairo-dock-plugins.old/files/patch-System-Monitor.conf.in
>deleted file mode 100644
>index e2f3f7c..0000000
>--- a/cairo-dock-plugins.old/files/patch-System-Monitor.conf.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- System-Monitor/data/System-Monitor.conf.in.orig	2012-03-10 14:48:59.993985159 +0200
>-+++ System-Monitor/data/System-Monitor.conf.in	2012-03-10 14:49:10.124034439 +0200
>-@@ -183,7 +183,7 @@
>- asound=true
>- 
>- #u Path to sound file:
>--sound path = /usr/share/sounds/error.wav
>-+sound path = /usr/local/share/sounds/error.wav
>- 
>- #F[System-Monitor;gtk-execute]
>- frame_sysmon=
>diff --git a/cairo-dock-plugins.old/files/patch-applet-appli-finder.c b/cairo-dock-plugins.old/files/patch-applet-appli-finder.c
>deleted file mode 100644
>index abbf94b..0000000
>--- a/cairo-dock-plugins.old/files/patch-applet-appli-finder.c
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- Scooby-Do/src/applet-appli-finder.c.orig	2012-03-10 14:50:21.113987701 +0200
>-+++ Scooby-Do/src/applet-appli-finder.c	2012-03-10 14:50:35.394070505 +0200
>-@@ -70,7 +70,7 @@
>- 	cd_debug ("la liste des applis a change dans %s!\n", cURI);
>- 	// on reconstruit la liste des applis.
>- 	cd_do_reset_applications_list ();
>--	_browse_dir ("/usr/share/applications");  // oui c'est bourrin, ca ne doit pas arriver tres souvent?
>-+	_browse_dir ("/usr/local/share/applications");  // oui c'est bourrin, ca ne doit pas arriver tres souvent?
>- 	myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli);
>- }
>- static void _browse_dir (const gchar *cDirPath)
>-@@ -210,7 +210,7 @@
>- 	//\_______________ On liste les applis.
>- 	if (myData.pApplications == NULL)  // on n'a pas encore liste les applications, on le fait maintenant.
>- 	{
>--		_browse_dir ("/usr/share/applications");
>-+		_browse_dir ("/usr/local/share/applications");
>- 		myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli);  // on parcourt tout d'un coup (plutot que par exemple seulement les .desktop correspondant a la 1ere lettre car il y'a les sous-rep a parcourir, donc il faut de toute maniere se farcir la totale; de plus la commande peut differer du nom du .desktop.
>- 	}
>- 	
>diff --git a/cairo-dock-plugins.old/files/patch-applet-notifications.c b/cairo-dock-plugins.old/files/patch-applet-notifications.c
>deleted file mode 100644
>index 828cb5d..0000000
>--- a/cairo-dock-plugins.old/files/patch-applet-notifications.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- logout/src/applet-notifications.c.orig	2012-03-10 14:47:11.714017314 +0200
>-+++ logout/src/applet-notifications.c	2012-03-10 14:47:23.824032902 +0200
>-@@ -26,7 +26,7 @@
>- #include "applet-struct.h"
>- #include "applet-notifications.h"
>- 
>--#define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch"
>-+#define GUEST_SESSION_LAUNCHER "/usr/local/share/gdm/guest-session/guest-session-launch"
>- 
>- 
>- static void _logout (void)
>diff --git a/cairo-dock-plugins.old/files/patch-calc.sh b/cairo-dock-plugins.old/files/patch-calc.sh
>deleted file mode 100644
>index af6e6da..0000000
>--- a/cairo-dock-plugins.old/files/patch-calc.sh
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- Scooby-Do/data/calc.sh.orig	2012-03-09 17:33:51.704873391 +0200
>-+++ Scooby-Do/data/calc.sh	2012-03-09 17:34:12.744872958 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>diff --git a/cairo-dock-plugins.old/files/patch-demo_bash.sh b/cairo-dock-plugins.old/files/patch-demo_bash.sh
>deleted file mode 100644
>index beaf962..0000000
>--- a/cairo-dock-plugins.old/files/patch-demo_bash.sh
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- Dbus/demos/demo_bash/demo_bash.sh.orig	2012-03-10 14:49:47.073972280 +0200
>-+++ Dbus/demos/demo_bash/demo_bash.sh	2012-03-10 14:51:40.554027497 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # This is a part of the external demo applets for Cairo-Dock
>- #
>-@@ -24,7 +24,7 @@
>- ### Contact : nochka85@glx-dock.org
>- ### Rev : 09/02/2011
>- 
>--. /usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $*
>-+. /usr/local/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $*
>- 
>- #############################################################################################################
>- 
>diff --git a/cairo-dock-plugins.old/files/patch-netspeed b/cairo-dock-plugins.old/files/patch-netspeed
>deleted file mode 100644
>index b617e58..0000000
>--- a/cairo-dock-plugins.old/files/patch-netspeed
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- netspeed/data/netspeed.orig	2012-03-09 17:36:57.984857300 +0200
>-+++ netspeed/data/netspeed	2012-03-09 17:38:25.094870374 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>-@@ -19,7 +19,7 @@
>-  
>- rm -f /tmp/netspeed
>- #Il est pas beau mon script hein ^^
>--cat /proc/net/dev | sed -e '{1d;2d;3d}' -e "s/:/Ã©/g" -e "s/ /_/g" -e "s/_*$.*$Ã©_*$[0-9][0-9]*$__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*$[0-9][0-9]*$__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*/\1>\2>\3/" > /tmp/netspeed
>-+cat /compat/linux/proc/net/dev | sed -e '{1d;2d;3d}' -e "s/:/Ã©/g" -e "s/ /_/g" -e "s/_*$.*$Ã©_*$[0-9][0-9]*$__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*$[0-9][0-9]*$__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*/\1>\2>\3/" > /tmp/netspeed
>- echo time >> /tmp/netspeed
>- date +%s%N >> /tmp/netspeed
>- echo stop >> /tmp/netspeed
>diff --git a/cairo-dock-plugins.old/files/patch-shortcuts b/cairo-dock-plugins.old/files/patch-shortcuts
>deleted file mode 100644
>index 29df920..0000000
>--- a/cairo-dock-plugins.old/files/patch-shortcuts
>+++ /dev/null
>@@ -1,78 +0,0 @@
>---- shortcuts/src/applet-disk-usage.c.orig	2010-12-11 02:13:37.000000000 +0200
>-+++ shortcuts/src/applet-disk-usage.c	2010-12-11 02:21:43.000000000 +0200
>-@@ -18,10 +18,18 @@
>- */
>- 
>- #include <string.h>
>--#include <mntent.h>
>- #include <sys/types.h>
>--#include <sys/statfs.h>
>-+#if defined(__FreeBSD__)
>-+#ifdef HAVE_MNTENT_H
>- #include <mntent.h>
>-+#endif
>-+#include <sys/param.h>
>-+#include <sys/ucred.h>
>-+#include <sys/mount.h>
>-+#else
>-+#include <mntent.h>
>-+#include <sys/statfs.h>
>-+#endif
>- #include <math.h>
>- 
>- #include <cairo-dock.h>
>-@@ -160,12 +168,44 @@
>- static void _cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo)
>- {
>- 	const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
>--	struct mntent *me;
>--	FILE *mtab = setmntent ("/etc/mtab", "r");
>-+#if defined(__FreeBSD__)
>-+        struct statfs *me;
>-+//     FILE *mtab;
>-+#else
>-+        struct mntent *me;
>-+        FILE *mtab = setmntent ("/etc/mtab", "r");
>-+#endif
>- 	char *search_path;
>- 	int match;
>- 	char *slash;
>- 
>-+#if defined(__FreeBSD__)
>-+        int i;
>-+        int count = getfsstat(me, NULL, MNT_WAIT);
>-+//        int count = getfsstat(me, NULL, MNT_NOWAIT);
>-+        if (count>0)
>-+        {
>-+         for (i=0; i<count; i++)
>-+         {
>-+          if (me->f_mntonname && strcmp (me->f_mntonname, cMountPath) == 0)
>-+          {
>-+           g_string_append_printf (sInfo, "Mount point : %s\nFile system : %s\nDevice : %s\nMount options : %s",
>-+                                   me->f_mntonname,
>-+                                   me->f_mntfromname,
>-+                                   me->f_fstypename,
>-+                                   me->f_charspare);
>-+//         if (me->mnt_freq != 0)
>-+//          g_string_append_printf (sInfo, "\nBackup frequency : %d days", me->mnt_freq);
>-+           break ;
>-+          }
>-+         }
>-+        }
>-+        else
>-+        {
>-+         cd_warning ("error getfsstat...");
>-+         return ;
>-+        }
>-+#else
>- 	if (mtab == NULL)
>- 	{
>- 		cd_warning ("couldn't open /etc/mtab");
>-@@ -189,6 +229,7 @@
>- 	}
>- 	
>- 	endmntent (mtab);
>-+#endif
>- }
>- 
>- gchar *cd_shortcuts_get_disk_info (const gchar *cDiskURI, const gchar *cDiskName)
>diff --git a/cairo-dock-plugins.old/files/patch-tomboy-dbus b/cairo-dock-plugins.old/files/patch-tomboy-dbus
>deleted file mode 100644
>index 1892aba..0000000
>--- a/cairo-dock-plugins.old/files/patch-tomboy-dbus
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- tomboy/src/tomboy-dbus.c.orig	2010-12-11 02:12:22.000000000 +0200
>-+++ tomboy/src/tomboy-dbus.c	2010-12-11 02:12:30.000000000 +0200
>-@@ -30,7 +30,7 @@
>- 
>- static DBusGProxy *dbus_proxy_tomboy = NULL;
>- 
>--extern struct tm *localtime_r (time_t *timer, struct tm *tp);
>-+//extern struct tm *localtime_r (time_t *timer, struct tm *tp);
>- 
>- #define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
>- #define g_marshal_value_peek_object(v)   g_value_get_object (v)
>diff --git a/cairo-dock-plugins.old/files/patch-updatedb.sh b/cairo-dock-plugins.old/files/patch-updatedb.sh
>deleted file mode 100644
>index bbd6699..0000000
>--- a/cairo-dock-plugins.old/files/patch-updatedb.sh
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- Scooby-Do/data/updatedb.sh.orig	2012-03-09 17:32:56.414874523 +0200
>-+++ Scooby-Do/data/updatedb.sh	2012-03-09 17:33:01.154874299 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>diff --git a/cairo-dock-plugins.old/files/patch-upload2free.sh b/cairo-dock-plugins.old/files/patch-upload2free.sh
>deleted file mode 100644
>index 3406ed3..0000000
>--- a/cairo-dock-plugins.old/files/patch-upload2free.sh
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- dnd2share/data/upload2free.sh.orig	2012-03-09 17:43:14.294869326 +0200
>-+++ dnd2share/data/upload2free.sh	2012-03-09 17:43:57.334859814 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- # This program is free software; you can redistribute it and/or
>- # modify it under the terms of the GNU General Public License
>- # as published by the Free Software Foundation; either version 2
>diff --git a/cairo-dock-plugins.old/files/patch-wifi-data-access-point b/cairo-dock-plugins.old/files/patch-wifi-data-access-point
>deleted file mode 100644
>index f49b173..0000000
>--- a/cairo-dock-plugins.old/files/patch-wifi-data-access-point
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- wifi/data/access-point.orig	2012-03-10 14:23:34.754015275 +0200
>-+++ wifi/data/access-point	2012-03-10 14:27:01.954034690 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>-@@ -17,4 +17,5 @@
>- # GNU General Public License for more details.
>- # http://www.gnu.org/licenses/licenses.html#GPL
>- 
>--iwlist $1 scan | grep "ESSID"
>-+#iwlist $1 scan | grep "ESSID"
>-+ifconfig $1 scan
>diff --git a/cairo-dock-plugins.old/files/patch-wifi-data-wifi b/cairo-dock-plugins.old/files/patch-wifi-data-wifi
>deleted file mode 100644
>index 5be45e6..0000000
>--- a/cairo-dock-plugins.old/files/patch-wifi-data-wifi
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- wifi/data/wifi.orig	2012-03-10 14:33:22.124016420 +0200
>-+++ wifi/data/wifi	2012-03-10 14:42:50.174065239 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/usr/local/bin/bash
>- 
>- # Compiz check for Cairo-Dock
>- #
>-@@ -17,4 +17,8 @@
>- # GNU General Public License for more details.
>- # http://www.gnu.org/licenses/licenses.html#GPL
>- 
>--iwconfig 2>/dev/null
>-+#iwconfig 2>/dev/null
>-+
>-+lwlan = `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep wlan`
>-+
>-+ifconfig
>diff --git a/cairo-dock-plugins.old/pkg-plist b/cairo-dock-plugins/pkg-plist
>index 7a58c30..d1558d8 100644
>--- a/cairo-dock-plugins.old/pkg-plist
>+++ b/cairo-dock-plugins/pkg-plist
>@@ -2,14 +2,18 @@
> lib/cairo-dock/libcd-Animated-icons.so
> lib/cairo-dock/libcd-Cairo-Penguin.so
> lib/cairo-dock/libcd-Clipper.so
>+lib/cairo-dock/libcd-Composite-Manager.so
>+lib/cairo-dock/libcd-clock.so
> lib/cairo-dock/libcd-Dbus.so
> lib/cairo-dock/libcd-Folders.so
>+%%IMPULSE%%lib/cairo-dock/libcd-Impulse.so
> lib/cairo-dock/libcd-rssreader.so
> lib/cairo-dock/libcd-system-monitor.so
>+lib/cairo-dock/libcd-Screenshot.so
>+%%SOUND_EFFECTS%%lib/cairo-dock/libcd-Sound-Effects.so
> %%GMENU%%lib/cairo-dock/libcd-GMenu.so
> lib/cairo-dock/libcd-Toons.so
> lib/cairo-dock/libcd-Xgamma.so
>-lib/cairo-dock/libcd-compiz-icon.so
> lib/cairo-dock/libcd-desklet-rendering.so
> lib/cairo-dock/libcd-dialog-rendering.so
> lib/cairo-dock/libcd-dnd2share.so
>@@ -48,15 +52,19 @@ lib/cairo-dock/libcd_gnome-integration.so
> %%PYTHON_SITELIBDIR%%/CDBashApplet.py
> %%PYTHON_SITELIBDIR%%/CDBashApplet.pyc
> %%PYTHON_SITELIBDIR%%/CDBashApplet-1.0-%%PYVER%%.egg-info
>+share/locale/he/LC_MESSAGES/cairo-dock-plugins.mo
>+share/locale/hr/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/fr/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/id/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/it/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/ja/LC_MESSAGES/cairo-dock-plugins.mo
>+share/locale/lt/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/nl/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/pl/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/pt/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/pt_BR/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/ru/LC_MESSAGES/cairo-dock-plugins.mo
>+share/locale/sr@latin/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/sv/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/zh_CN/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/cs/LC_MESSAGES/cairo-dock-plugins.mo
>@@ -73,13 +81,70 @@ share/locale/eu/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/sk/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/sr/LC_MESSAGES/cairo-dock-plugins.mo
> share/locale/tr/LC_MESSAGES/cairo-dock-plugins.mo
>+share/cairo-dock/gauges/Battery/background.svg
>+share/cairo-dock/gauges/Battery/battery0.svg
>+share/cairo-dock/gauges/Battery/battery1.svg
>+share/cairo-dock/gauges/Battery/battery2.svg
>+share/cairo-dock/gauges/Battery/battery3.svg
>+share/cairo-dock/gauges/Battery/battery4.svg
>+share/cairo-dock/gauges/Battery/battery5.svg
>+share/cairo-dock/gauges/Battery/battery6.svg
>+share/cairo-dock/gauges/Battery/battery7.svg
>+share/cairo-dock/gauges/Battery/foreground.svg
>+share/cairo-dock/gauges/Battery/readme
>+share/cairo-dock/gauges/Battery/theme.xml
>+share/cairo-dock/gauges/Battery-Mono/0.svg
>+share/cairo-dock/gauges/Battery-Mono/1.svg
>+share/cairo-dock/gauges/Battery-Mono/2.svg
>+share/cairo-dock/gauges/Battery-Mono/3.svg
>+share/cairo-dock/gauges/Battery-Mono/4.svg
>+share/cairo-dock/gauges/Battery-Mono/5.svg
>+share/cairo-dock/gauges/Battery-Mono/preview
>+share/cairo-dock/gauges/Battery-Mono/readme
>+share/cairo-dock/gauges/Battery-Mono/theme.xml
>+share/cairo-dock/gauges/Battery-Mono/version
>+share/cairo-dock/gauges/Wifi_default/link-0.svg
>+share/cairo-dock/gauges/Wifi_default/link-1.svg
>+share/cairo-dock/gauges/Wifi_default/link-2.svg
>+share/cairo-dock/gauges/Wifi_default/link-3.svg
>+share/cairo-dock/gauges/Wifi_default/link-4.svg
>+share/cairo-dock/gauges/Wifi_default/link-5.svg
>+share/cairo-dock/gauges/Wifi_default/preview
>+share/cairo-dock/gauges/Wifi_default/readme
>+share/cairo-dock/gauges/Wifi_default/theme.xml
>+share/cairo-dock/gauges/Wifi_default/version
>+share/cairo-dock/plug-ins/clock/digital/default/config
>+share/cairo-dock/plug-ins/clock/digital/default/frame_0.svg
>+share/cairo-dock/plug-ins/clock/digital/default/frame_1.svg
>+share/cairo-dock/plug-ins/clock/digital/default/frame_2.svg
>+share/cairo-dock/plug-ins/clock/digital/default/frame_3.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-drop-shadow.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-face-shadow.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-face.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-frame.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-glass.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-hour-hand-shadow.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-hour-hand.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-marks.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-minute-hand-shadow.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-minute-hand.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-second-hand-shadow.svg
>+share/cairo-dock/plug-ins/clock/themes/default/clock-second-hand.svg
>+share/cairo-dock/plug-ins/clock/themes/default/readme
>+share/cairo-dock/plug-ins/clock/themes/default/theme.conf
>+share/cairo-dock/plug-ins/clock/clock.conf
>+share/cairo-dock/plug-ins/clock/dates.svg
>+share/cairo-dock/plug-ins/clock/icon-alarm.png
>+share/cairo-dock/plug-ins/clock/icon-task.png
>+share/cairo-dock/plug-ins/clock/icon.png
>+share/cairo-dock/plug-ins/clock/preview.jpg
> share/cairo-dock/plug-ins/dnd2share/icon.svg
> share/cairo-dock/plug-ins/rendering/preview-panel.jpg
>+share/cairo-dock/plug-ins/rendering/preview-slide.jpg
> share/cairo-dock/plug-ins/rendering/readme-panel-view
>+share/cairo-dock/plug-ins/rendering/readme-slide-view
> share/cairo-dock/plug-ins/Folders/Folders.conf
> share/cairo-dock/plug-ins/Folders/preview.jpg
>-share/cairo-dock/plug-ins/Folders/icon.svg
>-share/cairo-dock/plug-ins/logout/icon-lock.png
> %%XFCE_INTEGRATION%%share/cairo-dock/plug-ins/xfce-integration/icon.png
> %%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/AlsaMixer.conf
> %%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/broken.svg
>@@ -89,14 +154,21 @@ share/cairo-dock/plug-ins/logout/icon-lock.png
> %%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/mute.svg
> %%ALSA_MIXER%%share/cairo-dock/plug-ins/AlsaMixer/preview.jpg
> share/cairo-dock/plug-ins/Animated-icons/Animated-icons.conf
>+share/cairo-dock/plug-ins/Animated-icons/busy.svg
> share/cairo-dock/plug-ins/Animated-icons/preview.jpg
> share/cairo-dock/plug-ins/Animated-icons/icon.svg
>+share/cairo-dock/plug-ins/Animated-icons/icon-busy.png
> share/cairo-dock/plug-ins/Animated-icons/texture-chrome.png
> share/cairo-dock/plug-ins/Animated-icons/icon-rotation.png
> share/cairo-dock/plug-ins/Animated-icons/spot.png
> share/cairo-dock/plug-ins/Animated-icons/halo.png
> share/cairo-dock/plug-ins/Animated-icons/ray.png
> share/cairo-dock/plug-ins/Animated-icons/icon-wave.png
>+share/cairo-dock/plug-ins/Composite-Manager/Composite-Manager.conf
>+share/cairo-dock/plug-ins/Composite-Manager/composite-off.png
>+share/cairo-dock/plug-ins/Composite-Manager/composite-on.png
>+share/cairo-dock/plug-ins/Composite-Manager/icon.png
>+share/cairo-dock/plug-ins/Composite-Manager/preview.jpg
> share/cairo-dock/plug-ins/Cairo-Penguin/Cairo-Penguin.conf
> share/cairo-dock/plug-ins/Cairo-Penguin/icon.png
> share/cairo-dock/plug-ins/Cairo-Penguin/preview.jpg
>@@ -129,45 +201,37 @@ share/cairo-dock/plug-ins/Clipper/preview.jpg
> share/cairo-dock/plug-ins/Clipper/Clipper-actions-gnome.conf
> share/cairo-dock/plug-ins/Clipper/Clipper-actions-xfce.conf
> share/cairo-dock/plug-ins/Clipper/Clipper-actions-kde.conf
>-share/cairo-dock/plug-ins/compiz-icon/compiz
>-share/cairo-dock/plug-ins/compiz-icon/compiz-kill
>-share/cairo-dock/plug-ins/compiz-icon/compiz-icon.conf
>-share/cairo-dock/plug-ins/compiz-icon/default.svg
>-share/cairo-dock/plug-ins/compiz-icon/broken.svg
>-share/cairo-dock/plug-ins/compiz-icon/other.svg
>-share/cairo-dock/plug-ins/compiz-icon/0.svg
>-share/cairo-dock/plug-ins/compiz-icon/1.svg
>-share/cairo-dock/plug-ins/compiz-icon/2.svg
>-share/cairo-dock/plug-ins/compiz-icon/3.svg
>-share/cairo-dock/plug-ins/compiz-icon/4.svg
>-share/cairo-dock/plug-ins/compiz-icon/icon.png
>-share/cairo-dock/plug-ins/compiz-icon/preview.jpg
> share/cairo-dock/plug-ins/Dbus/Dbus.conf
>+share/cairo-dock/plug-ins/Dbus/CDApplet.h
> share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh
> share/cairo-dock/plug-ins/Dbus/icon.svg
>-share/cairo-dock/plug-ins/desklet-rendering/icon.svg
>+share/cairo-dock/plug-ins/desklet-rendering/board.png
> share/cairo-dock/plug-ins/desklet-rendering/branche1.svg
> share/cairo-dock/plug-ins/desklet-rendering/branche2.svg
>-share/cairo-dock/plug-ins/desklet-rendering/scotch.svg
>-share/cairo-dock/plug-ins/desklet-rendering/scotch+frame.svg
>-share/cairo-dock/plug-ins/desklet-rendering/frame.svg
>-share/cairo-dock/plug-ins/desklet-rendering/reflect.svg
> share/cairo-dock/plug-ins/desklet-rendering/cd_box_cover.svg
> share/cairo-dock/plug-ins/desklet-rendering/cd_box.svg
>-share/cairo-dock/plug-ins/desklet-rendering/starcraft2.png
>-share/cairo-dock/plug-ins/desklet-rendering/dark-bg.png
> share/cairo-dock/plug-ins/desklet-rendering/clear-bg.svg
>-share/cairo-dock/plug-ins/desklet-rendering/board.png
> share/cairo-dock/plug-ins/dialog-rendering/dialog-rendering.conf
>+share/cairo-dock/plug-ins/desklet-rendering/dark-bg.svg
>+share/cairo-dock/plug-ins/desklet-rendering/frame.svg
>+share/cairo-dock/plug-ins/desklet-rendering/icon.svg
>+share/cairo-dock/plug-ins/desklet-rendering/light-bg.svg
>+share/cairo-dock/plug-ins/desklet-rendering/scotch.svg
>+share/cairo-dock/plug-ins/desklet-rendering/scotch+frame.svg
>+share/cairo-dock/plug-ins/desklet-rendering/reflect.svg
>+share/cairo-dock/plug-ins/desklet-rendering/starcraft2.png
>+share/cairo-dock/plug-ins/desklet-rendering/water-dark-bg.png
>+share/cairo-dock/plug-ins/desklet-rendering/water-drop-bg.png
> share/cairo-dock/plug-ins/dialog-rendering/icon.svg
> share/cairo-dock/plug-ins/dnd2share/upload2free.sh
> share/cairo-dock/plug-ins/dnd2share/dnd2share.conf
> share/cairo-dock/plug-ins/dnd2share/readme
> share/cairo-dock/plug-ins/dnd2share/preview.jpg
> %%GMENU%%share/cairo-dock/plug-ins/GMenu/GMenu.conf
>-%%GMENU%%share/cairo-dock/plug-ins/GMenu/icon-recent.png
> %%GMENU%%share/cairo-dock/plug-ins/GMenu/icon.svg
> %%GMENU%%share/cairo-dock/plug-ins/GMenu/preview.jpg
>+%%GMENU%%share/cairo-dock/plug-ins/GMenu/system-log-out.svg
>+%%GMENU%%share/cairo-dock/plug-ins/GMenu/system-shutdown.svg
> share/cairo-dock/plug-ins/drop-indicator/drop_indicator.conf
> share/cairo-dock/plug-ins/drop-indicator/icon.svg
> share/cairo-dock/plug-ins/drop-indicator/preview.jpg
>@@ -180,6 +244,7 @@ share/cairo-dock/plug-ins/dustbin/themes/default/preview
> share/cairo-dock/plug-ins/dustbin/themes/default/trashcan_full.svg
> share/cairo-dock/plug-ins/dustbin/themes/default/trashcan_empty.svg
> share/cairo-dock/plug-ins/gnome-integration/icon.png
>+share/cairo-dock/plug-ins/Folders/icon.png
> share/cairo-dock/plug-ins/icon-effect/icon-effect.conf
> share/cairo-dock/plug-ins/icon-effect/icon.png
> share/cairo-dock/plug-ins/icon-effect/icon-firework.png
>@@ -197,14 +262,28 @@ share/cairo-dock/plug-ins/illusion/icon-break.svg
> share/cairo-dock/plug-ins/illusion/icon-evaporate.svg
> share/cairo-dock/plug-ins/illusion/icon-explode.svg
> share/cairo-dock/plug-ins/illusion/icon-fade-out.svg
>+%%IMPULSE%%share/cairo-dock/plug-ins/Impulse/Impulse.conf
>+%%IMPULSE%%share/cairo-dock/plug-ins/Impulse/icon.png
>+%%IMPULSE%%share/cairo-dock/plug-ins/Impulse/impulse-error.svg
>+%%IMPULSE%%share/cairo-dock/plug-ins/Impulse/impulse-running.svg
>+%%IMPULSE%%share/cairo-dock/plug-ins/Impulse/impulse-stopped.svg
>+%%IMPULSE%%share/cairo-dock/plug-ins/Impulse/preview.jpg
> share/cairo-dock/plug-ins/kde-integration/icon.png
> %%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/keyboard-indicator.conf
> %%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/icon.png
> %%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/preview.jpg
>-share/cairo-dock/plug-ins/logout/emblem-reboot.png
>-share/cairo-dock/plug-ins/logout/logout.conf
> share/cairo-dock/plug-ins/logout/icon.svg
>-share/cairo-dock/plug-ins/logout/icon-scheduling.png
>+share/cairo-dock/plug-ins/logout/icon-scheduling.svg
>+share/cairo-dock/plug-ins/logout/locked.svg
>+share/cairo-dock/plug-ins/logout/logout.conf
>+share/cairo-dock/plug-ins/logout/logout.sh
>+share/cairo-dock/plug-ins/logout/preview.jpg
>+share/cairo-dock/plug-ins/logout/system-guest.svg
>+share/cairo-dock/plug-ins/logout/system-hibernate.svg
>+share/cairo-dock/plug-ins/logout/system-log-out.svg
>+share/cairo-dock/plug-ins/logout/system-restart.svg
>+share/cairo-dock/plug-ins/logout/system-shutdown.svg
>+share/cairo-dock/plug-ins/logout/system-suspend.svg
> share/cairo-dock/plug-ins/mail/preview.jpg
> share/cairo-dock/plug-ins/mail/cd_mail_icon.png
> share/cairo-dock/plug-ins/mail/cd_mail_newmail.svg
>@@ -265,17 +344,25 @@ share/cairo-dock/plug-ins/rendering/preview-caroussel.jpg
> share/cairo-dock/plug-ins/rendering/preview-parabolic.jpg
> share/cairo-dock/plug-ins/rendering/preview-3D-plane.jpg
> share/cairo-dock/plug-ins/rendering/preview-rainbow.jpg
>-share/cairo-dock/plug-ins/rendering/preview-diapo-simple.jpg
> share/cairo-dock/plug-ins/rendering/preview-curve.jpg
> share/cairo-dock/plug-ins/rendering/readme-3D-plane-view
> share/cairo-dock/plug-ins/rendering/readme-caroussel-view
> share/cairo-dock/plug-ins/rendering/readme-curve-view
>-share/cairo-dock/plug-ins/rendering/readme-diapo-simple-view
> share/cairo-dock/plug-ins/rendering/readme-parabolic-view
> share/cairo-dock/plug-ins/rendering/readme-rainbow-view
> share/cairo-dock/plug-ins/RSSreader/icon.svg
> share/cairo-dock/plug-ins/RSSreader/preview.jpg
> share/cairo-dock/plug-ins/RSSreader/RSSreader.conf
>+share/cairo-dock/plug-ins/Screenshot/Screenshot.conf
>+share/cairo-dock/plug-ins/Screenshot/icon.svg
>+share/cairo-dock/plug-ins/Screenshot/preview.jpg
>+share/cairo-dock/plug-ins/shared-files/images/expose-desktops.svg
>+share/cairo-dock/plug-ins/shared-files/images/expose-windows.svg
>+share/cairo-dock/plug-ins/shared-files/images/icon-gauge.png
>+share/cairo-dock/plug-ins/shared-files/images/icon-graph.png
>+share/cairo-dock/plug-ins/shared-files/images/show-desktop.svg
>+share/cairo-dock/plug-ins/shared-files/images/widget-layer.svg
>+share/cairo-dock/plug-ins/shared-files/scripts/lock-screen.sh
> share/cairo-dock/plug-ins/shortcuts/shortcuts.conf
> share/cairo-dock/plug-ins/shortcuts/icon.png
> share/cairo-dock/plug-ins/shortcuts/preview.jpg
>@@ -288,6 +375,12 @@ share/cairo-dock/plug-ins/show_mouse/preview.jpg
> share/cairo-dock/plug-ins/slider/slider.conf
> share/cairo-dock/plug-ins/slider/icon.png
> share/cairo-dock/plug-ins/slider/preview.jpg
>+%%SOUND_EFFECTS%%share/cairo-dock/plug-ins/Sound-Effects/Sound-Effects.conf
>+%%SOUND_EFFECTS%%share/cairo-dock/plug-ins/Sound-Effects/icon.svg
>+%%SOUND_EFFECTS%%share/cairo-dock/plug-ins/Sound-Effects/on-click.wav
>+%%SOUND_EFFECTS%%share/cairo-dock/plug-ins/Sound-Effects/on-hover.wav
>+%%SOUND_EFFECTS%%share/cairo-dock/plug-ins/Sound-Effects/on-middle-click.wav
>+%%SOUND_EFFECTS%%share/cairo-dock/plug-ins/Sound-Effects/preview.png
> share/cairo-dock/plug-ins/stack/stack.conf
> share/cairo-dock/plug-ins/stack/icon.png
> share/cairo-dock/plug-ins/stack/preview.jpg
>@@ -310,12 +403,10 @@ share/cairo-dock/plug-ins/systray/preview.jpg
> %%TERMINAL%%share/cairo-dock/plug-ins/terminal/icon.png
> %%TERMINAL%%share/cairo-dock/plug-ins/terminal/preview.jpg
> %%TERMINAL%%share/cairo-dock/plug-ins/terminal/terminal.conf
>-share/cairo-dock/plug-ins/tomboy/default.svg
> share/cairo-dock/plug-ins/tomboy/close.svg
>-share/cairo-dock/plug-ins/tomboy/broken.svg
>+share/cairo-dock/plug-ins/tomboy/icon.svg
> share/cairo-dock/plug-ins/tomboy/note.svg
> share/cairo-dock/plug-ins/tomboy/tomboy.conf
>-share/cairo-dock/plug-ins/tomboy/icon.png
> share/cairo-dock/plug-ins/tomboy/preview.jpg
> share/cairo-dock/plug-ins/Toons/Toons.conf
> share/cairo-dock/plug-ins/Toons/icon.png
>@@ -383,24 +474,31 @@ share/cairo-dock/plug-ins/weather/themes/Classic/readme
> %%WEBLETS%%share/cairo-dock/plug-ins/weblets/icon.png
> %%WEBLETS%%share/cairo-dock/plug-ins/weblets/preview.jpg
> %%WEBLETS%%share/cairo-dock/plug-ins/weblets/weblets.conf
>-share/cairo-dock/plug-ins/wifi/wifi
>-share/cairo-dock/plug-ins/wifi/wifi.conf
>-share/cairo-dock/plug-ins/wifi/link-0.svg
>-share/cairo-dock/plug-ins/wifi/link-1.svg
>-share/cairo-dock/plug-ins/wifi/link-2.svg
>-share/cairo-dock/plug-ins/wifi/link-3.svg
>-share/cairo-dock/plug-ins/wifi/link-4.svg
>-share/cairo-dock/plug-ins/wifi/link-5.svg
>+share/cairo-dock/plug-ins/wifi/default.svg
> share/cairo-dock/plug-ins/wifi/icon.png
>+share/cairo-dock/plug-ins/wifi/no-signal.svg
> share/cairo-dock/plug-ins/wifi/preview.jpg
>+share/cairo-dock/plug-ins/wifi/wifi.conf
>+%%XFCE_INTEGRATION%%share/cairo-dock/plug-ins/xfce-integration/icon.png
> share/cairo-dock/plug-ins/Xgamma/Xgamma.conf
> share/cairo-dock/plug-ins/Xgamma/icon.png
> share/cairo-dock/plug-ins/Xgamma/preview.jpg
>+@dirrmtry lib/pkgconfig
>+@dirrm share/cairo-dock/plug-ins/clock/digital/default
>+@dirrm share/cairo-dock/plug-ins/clock/digital
>+@dirrm share/cairo-dock/plug-ins/clock/themes/default
>+@dirrm share/cairo-dock/plug-ins/clock/themes
>+@dirrm share/cairo-dock/plug-ins/clock
>+@dirrm share/cairo-dock/gauges/Battery
>+@dirrm share/cairo-dock/gauges/Battery-Mono
>+@dirrm share/cairo-dock/gauges/Wifi_default
>+@dirrm share/cairo-dock/gauges
> %%ALSA_MIXER%%@dirrm share/cairo-dock/plug-ins/AlsaMixer
> @dirrm share/cairo-dock/plug-ins/Animated-icons
> @dirrm share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic
> @dirrm share/cairo-dock/plug-ins/Cairo-Penguin/themes
> @dirrm share/cairo-dock/plug-ins/Cairo-Penguin
>+@dirrm share/cairo-dock/plug-ins/Composite-Manager
> @dirrm share/cairo-dock/plug-ins/Clipper
> @dirrm share/cairo-dock/plug-ins/Dbus
> @dirrm share/cairo-dock/plug-ins/Folders
>@@ -410,7 +508,6 @@ share/cairo-dock/plug-ins/Xgamma/preview.jpg
> @dirrm share/cairo-dock/plug-ins/Toons/themes
> @dirrm share/cairo-dock/plug-ins/Toons
> @dirrm share/cairo-dock/plug-ins/Xgamma
>-@dirrm share/cairo-dock/plug-ins/compiz-icon
> @dirrm share/cairo-dock/plug-ins/desklet-rendering
> @dirrm share/cairo-dock/plug-ins/dialog-rendering
> @dirrm share/cairo-dock/plug-ins/dnd2share
>@@ -421,6 +518,7 @@ share/cairo-dock/plug-ins/Xgamma/preview.jpg
> @dirrm share/cairo-dock/plug-ins/gnome-integration
> @dirrm share/cairo-dock/plug-ins/icon-effect
> @dirrm share/cairo-dock/plug-ins/illusion
>+%%IMPULSE%%@dirrm share/cairo-dock/plug-ins/Impulse
> @dirrm share/cairo-dock/plug-ins/kde-integration
> %%KEYBOARD_INDICATOR%%@dirrm share/cairo-dock/plug-ins/keyboard-indicator
> @dirrm share/cairo-dock/plug-ins/logout
>@@ -437,15 +535,20 @@ share/cairo-dock/plug-ins/Xgamma/preview.jpg
> @dirrm share/cairo-dock/plug-ins/Remote-Control
> @dirrm share/cairo-dock/plug-ins/RSSreader
> @dirrm share/cairo-dock/plug-ins/rendering
>+@dirrm share/cairo-dock/plug-ins/Screenshot
>+@dirrm share/cairo-dock/plug-ins/shared-files/images
>+@dirrm share/cairo-dock/plug-ins/shared-files/scripts
>+@dirrm share/cairo-dock/plug-ins/shared-files
> @dirrm share/cairo-dock/plug-ins/shortcuts
> @dirrm share/cairo-dock/plug-ins/showDesktop
> @dirrm share/cairo-dock/plug-ins/show_mouse
> @dirrm share/cairo-dock/plug-ins/slider
>+%%SOUND_EFFECTS%%@dirrm share/cairo-dock/plug-ins/Sound-Effects
> @dirrm share/cairo-dock/plug-ins/stack
> @dirrm share/cairo-dock/plug-ins/switcher
> @dirrm share/cairo-dock/plug-ins/systray
>-%%TERMINAL%%@dirrm share/cairo-dock/plug-ins/terminal
> @dirrm share/cairo-dock/plug-ins/tomboy
>+%%TERMINAL%%@dirrm share/cairo-dock/plug-ins/terminal
> @dirrm share/cairo-dock/plug-ins/weather/themes/Classic
> @dirrm share/cairo-dock/plug-ins/weather/themes
> @dirrm share/cairo-dock/plug-ins/weather

Actions: View | Diff

Attachments on bug 180031: 135224