control-center-xml-i18n.patch

   1 diff -urN control-center-1.4.0.1.orig/capplets/background-properties/Makefile.am control-center-1.4.0.1/capplets/background-properties/Makefile.am
   2 --- control-center-1.4.0.1.orig/capplets/background-properties/Makefile.am      Sat Nov 24 19:28:10 2001
   3 +++ control-center-1.4.0.1/capplets/background-properties/Makefile.am   Sat Nov 24 19:29:44 2001
   4 @@ -25,7 +25,8 @@
   5  sysdir = $(datadir)/control-center/Desktop
   6  sys_in_files = background-properties.desktop.in
   7  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
   8 -@XML_I18N_MERGE_DESKTOP_RULE@
   9 +@XML_I18N_MERGE_DESKTOP_RULE1@
  10 +@XML_I18N_MERGE_DESKTOP_RULE2@
  11
  12  install-data-local:
  13         $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
  14 diff -urN control-center-1.4.0.1.orig/capplets/desktop-links/Makefile.am control-center-1.4.0.1/capplets/desktop-links/Makefile.am
  15 --- control-center-1.4.0.1.orig/capplets/desktop-links/Makefile.am      Sat Nov 24 19:28:10 2001
  16 +++ control-center-1.4.0.1/capplets/desktop-links/Makefile.am   Sat Nov 24 19:29:32 2001
  17 @@ -26,7 +26,8 @@
  18         UIOptions.directory.in
  19
  20  noinst_DATA = $(directory_in_files:.directory.in=.directory)
  21 -@XML_I18N_MERGE_DIRECTORY_RULE@
  22 +@XML_I18N_MERGE_DIRECTORY_RULE1@
  23 +@XML_I18N_MERGE_DIRECTORY_RULE2@
  24
  25  EXTRA_DIST = $(directory_in_files) $(noinst_DATA)
  26
  27 diff -urN control-center-1.4.0.1.orig/capplets/file-types/Makefile.am control-center-1.4.0.1/capplets/file-types/Makefile.am
  28 --- control-center-1.4.0.1.orig/capplets/file-types/Makefile.am Sat Nov 24 19:28:10 2001
  29 +++ control-center-1.4.0.1/capplets/file-types/Makefile.am      Sat Nov 24 19:29:49 2001
  30 @@ -45,7 +45,8 @@
  31  settingsdir = $(datadir)/applnk/Settings
  32  settings_DATA = $(sys_DATA)
  33
  34 -@XML_I18N_MERGE_DESKTOP_RULE@
  35 +@XML_I18N_MERGE_DESKTOP_RULE1@
  36 +@XML_I18N_MERGE_DESKTOP_RULE2@
  37
  38  EXTRA_DIST = \
  39         $(sys_DATA) $(sys_in_files)
  40 diff -urN control-center-1.4.0.1.orig/capplets/gnome-edit-properties/Makefile.am control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am
  41 --- control-center-1.4.0.1.orig/capplets/gnome-edit-properties/Makefile.am      Sat Nov 24 19:28:10 2001
  42 +++ control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am   Sat Nov 24 19:29:39 2001
  43 @@ -21,7 +21,8 @@
  44  sysdir = $(datadir)/control-center/Documents
  45  sys_in_files = gnome-edit-properties.desktop.in
  46  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
  47 -@XML_I18N_MERGE_DESKTOP_RULE@
  48 +@XML_I18N_MERGE_DESKTOP_RULE1@
  49 +@XML_I18N_MERGE_DESKTOP_RULE2@
  50
  51  install-data-local:
  52         $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
  53 diff -urN control-center-1.4.0.1.orig/capplets/keyboard-properties/Makefile.am control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am
  54 --- control-center-1.4.0.1.orig/capplets/keyboard-properties/Makefile.am        Sat Nov 24 19:28:10 2001
  55 +++ control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am     Sat Nov 24 19:30:24 2001
  56 @@ -19,7 +19,8 @@
  57  sysdir = $(datadir)/control-center/Peripherals
  58  sys_in_files = keyboard-properties.desktop.in
  59  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
  60 -@XML_I18N_MERGE_DESKTOP_RULE@
  61 +@XML_I18N_MERGE_DESKTOP_RULE1@
  62 +@XML_I18N_MERGE_DESKTOP_RULE2@
  63
  64  install-data-local:
  65         $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
  66 diff -urN control-center-1.4.0.1.orig/capplets/mouse-properties/Makefile.am control-center-1.4.0.1/capplets/mouse-properties/Makefile.am
  67 --- control-center-1.4.0.1.orig/capplets/mouse-properties/Makefile.am   Sat Nov 24 19:28:10 2001
  68 +++ control-center-1.4.0.1/capplets/mouse-properties/Makefile.am        Sat Nov 24 19:29:57 2001
  69 @@ -20,7 +20,8 @@
  70  sysdir = $(datadir)/control-center/Peripherals
  71  sys_in_files = mouse-properties.desktop.in
  72  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
  73 -@XML_I18N_MERGE_DESKTOP_RULE@
  74 +@XML_I18N_MERGE_DESKTOP_RULE1@
  75 +@XML_I18N_MERGE_DESKTOP_RULE2@
  76
  77  install-data-local:
  78         $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
  79 diff -urN control-center-1.4.0.1.orig/capplets/screensaver-properties/Makefile.am control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am
  80 --- control-center-1.4.0.1.orig/capplets/screensaver-properties/Makefile.am     Sat Nov 24 19:28:10 2001
  81 +++ control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am  Sat Nov 24 19:30:42 2001
  82 @@ -28,7 +28,8 @@
  83  sysdir = $(datadir)/control-center/Desktop
  84  sys_in_files = screensaver-properties.desktop.in
  85  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
  86 -@XML_I18N_MERGE_DESKTOP_RULE@
  87 +@XML_I18N_MERGE_DESKTOP_RULE1@
  88 +@XML_I18N_MERGE_DESKTOP_RULE2@
  89
  90  install-data-local:
  91         $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
  92 diff -urN control-center-1.4.0.1.orig/capplets/screensaver-properties/screensaver-desktops/Makefile.am control-center-1.4.0.1/capplets/screensaver-properties/screensaver-desktops/Makefile.am
  93 --- control-center-1.4.0.1.orig/capplets/screensaver-properties/screensaver-desktops/Makefile.am        Thu Mar 15 20:05:57 2001
  94 +++ control-center-1.4.0.1/capplets/screensaver-properties/screensaver-desktops/Makefile.am     Sat Nov 24 19:30:37 2001
  95 @@ -154,7 +154,8 @@
  96
  97  ssdata_DATA= $(ssdata_in_files:.desktop.in=.desktop)
  98
  99 -@XML_I18N_MERGE_DESKTOP_RULE@
 100 +@XML_I18N_MERGE_DESKTOP_RULE1@
 101 +@XML_I18N_MERGE_DESKTOP_RULE2@
 102
 103  EXTRA_DIST= $(ssdata_DATA)  $(ssdata_in_files)
 104
 105 diff -urN control-center-1.4.0.1.orig/capplets/sound-properties/Makefile.am control-center-1.4.0.1/capplets/sound-properties/Makefile.am
 106 --- control-center-1.4.0.1.orig/capplets/sound-properties/Makefile.am   Sat Nov 24 19:28:10 2001
 107 +++ control-center-1.4.0.1/capplets/sound-properties/Makefile.am        Sat Nov 24 19:30:28 2001
 108 @@ -21,7 +21,8 @@
 109  sysdir = $(datadir)/control-center/Multimedia
 110  sys_in_files = sound-properties.desktop.in
 111  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 112 -@XML_I18N_MERGE_DESKTOP_RULE@
 113 +@XML_I18N_MERGE_DESKTOP_RULE1@
 114 +@XML_I18N_MERGE_DESKTOP_RULE2@
 115
 116  install-data-local:
 117         $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
 118 diff -urN control-center-1.4.0.1.orig/capplets/theme-switcher/Makefile.am control-center-1.4.0.1/capplets/theme-switcher/Makefile.am
 119 --- control-center-1.4.0.1.orig/capplets/theme-switcher/Makefile.am     Sat Nov 24 19:28:10 2001
 120 +++ control-center-1.4.0.1/capplets/theme-switcher/Makefile.am  Sat Nov 24 19:30:33 2001
 121 @@ -31,7 +31,8 @@
 122  sysdir = $(datadir)/control-center/Desktop
 123  sys_in_files = theme-selector.desktop.in
 124  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 125 -@XML_I18N_MERGE_DESKTOP_RULE@
 126 +@XML_I18N_MERGE_DESKTOP_RULE1@
 127 +@XML_I18N_MERGE_DESKTOP_RULE2@
 128
 129  install-data-local:
 130         $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
 131 diff -urN control-center-1.4.0.1.orig/capplets/ui-properties/Makefile.am control-center-1.4.0.1/capplets/ui-properties/Makefile.am
 132 --- control-center-1.4.0.1.orig/capplets/ui-properties/Makefile.am      Fri Mar  9 17:22:48 2001
 133 +++ control-center-1.4.0.1/capplets/ui-properties/Makefile.am   Sat Nov 24 19:30:04 2001
 134 @@ -20,14 +20,16 @@
 135         dialogs.desktop.in                      \
 136         mdi.desktop.in
 137  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 138 -@XML_I18N_MERGE_DESKTOP_RULE@
 139 +@XML_I18N_MERGE_DESKTOP_RULE1@
 140 +@XML_I18N_MERGE_DESKTOP_RULE2@
 141
 142  directory_in_files = ui-properties.directory.in
 143  noinst_DATA = $(directory_in_files:.directory.in=.directory)
 144
 145  EXTRA_DIST = $(sys_in_files) $(sys_DATA) $(directory_in_files) $(noinst_DATA)
 146
 147 -@XML_I18N_MERGE_DIRECTORY_RULE@
 148 +@XML_I18N_MERGE_DIRECTORY_RULE1@
 149 +@XML_I18N_MERGE_DIRECTORY_RULE2@
 150
 151  install-data-local:
 152         $(INSTALL_DATA) $(srcdir)/ui-properties.directory $(DESTDIR)$(sysdir)/.directory
 153 diff -urN control-center-1.4.0.1.orig/capplets/url-properties/Makefile.am control-center-1.4.0.1/capplets/url-properties/Makefile.am
 154 --- control-center-1.4.0.1.orig/capplets/url-properties/Makefile.am     Sat Nov 24 19:28:10 2001
 155 +++ control-center-1.4.0.1/capplets/url-properties/Makefile.am  Sat Nov 24 19:30:09 2001
 156 @@ -21,7 +21,8 @@
 157  sysdir = $(datadir)/control-center/Documents
 158  sys_in_files = url-properties.desktop.in
 159  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 160 -@XML_I18N_MERGE_DESKTOP_RULE@
 161 +@XML_I18N_MERGE_DESKTOP_RULE1@
 162 +@XML_I18N_MERGE_DESKTOP_RULE2@
 163
 164  install-data-local:
 165         $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
 166 diff -urN control-center-1.4.0.1.orig/capplets/wm-properties/Makefile.am control-center-1.4.0.1/capplets/wm-properties/Makefile.am
 167 --- control-center-1.4.0.1.orig/capplets/wm-properties/Makefile.am      Sat Nov 24 19:28:10 2001
 168 +++ control-center-1.4.0.1/capplets/wm-properties/Makefile.am   Sat Nov 24 19:30:20 2001
 169 @@ -30,4 +30,5 @@
 170
 171  Set_DATA = $(sys_DATA)
 172
 173 -@XML_I18N_MERGE_DESKTOP_RULE@
 174 +@XML_I18N_MERGE_DESKTOP_RULE1@
 175 +@XML_I18N_MERGE_DESKTOP_RULE2@
 176 diff -urN control-center-1.4.0.1.orig/capplets/wm-properties/wm-desktops/Makefile.am control-center-1.4.0.1/capplets/wm-properties/wm-desktops/Makefile.am
 177 --- control-center-1.4.0.1.orig/capplets/wm-properties/wm-desktops/Makefile.am  Fri Mar  9 17:22:52 2001
 178 +++ control-center-1.4.0.1/capplets/wm-properties/wm-desktops/Makefile.am       Sat Nov 24 19:30:14 2001
 179 @@ -9,7 +9,8 @@
 180
 181  wmdata_DATA=$(wmdata_in_files:.desktop.in=.desktop)
 182
 183 -@XML_I18N_MERGE_DESKTOP_RULE@
 184 +@XML_I18N_MERGE_DESKTOP_RULE1@
 185 +@XML_I18N_MERGE_DESKTOP_RULE2@
 186
 187  EXTRA_DIST= $(wmdata_DATA) $(wmdata_in_files)
 188
 189 diff -urN control-center-1.4.0.1.orig/control-center/Makefile.am control-center-1.4.0.1/control-center/Makefile.am
 190 --- control-center-1.4.0.1.orig/control-center/Makefile.am      Sat Nov 24 19:28:10 2001
 191 +++ control-center-1.4.0.1/control-center/Makefile.am   Sat Nov 24 19:29:24 2001
 192 @@ -50,7 +50,8 @@
 193  sysdir = $(datadir)/applnk/Settings
 194  sys_in_files = gnomecc.desktop.in
 195  sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 196 -@XML_I18N_MERGE_DESKTOP_RULE@
 197 +@XML_I18N_MERGE_DESKTOP_RULE1@
 198 +@XML_I18N_MERGE_DESKTOP_RULE2@
 199
 200  ## Put `exec' in the name because this should be installed by
 201  ## `install-exec', not `install-data'.