- updated to 4.2.2

Changed files:
    xfdesktop-locale-names.patch -> 1.10
    xfdesktop-menu.patch -> 1.8
    xfdesktop-vfmg.patch -> 1.4

diff --git a/xfdesktop-locale-names.patch b/xfdesktop-locale-names.patch
index 89d6faa3075663366acc7ceffc98a04a8cf1ba6b..78268990ca575eb2916ec8c757094a1824011529 100644 (file)
--- a/xfdesktop-locale-names.patch
+++ b/xfdesktop-locale-names.patch
@@ -1,11 +1,14 @@
---- xfdesktop-4.2.1/configure.ac       2005-03-12 15:19:32.000000000 +0100
-+++ fix/xfdesktop-4.2.1/configure.ac   2005-03-16 04:31:45.831247456 +0100
-@@ -34,7 +34,7 @@
+diff -urN xfdesktop-4.2.2/configure.ac fix/xfdesktop-4.2.2/configure.ac
+--- xfdesktop-4.2.2/configure.ac       2005-05-15 10:27:45.000000000 +0200
++++ fix/xfdesktop-4.2.2/configure.ac   2005-05-20 16:22:23.000000000 +0200
+@@ -34,8 +34,8 @@
  
  dnl Check for i18n support
- BM_I18N([xfdesktop], [ar az be bg ca cs da de en_GB es es_MX et eu fa fi fr gu \
--                      he hi hu it ja pl ko lt ms nb_NO nl pa pt_BR pt_PT ro \
-+                      he hi hu it ja pl ko lt ms nb nl pa pt_BR pt ro \
-                       ru sk sv ta tr uk vi zh_CN zh_TW])
+ BM_I18N([xfdesktop], [ar az be bg bn_IN ca cs da de el en_GB es es_MX et eu fa
+-                      fi fr gu he hi hu it ja pl ko lt mr ms nb_NO nl pa pt_BR
+-                    pt_PT ro ru sk sv ta tr uk vi zh_CN zh_TW])
++                      fi fr gu he hi hu it ja pl ko lt mr ms nb nl pa pt_BR
++                    pt ro ru sk sv ta tr uk vi zh_CN zh_TW])
  
  dnl Check for X11 installed
+ BM_LIBX11_REQUIRE

diff --git a/xfdesktop-menu.patch b/xfdesktop-menu.patch
index 559580a8e9c27cc1dc370ffb6f88f84217e86d43..cb3b0359ce9f71b9efe5e717a62400521ad5cf4b 100644 (file)
--- a/xfdesktop-menu.patch
+++ b/xfdesktop-menu.patch
@@ -1,28 +1,17 @@
-diff -urN xfdesktop-4.2.1/Makefile.am fix/xfdesktop-4.2.1/Makefile.am
---- xfdesktop-4.2.1/Makefile.am        2005-03-05 12:47:59.000000000 +0100
-+++ fix/xfdesktop-4.2.1/Makefile.am    2005-03-16 04:36:46.861483904 +0100
-@@ -41,7 +41,7 @@
-       menu.xml.es                                                     \
-       menu.xml.et                                                     \
-       menu.xml.eu                                                     \
--      menu.xml.fa_IR                                                  \
-+      menu.xml.fa                                                     \
-       menu.xml.fi                                                     \
-       menu.xml.fr                                                     \
-       menu.xml.he                                                     \
-@@ -49,7 +49,8 @@
+diff -urN xfdesktop-4.2.2/Makefile.am fix/xfdesktop-4.2.2/Makefile.am
+--- xfdesktop-4.2.2/Makefile.am        2005-05-15 10:27:45.000000000 +0200
++++ fix/xfdesktop-4.2.2/Makefile.am    2005-05-20 17:12:57.000000000 +0200
+@@ -45,6 +45,7 @@
        menu.xml.ja                                                     \
        menu.xml.ko                                                     \
-       menu.xml.ms                                                     \
--      menu.xml.nl                                                     \
-+      menu.xml.nl                                                     \
+       menu.xml.nl                                                     \
 +      menu.xml.pl                                                     \
        menu.xml.pt_BR                                                  \
        menu.xml.ro                                                     \
        menu.xml.ru                                                     \
-diff -urN xfdesktop-4.2.1/menu.xml.pl fix/xfdesktop-4.2.1/menu.xml.pl
---- xfdesktop-4.2.1/menu.xml.pl        1970-01-01 01:00:00.000000000 +0100
-+++ fix/xfdesktop-4.2.1/menu.xml.pl    2005-03-16 04:50:50.000000000 +0100
+diff -urN xfdesktop-4.2.2/menu.xml.pl fix/xfdesktop-4.2.2/menu.xml.pl
+--- xfdesktop-4.2.2/menu.xml.pl        1970-01-01 01:00:00.000000000 +0100
++++ fix/xfdesktop-4.2.2/menu.xml.pl    2005-05-20 17:09:24.000000000 +0200
 @@ -0,0 +1,101 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE xfdesktop-menu>
@@ -111,7 +100,7 @@ diff -urN xfdesktop-4.2.1/menu.xml.pl fix/xfdesktop-4.2.1/menu.xml.pl
 +        Odkomentuj poniższą linie (i zakomentuj powyższą) jeśli wolisz raczej
 +        zawrzeć oddzielny plik z menu zamiast używać autogenerowanego menu.
 +      -->
-+      <!-- <include type="file" src="menu2.xml"/> -->
++      <!-- <include type="file" src="/etc/xdg/xfce4/desktop/menu2.xml"/> -->
 +      
 +    <separator/>
 +    

diff --git a/xfdesktop-vfmg.patch b/xfdesktop-vfmg.patch
index 5ac11bc2909587eebc1c62e1fb20fc3415817ab6..6b44c42b40651a9ac2d70627c6bf1798a906606a 100644 (file)
--- a/xfdesktop-vfmg.patch
+++ b/xfdesktop-vfmg.patch
@@ -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,13 +13,13 @@ diff -ur xfdesktop-4.2.1/menu.xml fix/xfdesktop-4.2.1/menu.xml
          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
+diff -urN xfdesktop-4.2.2/menu.xml.pl fix/xfdesktop-4.2.2/menu.xml.pl
+--- xfdesktop-4.2.2/menu.xml.pl        2005-05-20 17:09:24.000000000 +0200
++++ fix/xfdesktop-4.2.2/menu.xml.pl    2005-05-20 17:14:27.000000000 +0200
 @@ -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.
@@ -31,7 +31,7 @@ diff -ur xfdesktop-4.2.1/menu.xml.pl fix/xfdesktop-4.2.1/menu.xml.pl
          Odkomentuj poniższą linie (i zakomentuj powyższą) jeśli wolisz raczej
          zawrzeć oddzielny plik z menu zamiast używać autogenerowanego menu.
        -->
--      <!-- <include type="file" src="menu2.xml"/> -->
+-      <!-- <include type="file" src="/etc/xdg/xfce4/desktop/menu2.xml"/> -->
 +      <include type="file" src="/etc/xdg/xfce4/desktop/menu2.xml"/>
        
      <separator/>