SOURCES (AC-branch): xfdesktop-vfmg.patch - for 4.2.3

[havner]

Author: havner                       Date: Wed Jul  5 10:57:39 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- for 4.2.3

---- Files affected:
SOURCES:
   xfdesktop-vfmg.patch (1.3 -> 1.3.2.1) 

---- Diffs:

================================================================
Index: SOURCES/xfdesktop-vfmg.patch
diff -u SOURCES/xfdesktop-vfmg.patch:1.3 SOURCES/xfdesktop-vfmg.patch:1.3.2.1
--- SOURCES/xfdesktop-vfmg.patch:1.3	Wed Mar 16 05:32:51 2005
+++ SOURCES/xfdesktop-vfmg.patch	Wed Jul  5 12:57:34 2006
@@ -1,6 +1,6 @@
-diff -ur xfdesktop-4.2.1/menu.xml fix/xfdesktop-4.2.1/menu.xml
---- xfdesktop-4.2.1/menu.xml	2004-11-06 06:42:37.000000000 +0100
-+++ fix/xfdesktop-4.2.1/menu.xml	2005-03-16 05:01:15.208207008 +0100
+diff -urN xfdesktop-4.2.2/menu.xml fix/xfdesktop-4.2.2/menu.xml
+--- xfdesktop-4.2.2/menu.xml	2005-05-15 10:27:45.000000000 +0200
++++ fix/xfdesktop-4.2.2/menu.xml	2005-05-20 17:14:10.000000000 +0200
 @@ -77,13 +77,13 @@
  	  The next line includes the autogenerated menu at the current level.  If
  	  you want, you can put this in its own submenu.
@@ -13,26 +13,26 @@
  	  include a separate menu file instead of using the autogenerated menu.
  	-->
 -	<!-- <include type="file" src="menu2.xml"/> -->
-+	<include type="file" src="/etc/xdg/xfce4/desktop/menu2.xml"/>
++	<include type="file" src="menu2.xml"/>
  
      <separator/>
  
-diff -ur xfdesktop-4.2.1/menu.xml.pl fix/xfdesktop-4.2.1/menu.xml.pl
---- xfdesktop-4.2.1/menu.xml.pl	2005-03-16 05:07:46.257758440 +0100
-+++ fix/xfdesktop-4.2.1/menu.xml.pl	2005-03-16 05:01:30.016955736 +0100
-@@ -79,13 +79,13 @@
- 	  Następna linia zawiera autogenerowane mnue na obecnym poziomie.
- 	  Jeśli chcesz, moşesz zamieścić to we własnym podmenu.
+diff -urN xfdesktop-4.2.3/menu.xml.pl fix/xfdesktop-4.2.3/menu.xml.pl
+--- xfdesktop-4.2.3/menu.xml.pl.orig	2005-11-05 18:11:55.000000000 +0100
++++ xfdesktop-4.2.3/menu.xml.pl	2005-11-10 07:32:04.000000000 +0100
+@@ -77,13 +77,13 @@
+ 	  The next line includes the autogenerated menu at the current level.  If
+ 	  you want, you can put this in its own submenu.
  	-->
 -	<include type="system" style="simple" unique="true"/>
 +	<!-- <include type="system" style="simple" unique="true"/> -->
  
  	<!--
- 	  Odkomentuj poniĹźszÄ
 linie (i zakomentuj powyĹźszÄ
) jeśli wolisz raczej
- 	  zawrzeć oddzielny plik z menu zamiast uşywać autogenerowanego menu.
+ 	  Uncomment the following line (and comment the above) if you would rather
+ 	  include a separate menu file instead of using the autogenerated menu.
  	-->
 -	<!-- <include type="file" src="menu2.xml"/> -->
-+	<include type="file" src="/etc/xdg/xfce4/desktop/menu2.xml"/>
- 	
++	<include type="file" src="menu2.xml"/>
+ 
      <separator/>
-     
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/xfdesktop-vfmg.patch?r1=1.3&r2=1.3.2.1&f=u